From gerrit-no-reply at lists.osmocom.org Sat Dec 1 00:19:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 1 Dec 2018 00:19:01 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12051 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12051/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12051/4//COMMIT_MSG at 11 PS4, Line 11: cosmetic: UDHDevice: fixed typo You ended up messing it duplicating the commit description. Please re-submit. Take it as a git/gerrit exercise ;-) -- To view, visit https://gerrit.osmocom.org/12051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 Gerrit-Change-Number: 12051 Gerrit-PatchSet: 4 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: d0gtail Gerrit-Comment-Date: Sat, 01 Dec 2018 00:19:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 00:20:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 1 Dec 2018 00:20:13 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12052 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Patch Set 1: This one is actually good, you can perhaps un-abandon it through gerrit interface, then I can +2 it and merge it. -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 1 Gerrit-Owner: d0gtail Gerrit-CC: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 01 Dec 2018 00:20:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 00:42:43 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Sat, 1 Dec 2018 00:42:43 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: d0gtail has posted comments on this change. ( https://gerrit.osmocom.org/12051 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Patch Set 4: > Patch Set 4: > > (1 comment) Oh hell, I'm sorry man. Have to do a lot of homework ^^ -- To view, visit https://gerrit.osmocom.org/12051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 Gerrit-Change-Number: 12051 Gerrit-PatchSet: 4 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: d0gtail Gerrit-Comment-Date: Sat, 01 Dec 2018 00:42:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 00:47:58 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Sat, 1 Dec 2018 00:47:58 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12051 to look at the new patch set (#5). Change subject: UHDDevice: log exception information on device open failure ...................................................................... UHDDevice: log exception information on device open failure Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/51/12051/5 -- To view, visit https://gerrit.osmocom.org/12051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 Gerrit-Change-Number: 12051 Gerrit-PatchSet: 5 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: d0gtail -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 00:55:00 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Sat, 1 Dec 2018 00:55:00 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: d0gtail has restored this change. ( https://gerrit.osmocom.org/12052 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Restored -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: restore Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 1 Gerrit-Owner: d0gtail Gerrit-CC: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 00:59:17 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Sat, 1 Dec 2018 00:59:17 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: d0gtail has posted comments on this change. ( https://gerrit.osmocom.org/12052 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Patch Set 1: > Patch Set 1: > > This one is actually good, you can perhaps un-abandon it through gerrit interface, then I can +2 it and merge it. Ok I un-abandoned it, should I abandon the 12051 now? -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 1 Gerrit-Owner: d0gtail Gerrit-Reviewer: d0gtail Gerrit-CC: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 01 Dec 2018 00:59:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 01:07:46 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Sat, 1 Dec 2018 01:07:46 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: d0gtail has abandoned this change. ( https://gerrit.osmocom.org/12051 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Abandoned merge conflicts -- To view, visit https://gerrit.osmocom.org/12051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 Gerrit-Change-Number: 12051 Gerrit-PatchSet: 5 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: d0gtail -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Dec 1 06:52:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 1 Dec 2018 06:52:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#206?= In-Reply-To: <748521308.920.1543560723106.JavaMail.jenkins@jenkins.osmocom.org> References: <748521308.920.1543560723106.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1545823735.935.1543647122846.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 168.21 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Dec 1 10:17:49 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 1 Dec 2018 10:17:49 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12052 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12052/1/Transceiver52M/device/uhd/UHDDevice.cpp File Transceiver52M/device/uhd/UHDDevice.cpp: https://gerrit.osmocom.org/#/c/12052/1/Transceiver52M/device/uhd/UHDDevice.cpp at 640 PS1, Line 640: "UHD make exception output:\n" << e.what(); BTW: why do we need a separate log line for that? -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 1 Gerrit-Owner: d0gtail Gerrit-Reviewer: d0gtail Gerrit-CC: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 01 Dec 2018 10:17:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 13:23:01 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Sat, 1 Dec 2018 13:23:01 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: d0gtail has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12052 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... UHDDevice: log exception information on device open failure Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/52/12052/2 -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 2 Gerrit-Owner: d0gtail Gerrit-Reviewer: d0gtail Gerrit-CC: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 13:28:57 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Sat, 1 Dec 2018 13:28:57 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: d0gtail has posted comments on this change. ( https://gerrit.osmocom.org/12052 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Patch Set 2: > Patch Set 1: > > (1 comment) There is no actual need for that, changed it. -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 2 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: d0gtail Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 01 Dec 2018 13:28:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 13:46:42 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 1 Dec 2018 13:46:42 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12052 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12052/2/Transceiver52M/device/uhd/UHDDevice.cpp File Transceiver52M/device/uhd/UHDDevice.cpp: https://gerrit.osmocom.org/#/c/12052/2/Transceiver52M/device/uhd/UHDDevice.cpp at 639 PS2, Line 639: "\nUHD make execption output:\n" Sorry, but I actually meant *logging line*, not a code line: LOGC(DDEV, ALERT) << "UHD make failed, device " << args << ", exception: " << e.what(); -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 2 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: d0gtail Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 01 Dec 2018 13:46:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 14:05:40 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Sat, 1 Dec 2018 14:05:40 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: d0gtail has posted comments on this change. ( https://gerrit.osmocom.org/12052 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Patch Set 2: (1 comment) > Patch Set 2: > > (1 comment) https://gerrit.osmocom.org/#/c/12052/2/Transceiver52M/device/uhd/UHDDevice.cpp File Transceiver52M/device/uhd/UHDDevice.cpp: https://gerrit.osmocom.org/#/c/12052/2/Transceiver52M/device/uhd/UHDDevice.cpp at 639 PS2, Line 639: "\nUHD make execption output:\n" > Sorry, but I actually meant *logging line*, not a code line: [?] Ah ok I see what you mean. Of course we can go that route. But can we seperate the exception into a new line because it's most of the time a multiline output and looks weired if not seperatet imho: LOGC(DDEV, ALERT) << "UHD make failed, device " << args << ", exception:\n" << e.what(); -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 2 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: d0gtail Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 01 Dec 2018 14:05:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Dec 1 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 1 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#324?= In-Reply-To: <637462262.923.1543590623959.JavaMail.jenkins@jenkins.osmocom.org> References: <637462262.923.1543590623959.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1119051727.939.1543677007653.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Dec 1 15:22:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 1 Dec 2018 15:22:57 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_bssap.c: fix incorrect link_id assignment Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12053 Change subject: osmo_bsc_bssap.c: fix incorrect link_id assignment ...................................................................... osmo_bsc_bssap.c: fix incorrect link_id assignment Every DTAP message coming from the MSC has a header (see struct dtap_header) that contains message type, length, and link ID. The link ID indicates SAPI and channel type of a given message. In dtap_rcvmsg() we allocate a new message buffer and copy the received message into it. The old message buffer is freed by the caller then. The link ID value parsed from DTAP header is usually being stored in the control buffer of a message buffer (i.e. msgb->cb). Due to a mistake, it was stored in the old (to be freed) message, while the new (to be forwarded) message always had link_id = 0x00! This change resolves the problem with sending SMS during a voice call, when MT signalling goes through FACCH, while MO signalling goes through SACCH. Change-Id: I7675e1ce4436fad836778261ac9d446fa8f81483 Related: OS#3716 --- 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/53/12053/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index f03fb6e..39425f6 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -940,7 +940,7 @@ /* pass it to the filter for extra actions */ rc = bsc_scan_msc_msg(conn, gsm48); /* Store link_id in msgb->cb */ - OBSC_LINKID_CB(msg) = header->link_id; + OBSC_LINKID_CB(gsm48) = header->link_id; dtap_rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_MT_DTAP, gsm48); if (rc == BSS_SEND_USSD) bsc_send_welcome_ussd(conn); -- To view, visit https://gerrit.osmocom.org/12053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7675e1ce4436fad836778261ac9d446fa8f81483 Gerrit-Change-Number: 12053 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 16:03:16 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Sat, 1 Dec 2018 16:03:16 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12052 to look at the new patch set (#3). Change subject: UHDDevice: log exception information on device open failure ...................................................................... UHDDevice: log exception information on device open failure Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/52/12052/3 -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 3 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: d0gtail Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 18:36:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 1 Dec 2018 18:36:16 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_bssap.c: fix incorrect link_id assignment In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12053 ) Change subject: osmo_bsc_bssap.c: fix incorrect link_id assignment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7675e1ce4436fad836778261ac9d446fa8f81483 Gerrit-Change-Number: 12053 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sat, 01 Dec 2018 18:36:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 18:36:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 1 Dec 2018 18:36:18 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_bssap.c: fix incorrect link_id assignment In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12053 ) Change subject: osmo_bsc_bssap.c: fix incorrect link_id assignment ...................................................................... osmo_bsc_bssap.c: fix incorrect link_id assignment Every DTAP message coming from the MSC has a header (see struct dtap_header) that contains message type, length, and link ID. The link ID indicates SAPI and channel type of a given message. In dtap_rcvmsg() we allocate a new message buffer and copy the received message into it. The old message buffer is freed by the caller then. The link ID value parsed from DTAP header is usually being stored in the control buffer of a message buffer (i.e. msgb->cb). Due to a mistake, it was stored in the old (to be freed) message, while the new (to be forwarded) message always had link_id = 0x00! This change resolves the problem with sending SMS during a voice call, when MT signalling goes through FACCH, while MO signalling goes through SACCH. Change-Id: I7675e1ce4436fad836778261ac9d446fa8f81483 Related: OS#3716 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index f03fb6e..39425f6 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -940,7 +940,7 @@ /* pass it to the filter for extra actions */ rc = bsc_scan_msc_msg(conn, gsm48); /* Store link_id in msgb->cb */ - OBSC_LINKID_CB(msg) = header->link_id; + OBSC_LINKID_CB(gsm48) = header->link_id; dtap_rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_MT_DTAP, gsm48); if (rc == BSS_SEND_USSD) bsc_send_welcome_ussd(conn); -- To view, visit https://gerrit.osmocom.org/12053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7675e1ce4436fad836778261ac9d446fa8f81483 Gerrit-Change-Number: 12053 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 20:47:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 1 Dec 2018 20:47:08 +0000 Subject: Change in osmo-bsc[master]: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11980 ) Change subject: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1d4bdbfca6b9719f54ee609b6bfadf7f3a4bb43 Gerrit-Change-Number: 11980 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 01 Dec 2018 20:47:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 22:40:40 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 1 Dec 2018 22:40:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} for MT SMS over GSUP In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11924 to look at the new patch set (#2). Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} for MT SMS over GSUP ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} for MT SMS over GSUP Change-Id: I63a25c8366cce0852df6b628365151661a22a25f --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 148 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/11924/2 -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 1 23:56:52 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 1 Dec 2018 23:56:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} for MT SMS over GSUP In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11924 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} for MT SMS over GSUP ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11924/2/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11924/2/msc/MSC_Tests.ttcn at 2149 PS2, Line 2149: FIXME Add info about what it should represent? -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Sat, 01 Dec 2018 23:56:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 2 06:18:19 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 2 Dec 2018 06:18:19 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7187?= Message-ID: <1484883946.950.1543731499837.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 648.96 KB...] unable to read file loc from[xua_msg_part::len] unable to read file loc from[xua_class_iei_name] unable to read file loc from[m3ua_rx_mgmt_err] unable to read file loc from[sccp_scrc_rx_sclc_msg] unable to read file loc from[scrc_rx_mtp_xfer_ind_xua] unable to read file loc from[sua_rx_mgmt_err] unable to read file loc from[sccp_scrc_rx_scoc_conn_msg] Generating Sqlite3 output for file xua_rkm.c unable to read file loc from[m3ua_rx_rkm_reg_req] unable to read file loc from[handle_rkey_reg_resp] unable to read file loc from[handle_rkey_dereg_resp] unable to read file loc from[xua_common_hdr::spare] unable to read file loc from[xua_common_hdr::msg_length] unable to read file loc from[M3UA_VERSION] unable to read file loc from[xua_common_hdr::version] unable to read file loc from[xua_common_hdr::msg_class] unable to read file loc from[xua_common_hdr::msg_type] unable to read file loc from[m3ua_rx_rkm_reg_req] unable to read file loc from[xua_rkm_send_dereg_req] unable to read file loc from[xua_rkm_send_reg_req] unable to read file loc from[m3ua_rx_rkm_dereg_req] unable to read file loc from[M3UA_IEI_REG_STATUS] unable to read file loc from[M3UA_IEI_ROUTE_CTX] unable to read file loc from[M3UA_IEI_LOC_RKEY_ID] unable to read file loc from[msgb_t16l16vp_put_u32] unable to read file loc from[M3UA_IEI_REG_RESULT] unable to read file loc from[handle_rkey_reg] unable to read file loc from[M3UA_IEI_DEREG_RESULT] unable to read file loc from[M3UA_IEI_ROUTE_CTX] unable to read file loc from[M3UA_IEI_DEREG_STATUS] unable to read file loc from[msgb_t16l16vp_put_u32] unable to read file loc from[handle_rkey_dereg] unable to read file loc from[M3UA_RKM_REG_REQ] unable to read file loc from[osmo_ss7_asp_send] unable to read file loc from[osmo_ss7_tmode_to_xua] unable to read file loc from[M3UA_IEI_ROUTE_CTX] unable to read file loc from[M3UA_IEI_ROUT_KEY] unable to read file loc from[M3UA_IEI_LOC_RKEY_ID] unable to read file loc from[m3ua_msgb_alloc] unable to read file loc from[msgb_t16l16vp_put_u32] unable to read file loc from[osmo_ss7_routing_key::pc] unable to read file loc from[osmo_ss7_routing_key::context] unable to read file loc from[M3UA_MSGC_RKM] unable to read file loc from[M3UA_IEI_TRAF_MODE_TYP] unable to read file loc from[osmo_ss7_routing_key::l_rk_id] unable to read file loc from[M3UA_IEI_DEST_PC] unable to read file loc from[msgb_push_m3ua_hdr] unable to read file loc from[osmo_xlm_sap_down] unable to read file loc from[osmo_ss7_asp_send] unable to read file loc from[M3UA_IEI_ROUTE_CTX] unable to read file loc from[m3ua_msgb_alloc] unable to read file loc from[msgb_t16l16vp_put_u32] unable to read file loc from[M3UA_RKM_DEREG_REQ] unable to read file loc from[M3UA_MSGC_RKM] unable to read file loc from[msgb_push_m3ua_hdr] unable to read file loc from[osmo_xlm_sap_down] unable to read file loc from[osmo_ss7_as_add_asp] unable to read file loc from[osmo_ss7_route_destroy] unable to read file loc from[M3UA_RKM_REG_ERR_INVAL_RKEY] unable to read file loc from[dpc] unable to read file loc from[M3UA_RKM_REG_ERR_CANT_SUPP_UNQ_RT] unable to read file loc from[osmo_ss7_pointcode_print] unable to read file loc from[osmo_ss7_find_free_rctx] unable to read file loc from[M3UA_IEI_NET_APPEAR] unable to read file loc from[osmo_ss7_asp::name] unable to read file loc from[osmo_ss7_route_create] unable to read file loc from[osmo_ss7_as::routing_key] unable to read file loc from[osmo_ss7_as_find_by_rctx] unable to read file loc from[M3UA_IEI_ORIG_PC] unable to read file loc from[M3UA_IEI_ROUTE_CTX] unable to read file loc from[M3UA_RKM_REG_SUCCESS] unable to read file loc from[M3UA_RKM_REG_ERR_PERM_DENIED] unable to read file loc from[osmo_ss7_instance::rtable_system] unable to read file loc from[osmo_ss7_tmode_from_xua] unable to read file loc from[M3UA_TMOD_OVERRIDE] unable to read file loc from[osmo_ss7_as_destroy] unable to read file loc from[osmo_ss7_as::description] unable to read file loc from[M3UA_IEI_LOC_RKEY_ID] unable to read file loc from[osmo_ss7_as::inst] unable to read file loc from[osmo_ss7_routing_key::context] unable to read file loc from[osmo_ss7_routing_key::pc] unable to read file loc from[M3UA_IEI_TRAF_MODE_TYP] unable to read file loc from[M3UA_RKM_REG_ERR_INSUFF_RESRC] unable to read file loc from[msgb_append_reg_res] unable to read file loc from[M3UA_TMOD_BCAST] unable to read file loc from[xua_msg_get_u32] unable to read file loc from[M3UA_RKM_REG_ERR_UNSUPP_TRAF_MODE] unable to read file loc from[osmo_ss7_as::mode] unable to read file loc from[OSMO_SS7_ASP_PROT_M3UA] unable to read file loc from[M3UA_IEI_SVC_IND] unable to read file loc from[M3UA_IEI_DEST_PC] unable to read file loc from[osmo_ss7_as_find_or_create] unable to read file loc from[osmo_ss7_instance::permit_dyn_rkm_alloc] unable to read file loc from[osmo_ss7_asp::inst] unable to read file loc from[M3UA_RKM_REG_ERR_UNSUPP_RK_PARAM] unable to read file loc from[xua_msg_find_tag] unable to read file loc from[osmo_ss7_route::as] unable to read file loc from[osmo_ss7_as::rkm_dyn_allocated] unable to read file loc from[LOGPASP] unable to read file loc from[M3UA_TMOD_LOADSHARE] unable to read file loc from[m3ua_rx_rkm_reg_req] unable to read file loc from[M3UA_RKM_REG_RSP] unable to read file loc from[osmo_ss7_asp_send] unable to read file loc from[xua_msg_free] unable to read file loc from[osmo_ss7_as::fi] unable to read file loc from[MAX_NEW_AS] unable to read file loc from[xua_msg::headers] unable to read file loc from[M3UA_IEI_ROUT_KEY] unable to read file loc from[m3ua_msgb_alloc] unable to read file loc from[XUA_ASPAS_ASP_INACTIVE_IND] unable to read file loc from[M3UA_MSGC_RKM] unable to read file loc from[xua_msg_part::tag] unable to read file loc from[handle_rkey_reg] unable to read file loc from[xua_from_nested] unable to read file loc from[msgb_push_m3ua_hdr] unable to read file loc from[LOGPASP] unable to read file loc from[m3ua_rx_rkm] unable to read file loc from[osmo_ss7_route_destroy] unable to read file loc from[M3UA_RKM_DEREG_ERR_UNKNOWN] unable to read file loc from[osmo_ss7_as::fi] unable to read file loc from[XUA_ASPAS_ASP_DOWN_IND] unable to read file loc from[osmo_ss7_pointcode_print] unable to read file loc from[osmo_ss7_asp::name] unable to read file loc from[msgb_append_dereg_res] unable to read file loc from[osmo_ss7_as::routing_key] unable to read file loc from[osmo_ss7_as_find_by_rctx] unable to read file loc from[osmo_ss7_instance::rtable_system] unable to read file loc from[osmo_ss7_as_has_asp] unable to read file loc from[M3UA_RKM_DEREG_ERR_INVAL_RCTX] unable to read file loc from[M3UA_RKM_DEREG_SUCCESS] unable to read file loc from[osmo_ss7_as_destroy] unable to read file loc from[osmo_ss7_routing_key::pc] unable to read file loc from[osmo_ss7_as_del_asp] unable to read file loc from[osmo_ss7_route_find_dpc] unable to read file loc from[osmo_ss7_asp::inst] unable to read file loc from[osmo_ss7_as::rkm_dyn_allocated] unable to read file loc from[LOGPASP] unable to read file loc from[m3ua_rx_rkm_dereg_req] unable to read file loc from[osmo_ss7_asp_send] unable to read file loc from[handle_rkey_dereg] unable to read file loc from[M3UA_IEI_ROUTE_CTX] unable to read file loc from[M3UA_RKM_DEREG_RSP] unable to read file loc from[m3ua_msgb_alloc] unable to read file loc from[M3UA_MSGC_RKM] unable to read file loc from[xua_msg_part::dat] unable to read file loc from[xua_msg_part::len] unable to read file loc from[xua_msg_find_tag] unable to read file loc from[msgb_push_m3ua_hdr] unable to read file loc from[m3ua_rx_rkm] unable to read file loc from[osmo_xlm_prim_rk_reg::key] unable to read file loc from[M3UA_IEI_REG_STATUS] unable to read file loc from[M3UA_IEI_ROUTE_CTX] unable to read file loc from[OSMO_XLM_PRIM_M_RK_REG] unable to read file loc from[M3UA_IEI_LOC_RKEY_ID] unable to read file loc from[osmo_ss7_routing_key::context] unable to read file loc from[xua_msg_get_u32] unable to read file loc from[osmo_ss7_routing_key::l_rk_id] unable to read file loc from[osmo_xlm_prim::rk_reg] unable to read file loc from[xua_asp_send_xlm_prim] unable to read file loc from[xua_xlm_prim_alloc] unable to read file loc from[xua_msg_find_tag] unable to read file loc from[m3ua_rkm_reg_status_vals] unable to read file loc from[osmo_xlm_prim_rk_reg::status] unable to read file loc from[LOGPASP] unable to read file loc from[m3ua_rx_rkm_reg_rsp] unable to read file loc from[xua_msg_free] unable to read file loc from[xua_msg::headers] unable to read file loc from[handle_rkey_reg_resp] unable to read file loc from[xua_msg_part::tag] unable to read file loc from[xua_msg_part::len] unable to read file loc from[M3UA_IEI_REG_RESULT] unable to read file loc from[xua_from_nested] unable to read file loc from[m3ua_rx_rkm] unable to read file loc from[osmo_xlm_prim_rk_reg::key] unable to read file loc from[osmo_xlm_prim::rk_dereg] unable to read file loc from[osmo_xlm_prim_rk_dereg::route_ctx] unable to read file loc from[M3UA_IEI_ROUTE_CTX] unable to read file loc from[M3UA_IEI_DEREG_STATUS] unable to read file loc from[m3ua_rkm_dereg_status_vals] unable to read file loc from[osmo_ss7_routing_key::context] unable to read file loc from[xua_msg_get_u32] unable to read file loc from[osmo_xlm_prim::rk_reg] unable to read file loc from[xua_asp_send_xlm_prim] unable to read file loc from[xua_xlm_prim_alloc] unable to read file loc from[osmo_xlm_prim_rk_dereg::status] unable to read file loc from[OSMO_XLM_PRIM_M_RK_DEREG] unable to read file loc from[xua_msg_find_tag] unable to read file loc from[LOGPASP] unable to read file loc from[m3ua_rx_rkm_dereg_rsp] unable to read file loc from[xua_msg_free] unable to read file loc from[M3UA_IEI_DEREG_RESULT] unable to read file loc from[xua_msg::headers] unable to read file loc from[handle_rkey_dereg_resp] unable to read file loc from[xua_msg_part::tag] unable to read file loc from[xua_msg_part::len] unable to read file loc from[xua_from_nested] unable to read file loc from[m3ua_rx_rkm] unable to read file loc from[m3ua_rx_rkm_dereg_rsp] unable to read file loc from[m3ua_rx_rkm_reg_rsp] unable to read file loc from[M3UA_RKM_REG_RSP] unable to read file loc from[m3ua_rx_rkm_reg_req] unable to read file loc from[M3UA_RKM_REG_REQ] unable to read file loc from[xua_msg::hdr] unable to read file loc from[M3UA_RKM_DEREG_RSP] unable to read file loc from[M3UA_RKM_DEREG_REQ] unable to read file loc from[m3ua_rx_rkm_dereg_req] unable to read file loc from[xua_common_hdr::msg_type] unable to read file loc from[LOGPASP] unable to read file loc from[m3ua_rx_msg] unable to read file loc from[osmo_xlm_prim_rk_reg::key] unable to read file loc from[osmo_xlm_prim::rk_dereg] unable to read file loc from[osmo_xlm_prim_rk_dereg::route_ctx] unable to read file loc from[osmo_xlm_prim_name] unable to read file loc from[osmo_xlm_prim_rk_reg::traf_mode] unable to read file loc from[OSMO_XLM_PRIM_M_RK_REG] unable to read file loc from[osmo_xlm_prim::oph] unable to read file loc from[xua_rkm_send_dereg_req] unable to read file loc from[osmo_xlm_prim::rk_reg] unable to read file loc from[xua_rkm_send_reg_req] unable to read file loc from[OSMO_XLM_PRIM_M_RK_DEREG] unable to read file loc from[LOGPASP] unable to read file loc from[lm_timer_cb] unable to read file loc from[osmo_ss7_as_has_asp] unable to read file loc from[osmo_ss7_as_destroy] unable to read file loc from[osmo_ss7_instance::as_list] unable to read file loc from[osmo_ss7_as::list] unable to read file loc from[osmo_ss7_asp::inst] unable to read file loc from[osmo_ss7_as::rkm_dyn_allocated] unable to read file loc from[xua_srv_conn_closed_cb] Generating Sqlite3 output for dir /build/deps/libosmo-sccp/include/ Generating Sqlite3 output for dir /build/deps/libosmo-sccp/include/osmocom/ Generating Sqlite3 output for dir /build/deps/libosmo-sccp/include/osmocom/sigtran/protocol/ Generating Sqlite3 output for dir /build/deps/libosmo-sccp/include/osmocom/sigtran/ Generating Sqlite3 output for dir /build/deps/libosmo-sccp/src/ lookup cache used 1909/65536 hits=16878 misses=1993 finished... cd ./doc && tar cf html.tar */html tar: html.tar: Wrote only 8192 of 10240 bytes tar: Error is not recoverable: exiting now Makefile:925: recipe for target 'doc/html.tar' failed make[2]: Leaving directory '/build/deps/libosmo-sccp' make[2]: *** [doc/html.tar] Error 2 make[1]: *** [install-recursive] Error 1 Makefile:488: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' Makefile:787: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 2 06:18:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 2 Dec 2018 06:18:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3313?= Message-ID: <858155710.951.1543731501879.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 180.26 KB...] Generating Sqlite3 output for class osmo_rtp_handle Generating Sqlite3 output for class osmo_rtp_handle Generating Sqlite3 output for class osmo_stream_cli Generating Sqlite3 output for class osmo_stream_cli Generating Sqlite3 output for class osmo_stream_srv Generating Sqlite3 output for class osmo_stream_srv Generating Sqlite3 output for class osmo_stream_srv_link Generating Sqlite3 output for class osmo_stream_srv_link Generating Sqlite3 output for class osmux_batch Generating Sqlite3 output for class osmux_batch Generating Sqlite3 output for class osmux_circuit Generating Sqlite3 output for class osmux_circuit Generating Sqlite3 output for class osmux_hdr Generating Sqlite3 output for class osmux_hdr Generating Sqlite3 output for class osmux_in_handle Generating Sqlite3 output for class osmux_in_handle Generating Sqlite3 output for class osmux_input_state Generating Sqlite3 output for class osmux_input_state Generating Sqlite3 output for class osmux_out_handle Generating Sqlite3 output for class osmux_out_handle Generating Sqlite3 output for class osmux_tx_handle Generating Sqlite3 output for class osmux_tx_handle Generating Sqlite3 output for class rtcp_hdr Generating Sqlite3 output for class rtcp_hdr Generating Sqlite3 output for class rtp_hdr Generating Sqlite3 output for class rtp_hdr Generating Sqlite3 output for class rtp_x_hdr Generating Sqlite3 output for class rtp_x_hdr Generating Sqlite3 output for file amr.h Generating Sqlite3 output for file datagram.h unable to read file loc from[osmo_dgram_create] unable to read file loc from[osmo_dgram_tx_close] unable to read file loc from[osmo_dgram_destroy] unable to read file loc from[osmo_dgram_set_remote_addr] unable to read file loc from[osmo_dgram_set_remote_port] unable to read file loc from[osmo_dgram_tx_close] unable to read file loc from[osmo_dgram_open] unable to read file loc from[osmo_dgram_tx_open] unable to read file loc from[osmo_dgram_tx_destroy] unable to read file loc from[osmo_dgram_close] unable to read file loc from[osmo_dgram_send] unable to read file loc from[osmo_dgram_create] unable to read file loc from[osmo_dgram_set_local_addr] unable to read file loc from[osmo_dgram_set_local_port] unable to read file loc from[osmo_dgram_create] unable to read file loc from[osmo_dgram_rx_close] unable to read file loc from[osmo_dgram_destroy] unable to read file loc from[osmo_dgram_create] unable to read file loc from[osmo_dgram_rx_close] unable to read file loc from[osmo_dgram_open] unable to read file loc from[osmo_dgram_open] unable to read file loc from[osmo_dgram_rx_open] unable to read file loc from[osmo_dgram_rx_destroy] unable to read file loc from[osmo_dgram_close] unable to read file loc from[osmo_dgram_recv] unable to read file loc from[osmo_dgram_rx_set_read_cb] unable to read file loc from[osmo_dgram_rx_create] unable to read file loc from[osmo_dgram_tx_create] unable to read file loc from[osmo_dgram_rx_destroy] unable to read file loc from[osmo_dgram_rx_destroy] unable to read file loc from[osmo_dgram_tx_destroy] unable to read file loc from[osmo_dgram_rx_open] unable to read file loc from[osmo_dgram_tx_open] unable to read file loc from[osmo_dgram_rx_close] unable to read file loc from[osmo_dgram_tx_close] unable to read file loc from[osmo_dgram_rx_close] unable to read file loc from[osmo_dgram_rx_set_addr] unable to read file loc from[osmo_dgram_tx_set_addr] unable to read file loc from[osmo_dgram_rx_set_port] unable to read file loc from[osmo_dgram_tx_set_port] unable to read file loc from[osmo_dgram_tx_send] unable to read file loc from[osmo_dgram_rx_recv] Generating Sqlite3 output for file ipa.h Generating Sqlite3 output for file ipa_unit.h Generating Sqlite3 output for file jibuf.h Generating Sqlite3 output for file osmux.h Generating Sqlite3 output for file rs232.h Generating Sqlite3 output for file rtp.h Generating Sqlite3 output for file stream.h unable to read file loc from[osmo_stream_srv_recv] unable to read file loc from[osmo_stream_srv_recv] unable to read file loc from[osmo_stream_srv_link_close] unable to read file loc from[osmo_stream_srv_link_close] unable to read file loc from[osmo_stream_srv_link_open] unable to read file loc from[osmo_stream_srv_link_destroy] unable to read file loc from[msgb_sctp_ppid] unable to read file loc from[msgb_sctp_stream] unable to read file loc from[osmo_stream_cli_close] unable to read file loc from[osmo_stream_cli_open2] unable to read file loc from[osmo_stream_cli_recv] unable to read file loc from[osmo_stream_cli_close] unable to read file loc from[osmo_stream_cli_open2] unable to read file loc from[osmo_stream_cli_reconnect] unable to read file loc from[osmo_stream_cli_close] unable to read file loc from[osmo_stream_cli_open] unable to read file loc from[osmo_stream_cli_open2] unable to read file loc from[osmo_stream_cli_destroy] unable to read file loc from[osmo_stream_cli_reconnect] unable to read file loc from[osmo_stream_cli_reconnect] Generating Sqlite3 output for file amr.c Generating Sqlite3 output for file datagram.c unable to read file loc from[osmo_dgram_tx_open] unable to read file loc from[osmo_dgram_tx_destroy] unable to read file loc from[osmo_dgram_close] unable to read file loc from[osmo_dgram_create] unable to read file loc from[osmo_dgram_set_remote_addr] unable to read file loc from[osmo_dgram_set_remote_port] unable to read file loc from[osmo_dgram_tx_close] unable to read file loc from[osmo_dgram_destroy] unable to read file loc from[osmo_dgram_tx_close] unable to read file loc from[osmo_dgram_open] unable to read file loc from[osmo_dgram_send] unable to read file loc from[osmo_dgram_recv] unable to read file loc from[osmo_dgram_create] unable to read file loc from[osmo_dgram_set_local_addr] unable to read file loc from[osmo_dgram_set_local_port] unable to read file loc from[osmo_dgram_create] unable to read file loc from[osmo_dgram_rx_close] unable to read file loc from[osmo_dgram_destroy] unable to read file loc from[osmo_dgram_create] unable to read file loc from[osmo_dgram_rx_close] unable to read file loc from[osmo_dgram_open] unable to read file loc from[osmo_dgram_open] unable to read file loc from[osmo_dgram_rx_open] unable to read file loc from[osmo_dgram_rx_destroy] unable to read file loc from[osmo_dgram_close] unable to read file loc from[osmo_dgram_rx_set_read_cb] unable to read file loc from[osmo_dgram_rx_create] unable to read file loc from[osmo_dgram_tx_create] unable to read file loc from[osmo_dgram_rx_destroy] unable to read file loc from[osmo_dgram_rx_destroy] unable to read file loc from[osmo_dgram_tx_destroy] unable to read file loc from[osmo_dgram_rx_set_addr] unable to read file loc from[osmo_dgram_tx_set_addr] unable to read file loc from[osmo_dgram_rx_set_port] unable to read file loc from[osmo_dgram_tx_set_port] unable to read file loc from[osmo_dgram_rx_open] unable to read file loc from[osmo_dgram_tx_open] unable to read file loc from[osmo_dgram_rx_close] unable to read file loc from[osmo_dgram_tx_close] unable to read file loc from[osmo_dgram_rx_close] unable to read file loc from[osmo_dgram_tx_send] unable to read file loc from[osmo_dgram_rx_recv] Generating Sqlite3 output for file ipa.c Generating Sqlite3 output for file ipa_unit.c Generating Sqlite3 output for file jibuf.c Generating Sqlite3 output for file osmux.c Generating Sqlite3 output for file rs232.c Generating Sqlite3 output for file rtp.c Generating Sqlite3 output for file stream.c unable to read file loc from[osmo_stream_cli_open2] unable to read file loc from[osmo_stream_cli_destroy] unable to read file loc from[osmo_stream_cli_reconnect] unable to read file loc from[osmo_stream_cli_close] unable to read file loc from[osmo_stream_cli_open2] unable to read file loc from[osmo_stream_cli_recv] unable to read file loc from[osmo_stream_cli_close] unable to read file loc from[osmo_stream_cli_reconnect] unable to read file loc from[osmo_stream_cli_close] unable to read file loc from[osmo_stream_cli_open] unable to read file loc from[osmo_stream_cli_open2] unable to read file loc from[osmo_stream_cli_reconnect] unable to read file loc from[osmo_stream_srv_link_close] unable to read file loc from[osmo_stream_srv_link_close] unable to read file loc from[osmo_stream_srv_link_open] unable to read file loc from[osmo_stream_srv_link_destroy] unable to read file loc from[msgb_sctp_ppid] unable to read file loc from[msgb_sctp_stream] Generating Sqlite3 output for group jibuf Generating Sqlite3 output for group osmux Generating Sqlite3 output for group stream Generating Sqlite3 output for group datagram Generating Sqlite3 output for dir /build/deps/libosmo-netif/include/ Generating Sqlite3 output for dir /build/deps/libosmo-netif/include/osmocom/netif/ Generating Sqlite3 output for dir /build/deps/libosmo-netif/include/osmocom/ Generating Sqlite3 output for dir /build/deps/libosmo-netif/src/ lookup cache used 544/65536 hits=4606 misses=558 finished... cd ./doc && tar cf html.tar html make[3]: Entering directory '/build/deps/libosmo-netif' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-netif/share/doc/libosmo-netif' /bin/mkdir -p '/build/deps/install/stow/libosmo-netif/lib/pkgconfig' /usr/bin/install -c -m 644 ./doc/html.tar '/build/deps/install/stow/libosmo-netif/share/doc/libosmo-netif' /usr/bin/install -c -m 644 libosmo-netif.pc '/build/deps/install/stow/libosmo-netif/lib/pkgconfig' make install-data-hook make[4]: Entering directory '/build/deps/libosmo-netif' cd /build/deps/install/stow/libosmo-netif/share/doc/libosmo-netif && tar xf html.tar && rm -f html.tar make[4]: Leaving directory '/build/deps/libosmo-netif' make[3]: Leaving directory '/build/deps/libosmo-netif' make[2]: Leaving directory '/build/deps/libosmo-netif' make[1]: Leaving directory '/build/deps/libosmo-netif' + STOW_DIR=/build/deps/install/stow stow --restow libosmo-netif Possible precedence issue with control flow operator at /usr/share/perl5/Stow.pm line 1736. + osmo-build-dep.sh libosmo-sccp =============================== libosmo-sccp =============================== + mkdir -p /build/deps + cd /build/deps + osmo-deps.sh libosmo-sccp + project=libosmo-sccp + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmo-sccp + git clone git://git.osmocom.org/libosmo-sccp libosmo-sccp Cloning into 'libosmo-sccp'... + cd libosmo-sccp + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD Your branch is up-to-date with 'origin/master'. + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master Note: checking out 'origin/master'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b new_branch_name HEAD is now at b7237b1... build manuals moved here from osmo-gsm-manuals.git + git rev-parse HEAD b7237b139dde582f1cec084b616ea2e05175b747 + cd libosmo-sccp + mkdir -p /build/deps/install/stow + autoreconf --install --force /usr/bin/m4:configure.ac:176: ERROR: copying inserted file: No space left on device /usr/bin/m4:configure.ac:176: cannot clean temporary file for diversion autom4te: /usr/bin/m4 failed with exit status: 1 /usr/bin/m4:configure.ac:33: ERROR: copying inserted file: No space left on device /usr/bin/m4:configure.ac:33: cannot clean temporary file for diversion autom4te: /usr/bin/m4 failed with exit status: 1 autoreconf: /usr/bin/autoconf failed with exit status: 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 2 06:18:24 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 2 Dec 2018 06:18:24 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3313?= Message-ID: <1326608973.952.1543731504309.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 90.52 KB...] checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking if gcc supports -fvisibility=hidden... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for ORTP... yes checking dahdi/user.h usability... no checking dahdi/user.h presence... no checking for dahdi/user.h... no configure: WARNING: DAHDI input driver will not be built CFLAGS="-g -O2 -Wall" CPPFLAGS=" -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmoabis.pc config.status: creating libosmotrau.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating tests/Makefile config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.5.1.20-de57 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-abis' Making install in include make[2]: Entering directory '/build/deps/libosmo-abis/include' make[3]: Entering directory '/build/deps/libosmo-abis/include' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/include' /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/include/osmocom/abis' /usr/bin/install -c -m 644 osmocom/abis/ipa.h osmocom/abis/trau_frame.h osmocom/abis/ipa_proxy.h osmocom/abis/ipaccess.h osmocom/abis/abis.h osmocom/abis/subchan_demux.h osmocom/abis/e1_input.h osmocom/abis/lapd.h osmocom/abis/lapd_pcap.h osmocom/abis/unixsocket_proto.h '/build/deps/install/stow/libosmo-abis/include/osmocom/abis' /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/include/osmocom/trau' /usr/bin/install -c -m 644 osmocom/trau/osmo_ortp.h '/build/deps/install/stow/libosmo-abis/include/osmocom/trau' make[3]: Leaving directory '/build/deps/libosmo-abis/include' make[2]: Leaving directory '/build/deps/libosmo-abis/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-abis/src' CC init.lo CC e1_input.lo CC e1_input_vty.lo CC ipa_proxy.lo CC subchan_demux.lo CC trau_frame.lo CC input/dahdi.lo CC input/ipa.lo CC input/ipaccess.lo CC input/lapd.lo CC input/lapd_pcap.lo CC input/misdn.lo CC input/rs232.lo CC input/unixsocket.lo CC trau/libosmotrau_la-osmo_ortp.lo trau/osmo_ortp.c:233:9: note: #pragma message: Using internal ortp API: rtp_session_rtcp_rec #pragma message ("Using internal ortp API: rtp_session_rtcp_rec") ^ CCLD libosmoabis.la CCLD libosmotrau.la make[3]: Entering directory '/build/deps/libosmo-abis/src' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmoabis.la libosmotrau.la '/build/deps/install/stow/libosmo-abis/lib' libtool: install: /usr/bin/install -c .libs/libosmoabis.so.6.0.1 /build/deps/install/stow/libosmo-abis/lib/libosmoabis.so.6.0.1 libtool: install: (cd /build/deps/install/stow/libosmo-abis/lib && { ln -s -f libosmoabis.so.6.0.1 libosmoabis.so.6 || { rm -f libosmoabis.so.6 && ln -s libosmoabis.so.6.0.1 libosmoabis.so.6; }; }) libtool: install: (cd /build/deps/install/stow/libosmo-abis/lib && { ln -s -f libosmoabis.so.6.0.1 libosmoabis.so || { rm -f libosmoabis.so && ln -s libosmoabis.so.6.0.1 libosmoabis.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmoabis.lai /build/deps/install/stow/libosmo-abis/lib/libosmoabis.la libtool: install: /usr/bin/install -c .libs/libosmotrau.so.2.1.1 /build/deps/install/stow/libosmo-abis/lib/libosmotrau.so.2.1.1 libtool: install: (cd /build/deps/install/stow/libosmo-abis/lib && { ln -s -f libosmotrau.so.2.1.1 libosmotrau.so.2 || { rm -f libosmotrau.so.2 && ln -s libosmotrau.so.2.1.1 libosmotrau.so.2; }; }) libtool: install: (cd /build/deps/install/stow/libosmo-abis/lib && { ln -s -f libosmotrau.so.2.1.1 libosmotrau.so || { rm -f libosmotrau.so && ln -s libosmotrau.so.2.1.1 libosmotrau.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmotrau.lai /build/deps/install/stow/libosmo-abis/lib/libosmotrau.la libtool: install: /usr/bin/install -c .libs/libosmoabis.a /build/deps/install/stow/libosmo-abis/lib/libosmoabis.a libtool: install: chmod 644 /build/deps/install/stow/libosmo-abis/lib/libosmoabis.a libtool: install: ranlib /build/deps/install/stow/libosmo-abis/lib/libosmoabis.a libtool: install: /usr/bin/install -c .libs/libosmotrau.a /build/deps/install/stow/libosmo-abis/lib/libosmotrau.a libtool: install: chmod 644 /build/deps/install/stow/libosmo-abis/lib/libosmotrau.a libtool: install: ranlib /build/deps/install/stow/libosmo-abis/lib/libosmotrau.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmo-abis/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmo-abis/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmo-abis/src' make[2]: Leaving directory '/build/deps/libosmo-abis/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-abis/tests' make[3]: Entering directory '/build/deps/libosmo-abis/tests' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-abis/tests' make[2]: Leaving directory '/build/deps/libosmo-abis/tests' make[2]: Entering directory '/build/deps/libosmo-abis' make[3]: Entering directory '/build/deps/libosmo-abis' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/lib/pkgconfig' /usr/bin/install -c -m 644 libosmoabis.pc libosmotrau.pc '/build/deps/install/stow/libosmo-abis/lib/pkgconfig' make[3]: Leaving directory '/build/deps/libosmo-abis' make[2]: Leaving directory '/build/deps/libosmo-abis' make[1]: Leaving directory '/build/deps/libosmo-abis' + STOW_DIR=/build/deps/install/stow stow --restow libosmo-abis Possible precedence issue with control flow operator at /usr/share/perl5/Stow.pm line 1736. + osmo-build-dep.sh libosmo-netif =============================== libosmo-netif =============================== + mkdir -p /build/deps + cd /build/deps + osmo-deps.sh libosmo-netif + project=libosmo-netif + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmo-netif + git clone git://git.osmocom.org/libosmo-netif libosmo-netif Cloning into 'libosmo-netif'... + cd libosmo-netif + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD Your branch is up-to-date with 'origin/master'. + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master Note: checking out 'origin/master'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b new_branch_name HEAD is now at a555a1f... detect freed connections in osmo_stream_srv_read() + git rev-parse HEAD a555a1fca28f6ba1c5c877bb3d94f2b77396ed64 + cd libosmo-netif + mkdir -p /build/deps/install/stow + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' /usr/bin/m4:configure.ac:85: ERROR: copying inserted file: No space left on device /usr/bin/m4:configure.ac:85: cannot clean temporary file for diversion autom4te: /usr/bin/m4 failed with exit status: 1 aclocal: error: echo failed with exit status: 1 autoreconf: aclocal failed with exit status: 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 2 06:26:41 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 2 Dec 2018 06:26:41 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7188?= In-Reply-To: <1484883946.950.1543731499837.JavaMail.jenkins@jenkins.osmocom.org> References: <1484883946.950.1543731499837.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <262819850.954.1543732001410.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Dec 2 06:52:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 2 Dec 2018 06:52:04 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#207?= In-Reply-To: <1545823735.935.1543647122846.JavaMail.jenkins@jenkins.osmocom.org> References: <1545823735.935.1543647122846.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2098739966.955.1543733524711.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 159.61 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Dec 2 08:05:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 2 Dec 2018 08:05:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler.ttcn: split up f_mt_sms() into two functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11922 ) Change subject: BSC_ConnectionHandler.ttcn: split up f_mt_sms() into two functions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4730634a9f3352b6f8553ee2fd1d43044f41241e Gerrit-Change-Number: 11922 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 02 Dec 2018 08:05:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 08:07:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 2 Dec 2018 08:07:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler.ttcn: introduce f_mt_sms_send_rp_error() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11923 ) Change subject: BSC_ConnectionHandler.ttcn: introduce f_mt_sms_send_rp_error() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3d67a451335e1c1e1b18237fdda82260c0c969fb Gerrit-Change-Number: 11923 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 02 Dec 2018 08:07:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 08:25:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 2 Dec 2018 08:25:37 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_bssap.c: fix incorrect link_id assignment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12053 ) Change subject: osmo_bsc_bssap.c: fix incorrect link_id assignment ...................................................................... Patch Set 1: Code-Review+2 nice catch! I know we're all busy, but a TTCN3 test to ensure the use of SACCH might be nice :) -- To view, visit https://gerrit.osmocom.org/12053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7675e1ce4436fad836778261ac9d446fa8f81483 Gerrit-Change-Number: 12053 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sun, 02 Dec 2018 08:25:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 09:24:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 2 Dec 2018 09:24:20 +0000 Subject: Change in osmo-trx[master]: lms: User correct scale factor for transmit samples In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12006 ) Change subject: lms: User correct scale factor for transmit samples ...................................................................... lms: User correct scale factor for transmit samples Due to (I believe) a copy+paste mistake from the USRP1 code, we were using only a scale range of up to 9830 when transmitting samples, rather than the full 16 bit signed integer range up to 32767. As a result, we were loosing almost two bits (MSBs) of resolution as well as a lot of transmit power. This changes the scale factor to 0.707 (1/sqrt(2)). Please note that the much higher DAC output level means that the analog gain should be reduced. The theoretic range of up to 73dB should not be used, but Lime Microsystems suggest a value of 61..67 dB. This can be achieved by using a "osmotrx tx-attenuation" value of 6..12 inside the osmo-bts-trx configuration file. Related: OS#3341 Related: OS#3342 Change-Id: I71702feaa11f53e7614a6938a984dd748405474a --- M Transceiver52M/device/lms/LMSDevice.h 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 349efbb..6635c13 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -28,7 +28,14 @@ #include #include -#define LIMESDR_TX_AMPL 0.3 +/* Definition of LIMESDR_TX_AMPL limits maximum amplitude of I and Q + * channels separately. Hence LIMESDR_TX_AMPL value must be 1/sqrt(2) = + * 0.7071.... to get an amplitude of 1 of the complex signal: + * A^2 = I^2 + Q^2 + * A^2 = (1/sqrt(2))^2 + (1/sqrt(2))^2 + * A^2 = 1/2 + 1/2 + * A^2 = 1 */ +#define LIMESDR_TX_AMPL 0.707 /** A class to handle a LimeSuite supported device */ class LMSDevice:public RadioDevice { -- To view, visit https://gerrit.osmocom.org/12006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I71702feaa11f53e7614a6938a984dd748405474a Gerrit-Change-Number: 12006 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 09:24:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 2 Dec 2018 09:24:22 +0000 Subject: Change in osmo-trx[master]: lms: Set Rx gain to midpoint, as comment suggests. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12007 ) Change subject: lms: Set Rx gain to midpoint, as comment suggests. ...................................................................... lms: Set Rx gain to midpoint, as comment suggests. So far, the Rx gain was set to 34 dB, wile the comment stated it would be set to half-point, which is 73/2=36dB. Let's adjust the code to match the comment. Change-Id: Idc646def53b83faf4e6c011fb595fa436e223b32 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 0a6c4a2..1cda4f9 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -223,7 +223,7 @@ // Set gains to midpoint setTxGain((minTxGain() + maxTxGain()) / 2, i); - setRxGain(34.0, i); + setRxGain((minRxGain() + maxRxGain()) / 2, i); m_lms_stream_rx[i] = {}; m_lms_stream_rx[i].isTx = false; -- To view, visit https://gerrit.osmocom.org/12007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idc646def53b83faf4e6c011fb595fa436e223b32 Gerrit-Change-Number: 12007 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 09:38:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 2 Dec 2018 09:38:48 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11976 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sun, 02 Dec 2018 09:38:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 09:39:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 2 Dec 2018 09:39:05 +0000 Subject: Change in osmo-ci[master]: cosmetic: gerrit-verifications: format docker cmd In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12047 ) Change subject: cosmetic: gerrit-verifications: format docker cmd ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0adcb028be24c2e05189c15b85811777d6287387 Gerrit-Change-Number: 12047 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sun, 02 Dec 2018 09:39:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 09:39:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 2 Dec 2018 09:39:07 +0000 Subject: Change in osmo-ci[master]: cosmetic: gerrit-verifications: format docker cmd In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12047 ) Change subject: cosmetic: gerrit-verifications: format docker cmd ...................................................................... cosmetic: gerrit-verifications: format docker cmd Format the docker command lines just like they are formatted in master-builds.yml. Most notably, this puts every environment variable on its own line. This makes it much easier to compare both files side by side. Change-Id: I0adcb028be24c2e05189c15b85811777d6287387 --- M jobs/gerrit-verifications.yml 1 file changed, 61 insertions(+), 22 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Harald Welte: Looks good to me, approved; Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 71a0904..e70d28e 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -32,9 +32,14 @@ concurrent: true cmd: > # keep first line with less indent to preserve newlines - docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e PATH="$PATH:/build_bin" -w /build \ - -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + docker run --rm=true \ + -e HOME=/build \ + -e MAKE=make \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e PATH="$PATH:/build_bin" \ + -w /build -i -u build \ + -v "$PWD:/build" \ + -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh - libasn1c @@ -64,11 +69,21 @@ # keep first line with less indent to preserve newlines ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" mkdir -p "$ARTIFACT_STORE" - docker run --rm=true -e HOME=/build -e ARTIFACT_STORE=/artifact_store \ - -e JOB_NAME="$JOB_NAME" -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e IU="$IU" -e SMPP="$SMPP" -e MGCP="$MGCP" -e PATH="$PATH:/build_bin" \ - -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build -i -u build -v "$PWD:/build" \ - -v "$HOME/bin:/build_bin" -v "$ARTIFACT_STORE:/artifact_store" \ + docker run --rm=true \ + -e HOME=/build \ + -e ARTIFACT_STORE=/artifact_store \ + -e JOB_NAME="$JOB_NAME" \ + -e MAKE=make \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e IU="$IU" \ + -e SMPP="$SMPP" \ + -e MGCP="$MGCP" \ + -e PATH="$PATH:/build_bin" \ + -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -w /build -i -u build \ + -v "$PWD:/build" \ + -v "$HOME/bin:/build_bin" \ + -v "$ARTIFACT_STORE:/artifact_store" \ osmocom:amd64 /build/contrib/jenkins.sh - openggsn: @@ -80,10 +95,15 @@ concurrent: true cmd: > # keep first line with less indent to preserve newlines - docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build -i -u build \ - -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ - osmocom:amd64 /build/contrib/jenkins.sh + docker run --rm=true \ + -e HOME=/build \ + -e MAKE=make \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e PATH="$PATH:/build_bin" \ + -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -w /build -i -u build \ + -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + osmocom:amd64 /build/contrib/jenkins.sh - osmo-bts: a1_name: FIRMWARE_VERSION @@ -120,9 +140,15 @@ concurrent: true cmd: > # keep first line with less indent to preserve newlines - docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e MGCP="$MGCP" -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build \ - -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + docker run --rm=true \ + -e HOME=/build \ + -e MAKE=make \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e MGCP="$MGCP" \ + -e PATH="$PATH:/build_bin" \ + -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -w /build -i -u build \ + -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh - osmo-msc: @@ -133,10 +159,17 @@ # keep first line with less indent to preserve newlines ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" mkdir -p "$ARTIFACT_STORE" - docker run --rm=true -i -e HOME=/build -e ARTIFACT_STORE=/artifact_store \ - -e JOB_NAME="$JOB_NAME" -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e IU="$IU" -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ - -w /build -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + docker run --rm=true -i \ + -e HOME=/build \ + -e ARTIFACT_STORE=/artifact_store \ + -e JOB_NAME="$JOB_NAME" \ + -e MAKE=make \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e IU="$IU" \ + -e PATH="$PATH:/build_bin" \ + -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -w /build -u build \ + -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ osmocom:amd64 /build/contrib/jenkins.sh @@ -167,9 +200,15 @@ concurrent: true cmd: > # keep first line with less indent to preserve newlines - docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e IU="$IU" -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build \ - -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + docker run --rm=true \ + -e HOME=/build \ + -e MAKE=make \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e IU="$IU" \ + -e PATH="$PATH:/build_bin" \ + -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -w /build -i -u build \ + -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh - osmo-sip-connector -- To view, visit https://gerrit.osmocom.org/12047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0adcb028be24c2e05189c15b85811777d6287387 Gerrit-Change-Number: 12047 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 09:44:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 09:44:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} for MT SMS over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11924 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} for MT SMS over GSUP ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11924/2/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11924/2/msc/MSC_Tests.ttcn at 2149 PS2, Line 2149: FIXME > Add info about what it should represent? Well, the template definition already has a comment with the spec. reference. I can clarify this comment anyway: /* FIXME: encoded SMS TPDU was taken from Wireshark */ -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Sun, 02 Dec 2018 09:44:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 09:49:40 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 09:49:40 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_bssap.c: fix incorrect link_id assignment In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12053 ) Change subject: osmo_bsc_bssap.c: fix incorrect link_id assignment ...................................................................... Patch Set 1: > nice catch! I know we're all busy, but a TTCN3 test to ensure the > use of SACCH might be nice :) To be honest, I have been trying to write a test case for that, before and after fixing this issue. The problem is that I'am not familiar (yet) with the BSC's testing infrastructure, so I've spent a few hours learning/reading/trying and finally gave up :/ I will reopen the issue and try again some day ;) -- To view, visit https://gerrit.osmocom.org/12053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7675e1ce4436fad836778261ac9d446fa8f81483 Gerrit-Change-Number: 12053 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 02 Dec 2018 09:49:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 2 15:14:13 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 2 Dec 2018 15:14:13 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#325?= In-Reply-To: <1119051727.939.1543677007653.JavaMail.jenkins@jenkins.osmocom.org> References: <1119051727.939.1543677007653.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <221711695.959.1543763653314.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 2 16:09:45 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 2 Dec 2018 16:09:45 +0000 Subject: Change in osmo-gsm-tester[master]: Fix and use the right member variable Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12054 Change subject: Fix and use the right member variable ...................................................................... Fix and use the right member variable Change-Id: Ib5d50322ecd30c7724eef8452d22845450e9c633 --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/54/12054/1 diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index 634370f..b29859b 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -82,7 +82,7 @@ """ # Get the base directory for the virtphy/mobile application - inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb'))) + inst = util.Dir(os.path.abspath(self._suite_run.trial.get_inst('osmocom-bb'))) # Assume these are dynamically linked and verify there is a lib dir. lib = inst.child('lib') @@ -113,7 +113,7 @@ options = self.build_binary_options() self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf, self._ev_server, - util.Dir(self.suite_run.get_test_run_dir()), + util.Dir(self._suite_run.get_test_run_dir()), suite_run=self._suite_run) # TODO: We should pass subscribers down to the test and not get it from -- To view, visit https://gerrit.osmocom.org/12054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5d50322ecd30c7724eef8452d22845450e9c633 Gerrit-Change-Number: 12054 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 2 16:17:11 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 2 Dec 2018 16:17:11 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?disable-mgcp-transcoding,--enable?= =?UTF-8?Q?-smpp,osmocom-master-debian9_#3314?= In-Reply-To: <1326608973.952.1543731504309.JavaMail.jenkins@jenkins.osmocom.org> References: <1326608973.952.1543731504309.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1829044157.960.1543767431996.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Dec 2 16:17:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 2 Dec 2018 16:17:14 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?enable-mgcp-transcoding,--enable-?= =?UTF-8?Q?smpp,osmocom-master-debian9_#3314?= In-Reply-To: <858155710.951.1543731501879.JavaMail.jenkins@jenkins.osmocom.org> References: <858155710.951.1543731501879.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2137904094.961.1543767434129.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 2 17:55:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 2 Dec 2018 17:55:44 +0000 Subject: Change in osmo-hlr[master]: add 'show subscriber' command, alias for 'subscriber ... show' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12055 Change subject: add 'show subscriber' command, alias for 'subscriber ... show' ...................................................................... add 'show subscriber' command, alias for 'subscriber ... show' When I wrote the osmo-hlr subscriber command, I failed to heed the common 'show foo' scheme and instead created a 'subscriber [...] show' command. Relieve that weirdness by creating an alias that has 'show' at the start. Change-Id: I01ce9b0868302d40ed05c6a588316a194d6071e4 --- M src/hlr_vty_subscr.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/55/12055/1 diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index 6ce96fe..f0cf8ba 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -159,6 +159,10 @@ return CMD_SUCCESS; } +ALIAS(subscriber_show, show_subscriber_cmd, + "show " SUBSCR, + SHOW_STR SUBSCR_HELP); + DEFUN(subscriber_create, subscriber_create_cmd, SUBSCR_CMD "imsi IDENT create", @@ -478,6 +482,7 @@ void hlr_vty_subscriber_init(void) { install_element_ve(&subscriber_show_cmd); + install_element_ve(&show_subscriber_cmd); install_element(ENABLE_NODE, &subscriber_create_cmd); install_element(ENABLE_NODE, &subscriber_delete_cmd); install_element(ENABLE_NODE, &subscriber_msisdn_cmd); -- To view, visit https://gerrit.osmocom.org/12055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I01ce9b0868302d40ed05c6a588316a194d6071e4 Gerrit-Change-Number: 12055 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 19:17:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 2 Dec 2018 19:17:03 +0000 Subject: Change in osmo-hlr[master]: add 'show subscriber' command, alias for 'subscriber ... show' In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12055 to look at the new patch set (#2). Change subject: add 'show subscriber' command, alias for 'subscriber ... show' ...................................................................... add 'show subscriber' command, alias for 'subscriber ... show' When I wrote the osmo-hlr subscriber command, I failed to heed the common 'show foo' scheme and instead created a 'subscriber [...] show' command. Relieve that weirdness by creating an alias that has 'show' at the start. Arrange string macros so that the 'show subscriber' cmd doesn't end in a space (the SUBSCR macro ends in a space ' ' to implicitly include the space to commands like 'create', 'show', 'update'). Add the new command to test_nodes.vty and test_subscriber.vty. Change-Id: I01ce9b0868302d40ed05c6a588316a194d6071e4 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/55/12055/2 -- To view, visit https://gerrit.osmocom.org/12055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I01ce9b0868302d40ed05c6a588316a194d6071e4 Gerrit-Change-Number: 12055 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 19:17:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 2 Dec 2018 19:17:03 +0000 Subject: Change in osmo-hlr[master]: implement removal of MSISDN Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12056 Change subject: implement removal of MSISDN ...................................................................... implement removal of MSISDN Add the first "official" way to remove the MSISDN from a subscriber entry, to go back to 'MSISDN: none' like just after 'subscriber create'. Add VTY command 'subscriber update msisdn none' to drop the MSISDN from the subscriber. (Like 'subscriber update aud3g none') Add DB_STMT_DELETE_MSISDN_BY_IMSI. In db_subscr_update_msisdn_by_imsi(), allow passing a NULL msisdn, and if NULL, call above delete SQL statement. Change-Id: I15419105ea461137776adb92d384d8985210c90e --- M src/db.c M src/db.h M src/db_hlr.c M src/hlr_vty_subscr.c M tests/test_subscriber.vty 5 files changed, 56 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/56/12056/1 diff --git a/src/db.c b/src/db.c index 4b0577f..bcf83c6 100644 --- a/src/db.c +++ b/src/db.c @@ -62,6 +62,7 @@ [DB_STMT_SUBSCR_CREATE] = "INSERT INTO subscriber (imsi) VALUES ($imsi)", [DB_STMT_DEL_BY_ID] = "DELETE FROM subscriber WHERE id = $subscriber_id", [DB_STMT_SET_MSISDN_BY_IMSI] = "UPDATE subscriber SET msisdn = $msisdn WHERE imsi = $imsi", + [DB_STMT_DELETE_MSISDN_BY_IMSI] = "UPDATE subscriber SET msisdn = NULL WHERE imsi = $imsi", [DB_STMT_AUC_2G_INSERT] = "INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki)" " VALUES($subscriber_id, $algo_id_2g, $ki)", diff --git a/src/db.h b/src/db.h index 956b5ed..34582c8 100644 --- a/src/db.h +++ b/src/db.h @@ -20,6 +20,7 @@ DB_STMT_SUBSCR_CREATE, DB_STMT_DEL_BY_ID, DB_STMT_SET_MSISDN_BY_IMSI, + DB_STMT_DELETE_MSISDN_BY_IMSI, DB_STMT_AUC_2G_INSERT, DB_STMT_AUC_2G_DELETE, DB_STMT_AUC_3G_INSERT, diff --git a/src/db_hlr.c b/src/db_hlr.c index c4d4974..2bccc38 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -135,7 +135,7 @@ /*! Set a subscriber's MSISDN in the HLR database. * \param[in,out] dbc database context. - * \param[in] imsi ASCII string of IMSI digits. + * \param[in] imsi ASCII string of IMSI digits, or NULL to remove the MSISDN. * \param[in] msisdn ASCII string of MSISDN digits. * \returns 0 on success, -EINVAL in case of invalid MSISDN string, -EIO on * database failure, -ENOENT if no such subscriber exists. @@ -146,19 +146,22 @@ int rc; int ret = 0; - if (!osmo_msisdn_str_valid(msisdn)) { + if (msisdn && !osmo_msisdn_str_valid(msisdn)) { LOGHLR(imsi, LOGL_ERROR, "Cannot update subscriber: invalid MSISDN: '%s'\n", msisdn); return -EINVAL; } - sqlite3_stmt *stmt = dbc->stmt[DB_STMT_SET_MSISDN_BY_IMSI]; + sqlite3_stmt *stmt = dbc->stmt[ + msisdn ? DB_STMT_SET_MSISDN_BY_IMSI : DB_STMT_DELETE_MSISDN_BY_IMSI]; if (!db_bind_text(stmt, "$imsi", imsi)) return -EIO; - if (!db_bind_text(stmt, "$msisdn", msisdn)) - return -EIO; + if (msisdn) { + if (!db_bind_text(stmt, "$msisdn", msisdn)) + return -EIO; + } /* execute the statement */ rc = sqlite3_step(stmt); diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index ddbaf26..bc6f6a5 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -142,6 +142,7 @@ #define SUBSCR_UPDATE SUBSCR "update " #define SUBSCR_UPDATE_HELP SUBSCR_HELP "Set or update subscriber data\n" +#define SUBSCR_MSISDN_HELP "Set MSISDN (phone number) of the subscriber\n" DEFUN(subscriber_show, subscriber_show_cmd, @@ -228,9 +229,9 @@ DEFUN(subscriber_msisdn, subscriber_msisdn_cmd, - SUBSCR_UPDATE "msisdn MSISDN", - SUBSCR_UPDATE_HELP - "Set MSISDN (phone number) of the subscriber\n" + SUBSCR_UPDATE "msisdn (none|MSISDN)", + SUBSCR_UPDATE_HELP SUBSCR_MSISDN_HELP + "Remove MSISDN (phone number)\n" "New MSISDN (phone number)\n") { struct hlr_subscriber subscr; @@ -238,15 +239,19 @@ const char *id = argv[1]; const char *msisdn = argv[2]; - if (strlen(msisdn) > sizeof(subscr.msisdn) - 1) { - vty_out(vty, "%% MSISDN is too long, max. %zu characters are allowed%s", - sizeof(subscr.msisdn)-1, VTY_NEWLINE); - return CMD_WARNING; - } + if (strcmp(msisdn, "none") == 0) + msisdn = NULL; + else { + if (strlen(msisdn) > sizeof(subscr.msisdn) - 1) { + vty_out(vty, "%% MSISDN is too long, max. %zu characters are allowed%s", + sizeof(subscr.msisdn)-1, VTY_NEWLINE); + return CMD_WARNING; + } - if (!osmo_msisdn_str_valid(msisdn)) { - vty_out(vty, "%% MSISDN invalid: '%s'%s", msisdn, VTY_NEWLINE); - return CMD_WARNING; + if (!osmo_msisdn_str_valid(msisdn)) { + vty_out(vty, "%% MSISDN invalid: '%s'%s", msisdn, VTY_NEWLINE); + return CMD_WARNING; + } } if (get_subscr_by_argv(vty, id_type, id, &subscr)) @@ -258,11 +263,18 @@ return CMD_WARNING; } - vty_out(vty, "%% Updated subscriber IMSI='%s' to MSISDN='%s'%s", - subscr.imsi, msisdn, VTY_NEWLINE); + if (msisdn) { + vty_out(vty, "%% Updated subscriber IMSI='%s' to MSISDN='%s'%s", + subscr.imsi, msisdn, VTY_NEWLINE); - if (db_subscr_get_by_msisdn(g_hlr->dbc, msisdn, &subscr) == 0) + if (db_subscr_get_by_msisdn(g_hlr->dbc, msisdn, &subscr) == 0) + osmo_hlr_subscriber_update_notify(&subscr); + } else { + vty_out(vty, "%% Updated subscriber IMSI='%s': removed MSISDN%s", + subscr.imsi, VTY_NEWLINE); + osmo_hlr_subscriber_update_notify(&subscr); + } return CMD_SUCCESS; } diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty index c22f2df..8677c9b 100644 --- a/tests/test_subscriber.vty +++ b/tests/test_subscriber.vty @@ -6,7 +6,7 @@ show subscriber (imsi|msisdn|id) IDENT subscriber imsi IDENT create subscriber (imsi|msisdn|id) IDENT delete - subscriber (imsi|msisdn|id) IDENT update msisdn MSISDN + subscriber (imsi|msisdn|id) IDENT update msisdn (none|MSISDN) subscriber (imsi|msisdn|id) IDENT update aud2g none subscriber (imsi|msisdn|id) IDENT update aud2g (comp128v1|comp128v2|comp128v3|xor) ki KI subscriber (imsi|msisdn|id) IDENT update aud3g none @@ -86,6 +86,21 @@ OsmoHLR# subscriber msisdn 12345 show % No subscriber for msisdn = '12345' +OsmoHLR# subscriber msisdn 423 update msisdn none +% Updated subscriber IMSI='123456789023000': removed MSISDN +OsmoHLR# subscriber msisdn 423 show +% No subscriber for msisdn = '423' +OsmoHLR# subscriber imsi 123456789023000 show + ID: 1 + IMSI: 123456789023000 + MSISDN: none +OsmoHLR# subscriber imsi 123456789023000 update msisdn 423 +% Updated subscriber IMSI='123456789023000' to MSISDN='423' +OsmoHLR# subscriber msisdn 423 show + ID: 1 + IMSI: 123456789023000 + MSISDN: 423 + OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 @@ -104,6 +119,10 @@ aud2g Set 2G authentication data aud3g Set UMTS authentication data (3G, and 2G with UMTS AKA) +OsmoHLR# subscriber imsi 123456789023000 update msisdn ? + none Remove MSISDN (phone number) + MSISDN New MSISDN (phone number) + OsmoHLR# subscriber imsi 123456789023000 update aud2g ? none Delete 2G authentication data comp128v1 Use COMP128v1 algorithm -- To view, visit https://gerrit.osmocom.org/12056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I15419105ea461137776adb92d384d8985210c90e Gerrit-Change-Number: 12056 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 19:41:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 19:41:12 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: make NCSS session timeout configurable In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12048 to look at the new patch set (#2). Change subject: SS/USSD: make NCSS session timeout configurable ...................................................................... SS/USSD: make NCSS session timeout configurable It may happen that either the MS or an ESME would become unresponsive, e.g. due to a bug, or a dropped message. This is why we have SS session timeout, that prevents keeping 'stalled' sessions forever. Let's introduce a VTY option, which can be used to configure this timer (by default it's set to 30 seconds): hlr ... ! Use 0 to disable this timer ncss-guard-timeout 30 Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d Related: OS#3717 --- M src/hlr.c M src/hlr.h M src/hlr_ussd.c M src/hlr_ussd.h M src/hlr_vty.c M tests/test_nodes.vty 6 files changed, 29 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/48/12048/2 -- To view, visit https://gerrit.osmocom.org/12048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d Gerrit-Change-Number: 12048 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 19:41:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 19:41:12 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: fix: properly (re)schedule NCSS session timeout In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12049 to look at the new patch set (#2). Change subject: SS/USSD: fix: properly (re)schedule NCSS session timeout ...................................................................... SS/USSD: fix: properly (re)schedule NCSS session timeout It may happen that either the MS or an ESME would become unresponsive, e.g. due to a bug, or a dropped message. This is why we have SS session timeout, that prevents keeping 'stalled' sessions forever. For some reason, it wasn't properly resceduled in case of subsequent SS/USSD activity, so the lifetime of a session was limited. Let's properly (re)schedule it. Change-Id: I11aeacf012b06d3d0b5cc6e64baecf857b645fda Related: OS#3717 --- M src/hlr_ussd.c 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/49/12049/2 -- To view, visit https://gerrit.osmocom.org/12049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I11aeacf012b06d3d0b5cc6e64baecf857b645fda Gerrit-Change-Number: 12049 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 19:42:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 19:42:16 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11991 ) Change subject: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I89727354385b40e18732e8fd1d6c93f4463ade37 Gerrit-Change-Number: 11991 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 02 Dec 2018 19:42:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 19:42:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 19:42:21 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11992 ) Change subject: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 02 Dec 2018 19:42:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 19:45:56 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 19:45:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: correct VTY command in TC_lu_and_ss_session_timeout Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12057 Change subject: MSC_Tests.ttcn: correct VTY command in TC_lu_and_ss_session_timeout ...................................................................... MSC_Tests.ttcn: correct VTY command in TC_lu_and_ss_session_timeout Change-Id: Icd1133ca9f46bc2a9302deebb1e401862cf672cb --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/12057/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index a0ace4e..4adc1a3 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2760,10 +2760,10 @@ testcase TC_lu_and_ss_session_timeout() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(); - f_vty_config(MSCVTY, "msc", "ss-guard-timeout 3"); + f_vty_config(MSCVTY, "msc", "ncss-guard-timeout 3"); vc_conn := f_start_handler(refers(f_tc_lu_and_ss_session_timeout), 51); vc_conn.done; - f_vty_config(MSCVTY, "msc", "ss-guard-timeout 0"); + f_vty_config(MSCVTY, "msc", "ncss-guard-timeout 0"); } /* TODO (SMS): -- To view, visit https://gerrit.osmocom.org/12057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icd1133ca9f46bc2a9302deebb1e401862cf672cb Gerrit-Change-Number: 12057 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 19:51:31 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 19:51:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: add MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11062 ) Change subject: library/GSUP_Types.ttcn: add MO-/MT-FORWARD-SM messages ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf49474a81235096c032ea21f217170f523bd94e Gerrit-Change-Number: 11062 Gerrit-PatchSet: 11 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 02 Dec 2018 19:51:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 19:52:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 19:52:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: add MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11062 ) Change subject: library/GSUP_Types.ttcn: add MO-/MT-FORWARD-SM messages ...................................................................... library/GSUP_Types.ttcn: add MO-/MT-FORWARD-SM messages According to 3GPP TS 29.002, there are two services: - MAP-MO-FORWARD-SHORT-MESSAGE (see 12.2), - MAP-MT-FORWARD-SHORT-MESSAGE (see 12.9), which are used to forward MO/MT short messages. This change replicates both services as GSUP messages: - OSMO_GSUP_MSGT_MO_FORWARD_SM_*, - OSMO_GSUP_MSGT_MT_FORWARD_SM_*. Please note, that only the 'must-have' IEs are introduced by this change, in particular the following: - OSMO_GSUP_SM_RP_MR_IE (see note below), - OSMO_GSUP_SM_RP_DA_IE (see 7.6.8.1), - OSMO_GSUP_SM_RP_OA_IE (see 7.6.8.2), - OSMO_GSUP_SM_RP_UI_IE (see 7.6.8.4), - OSMO_GSUP_SM_RP_MMS_IE (see 7.6.8.7), - OSMO_GSUP_SM_RP_CAUSE_IE (see GSM TS 04.11, 8.2.5.4), where both SM_RP_DA and SM_RP_OA IEs basically contain a single nested TLV of the following format: - T: identity type (see 'GSUP_SM_RP_ODA_IdType'), - L: identity length, - V: encoded identity itself. According to GSM TS 04.11, every single message on the SM-RL has an unique message reference (see 8.2.3), that is used to link an RP-ACK or RP-ERROR message to the associated (preceding) RP-DATA or RP-SMMA message transfer attempt. In case of TCAP/MAP, this message reference is being mapped to the Invoke ID. But since GSUP has no 'Invoke ID' IE, and it is not required for other applications (other than SMS), this change introduces a special 'SM_RP_MR' IE that doesn't exist in MAP. Change-Id: Ibf49474a81235096c032ea21f217170f523bd94e Related: OS#3587 --- M library/GSUP_Types.ttcn 1 file changed, 433 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 6329ebd..9cb3255 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -43,7 +43,15 @@ OSMO_GSUP_SESSION_ID_IE ('30'O), OSMO_GSUP_SESSION_STATE_IE ('31'O), - OSMO_GSUP_SS_INFO_IE ('35'O) + OSMO_GSUP_SS_INFO_IE ('35'O), + + /* SM related IEs (see 3GPP TS 29.002, section 7.6.8) */ + OSMO_GSUP_SM_RP_MR_IE ('40'O), + OSMO_GSUP_SM_RP_DA_IE ('41'O), + OSMO_GSUP_SM_RP_OA_IE ('42'O), + OSMO_GSUP_SM_RP_UI_IE ('43'O), + OSMO_GSUP_SM_RP_CAUSE_IE ('44'O), + OSMO_GSUP_SM_RP_MMS_IE ('45'O) } with { variant "FIELDLENGTH(8)" }; type enumerated GSUP_MessageType { @@ -75,7 +83,15 @@ OSMO_GSUP_MSGT_PROC_SS_REQUEST ('00100000'B), OSMO_GSUP_MSGT_PROC_SS_ERROR ('00100001'B), - OSMO_GSUP_MSGT_PROC_SS_RESULT ('00100010'B) + OSMO_GSUP_MSGT_PROC_SS_RESULT ('00100010'B), + + OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST ('00100100'B), + OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR ('00100101'B), + OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT ('00100110'B), + + OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST ('00101000'B), + OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR ('00101001'B), + OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT ('00101010'B) } with { variant "FIELDLENGTH(8)" }; type enumerated GSUP_CancelType { @@ -128,6 +144,12 @@ session_state, tag = OSMO_GSUP_SESSION_STATE_IE; session_id, tag = OSMO_GSUP_SESSION_ID_IE; ss_info, tag = OSMO_GSUP_SS_INFO_IE; + sm_rp_mr, tag = OSMO_GSUP_SM_RP_MR_IE; + sm_rp_da, tag = OSMO_GSUP_SM_RP_DA_IE; + sm_rp_oa, tag = OSMO_GSUP_SM_RP_OA_IE; + sm_rp_ui, tag = OSMO_GSUP_SM_RP_UI_IE; + sm_rp_cause, tag = OSMO_GSUP_SM_RP_CAUSE_IE; + sm_rp_mms, tag = OSMO_GSUP_SM_RP_MMS_IE; )" }; @@ -161,7 +183,14 @@ GSUP_SessionState session_state, OCT4 session_id, /* Supplementary Services */ - octetstring ss_info + octetstring ss_info, + /* Short Message Service */ + OCT1 sm_rp_mr, + GSUP_SM_RP_DA sm_rp_da, + GSUP_SM_RP_OA sm_rp_oa, + octetstring sm_rp_ui, + OCT1 sm_rp_cause, + OCT1 sm_rp_mms }; type record GSUP_PDU { @@ -593,6 +622,235 @@ } } +template (value) GSUP_IE ts_GSUP_IE_SM_RP_MR(OCT1 ref) := { + tag := OSMO_GSUP_SM_RP_MR_IE, + len := 0, /* overwritten */ + val := { + sm_rp_mr := ref + } +} +template GSUP_IE tr_GSUP_IE_SM_RP_MR(template OCT1 ref) := { + tag := OSMO_GSUP_SM_RP_MR_IE, + len := ?, + val := { + sm_rp_mr := ref + } +} + +template (value) GSUP_IE ts_GSUP_IE_SM_RP_CAUSE(OCT1 cause) := { + tag := OSMO_GSUP_SM_RP_CAUSE_IE, + len := 0, /* overwritten */ + val := { + sm_rp_cause := cause + } +} +template GSUP_IE tr_GSUP_IE_SM_RP_CAUSE(template OCT1 cause) := { + tag := OSMO_GSUP_SM_RP_CAUSE_IE, + len := ?, + val := { + sm_rp_cause := cause + } +} + +template (value) GSUP_IE ts_GSUP_IE_SM_RP_MMS(OCT1 mms) := { + tag := OSMO_GSUP_SM_RP_MMS_IE, + len := 0, /* overwritten */ + val := { + sm_rp_mms := mms + } +} +template GSUP_IE tr_GSUP_IE_SM_RP_MMS(template OCT1 mms) := { + tag := OSMO_GSUP_SM_RP_MMS_IE, + len := ?, + val := { + sm_rp_mms := mms + } +} + +/* Possible identity types for SM-RP-{OA|DA} IEs */ +type enumerated GSUP_SM_RP_ODA_IdType { + OSMO_GSUP_SM_RP_ODA_ID_NONE ('00'O), + OSMO_GSUP_SM_RP_ODA_ID_IMSI ('01'O), + OSMO_GSUP_SM_RP_ODA_ID_MSISDN ('02'O), + OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR ('03'O), + /* Special value for noSM-RP-DA and noSM-RP-OA */ + OSMO_GSUP_SM_RP_ODA_ID_NULL ('FF'O) +} with { variant "FIELDLENGTH(8)" }; + +/** + * SM-RP-DA represents the SM Destination Address, see 7.6.8.1. + * It can be either of the following: + * - IMSI + * - LMSI (not implemented) + * - MSISDN + * - roaming number (not implemented) + * - service centre address + */ +type union GSUP_SM_RP_DA_ID { + hexstring imsi, + hexstring msisdn, + hexstring smsc_addr +}; + +type record GSUP_SM_RP_DA { + GSUP_SM_RP_ODA_IdType id_type, + uint8_t id_len, + GSUP_SM_RP_DA_ID id_enc optional +} with { variant (id_len) "LENGTHTO(id_enc)" + variant (id_enc) "CROSSTAG( + imsi, id_type = OSMO_GSUP_SM_RP_ODA_ID_IMSI; + msisdn, id_type = OSMO_GSUP_SM_RP_ODA_ID_MSISDN; + smsc_addr, id_type = OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR; + /* FIXME: how to handle noSM-RP-DA? */ + )" +}; + +template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_IMSI(hexstring imsi) := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_IMSI, + id_len := 0, /* overwritten */ + id_enc := { imsi := imsi } +} +template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_IMSI(template hexstring imsi) := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_IMSI, + id_len := ?, + id_enc := { imsi := imsi } +} + +template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_MSISDN(hexstring msisdn) := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, + id_len := 0, /* overwritten */ + id_enc := { msisdn := msisdn } +} +template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_MSISDN(template hexstring msisdn) := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, + id_len := ?, + id_enc := { msisdn := msisdn } +} + +template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_SMSC_ADDR(hexstring smsc_addr) := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, + id_len := 0, /* overwritten */ + id_enc := { smsc_addr := smsc_addr } +} +template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_SMSC_ADDR(template hexstring smsc_addr) := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, + id_len := ?, + id_enc := { smsc_addr := smsc_addr } +} + +template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_NULL := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL, + id_len := 0, /* overwritten */ + id_enc := omit +} +template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_NULL := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL, + id_len := ?, + id_enc := omit +} + +template (value) GSUP_IE ts_GSUP_IE_SM_RP_DA(GSUP_SM_RP_DA val) := { + tag := OSMO_GSUP_SM_RP_DA_IE, + len := 0, /* overwritten */ + val := { + sm_rp_da := val + } +} +template GSUP_IE tr_GSUP_IE_SM_RP_DA(template GSUP_SM_RP_DA val) := { + tag := OSMO_GSUP_SM_RP_DA_IE, + len := ?, + val := { + sm_rp_da := val + } +} + +/** + * SM-RP-OA represents the SM Originating Address, see 7.6.8.2. + * It can be either of the following: + * - MSISDN + * - service centre address + */ +type union GSUP_SM_RP_OA_ID { + hexstring msisdn, + hexstring smsc_addr +}; + +type record GSUP_SM_RP_OA { + GSUP_SM_RP_ODA_IdType id_type, + uint8_t id_len, + GSUP_SM_RP_OA_ID id_enc optional +} with { variant (id_len) "LENGTHTO(id_enc)" + variant (id_enc) "CROSSTAG( + msisdn, id_type = OSMO_GSUP_SM_RP_ODA_ID_MSISDN; + smsc_addr, id_type = OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR; + /* FIXME: how to handle noSM-RP-OA? */ + )" +}; + +template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_MSISDN(hexstring msisdn) := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, + id_len := 0, /* overwritten */ + id_enc := { msisdn := msisdn } +} +template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_MSISDN(template hexstring msisdn) := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, + id_len := ?, + id_enc := { msisdn := msisdn } +} + +template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_SMSC_ADDR(hexstring smsc_addr) := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, + id_len := 0, /* overwritten */ + id_enc := { smsc_addr := smsc_addr } +} +template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_SMSC_ADDR(template hexstring smsc_addr) := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, + id_len := ?, + id_enc := { smsc_addr := smsc_addr } +} + +template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_NULL := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL, + id_len := 0, /* overwritten */ + id_enc := omit +} +template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_NULL := { + id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL, + id_len := ?, + id_enc := omit +} + +template (value) GSUP_IE ts_GSUP_IE_SM_RP_OA(GSUP_SM_RP_OA val) := { + tag := OSMO_GSUP_SM_RP_OA_IE, + len := 0, /* overwritten */ + val := { + sm_rp_oa := val + } +} +template GSUP_IE tr_GSUP_IE_SM_RP_OA(template GSUP_SM_RP_OA val) := { + tag := OSMO_GSUP_SM_RP_OA_IE, + len := ?, + val := { + sm_rp_oa := val + } +} + +/* SM-RP-UI represents the SM TPDU, see 7.6.8.4 */ +template (value) GSUP_IE ts_GSUP_IE_SM_RP_UI(octetstring val) := { + tag := OSMO_GSUP_SM_RP_UI_IE, + len := 0, /* overwritten */ + val := { + sm_rp_ui := val + } +} +template GSUP_IE tr_GSUP_IE_SM_RP_UI(template octetstring val) := { + tag := OSMO_GSUP_SM_RP_UI_IE, + len := ?, + val := { + sm_rp_ui := val + } +} + template (value) GSUP_IE ts_GSUP_IE_SSInfo(octetstring ss) := { tag := OSMO_GSUP_SS_INFO_IE, len := 0, /* overwritten */ @@ -718,6 +976,178 @@ } ); +template (value) GSUP_PDU ts_GSUP_MO_FORWARD_SM_REQ( + hexstring imsi, + OCT1 sm_rp_mr, /* Message Reference, see GSM TS 04.11, 8.2.3 */ + GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */ + GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */ + octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST, + { + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), + valueof(ts_GSUP_IE_SM_RP_DA(sm_rp_da)), + valueof(ts_GSUP_IE_SM_RP_OA(sm_rp_oa)), + valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)) + } +); +template GSUP_PDU tr_GSUP_MO_FORWARD_SM_REQ( + template hexstring imsi := ?, + template OCT1 sm_rp_mr := ?, /* Message Reference, see GSM TS 04.11, 8.2.3 */ + template GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */ + template GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */ + template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST, + { + tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_SM_RP_MR(sm_rp_mr), + tr_GSUP_IE_SM_RP_DA(sm_rp_da), + tr_GSUP_IE_SM_RP_OA(sm_rp_oa), + tr_GSUP_IE_SM_RP_UI(sm_rp_ui) + } +); + +template (value) GSUP_PDU ts_GSUP_MO_FORWARD_SM_RES( + hexstring imsi, + OCT1 sm_rp_mr /* Message Reference, see GSM TS 04.11, 8.2.3 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT, + { + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)) + } +); +template GSUP_PDU tr_GSUP_MO_FORWARD_SM_RES( + template hexstring imsi := ?, + template OCT1 sm_rp_mr := ? /* Message Reference, see GSM TS 04.11, 8.2.3 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT, + { + tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_SM_RP_MR(sm_rp_mr) + } +); + +template (value) GSUP_PDU ts_GSUP_MO_FORWARD_SM_ERR( + hexstring imsi, + OCT1 sm_rp_mr, /* Message Reference, see GSM TS 04.11, 8.2.3 */ + OCT1 sm_rp_cause /* RP-Cause value, see GSM TS 04.11, 8.2.5.4 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR, + { + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), + valueof(ts_GSUP_IE_SM_RP_CAUSE(sm_rp_cause)) + } +); +template GSUP_PDU tr_GSUP_MO_FORWARD_SM_ERR( + template hexstring imsi := ?, + template OCT1 sm_rp_mr := ?, /* Message Reference, see GSM TS 04.11, 8.2.3 */ + template OCT1 sm_rp_cause := ? /* RP-Cause value, see GSM TS 04.11, 8.2.5.4 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR, + { + tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_SM_RP_MR(sm_rp_mr), + tr_GSUP_IE_SM_RP_CAUSE(sm_rp_cause) + } +); + +template (value) GSUP_PDU ts_GSUP_MT_FORWARD_SM_REQ( + hexstring imsi, + OCT1 sm_rp_mr, /* Message Reference, see GSM TS 04.11, 8.2.3 */ + GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */ + GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */ + octetstring sm_rp_ui, /* SM TPDU, see 7.6.8.4 */ + OCT1 sm_rp_mms /* MMS (More Messages to Send), see 7.6.8.7 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST, + { + /** + * TODO: add MT-specific fields (and IEs): + * - smDeliveryTimer + * - smDeliveryStartTime + */ + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), + valueof(ts_GSUP_IE_SM_RP_DA(sm_rp_da)), + valueof(ts_GSUP_IE_SM_RP_OA(sm_rp_oa)), + valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)), + valueof(ts_GSUP_IE_SM_RP_MMS(sm_rp_mms)) + } +); +template GSUP_PDU tr_GSUP_MT_FORWARD_SM_REQ( + template hexstring imsi := ?, + template OCT1 sm_rp_mr := ?, /* Message Reference, see GSM TS 04.11, 8.2.3 */ + template GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */ + template GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */ + template octetstring sm_rp_ui, /* SM TPDU, see 7.6.8.4 */ + template OCT1 sm_rp_mms /* MMS (More Messages to Send), see 7.6.8.7 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST, + { + /** + * TODO: add MT-specific fields (and IEs): + * - smDeliveryTimer + * - smDeliveryStartTime + */ + tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_SM_RP_MR(sm_rp_mr), + tr_GSUP_IE_SM_RP_DA(sm_rp_da), + tr_GSUP_IE_SM_RP_OA(sm_rp_oa), + tr_GSUP_IE_SM_RP_UI(sm_rp_ui), + tr_GSUP_IE_SM_RP_MMS(sm_rp_mms) + } +); + +template (value) GSUP_PDU ts_GSUP_MT_FORWARD_SM_RES( + hexstring imsi, + OCT1 sm_rp_mr /* Message Reference, see GSM TS 04.11, 8.2.3 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT, + { + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)) + } +); +template GSUP_PDU tr_GSUP_MT_FORWARD_SM_RES( + template hexstring imsi := ?, + template OCT1 sm_rp_mr := ? /* Message Reference, see GSM TS 04.11, 8.2.3 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT, + { + tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_SM_RP_MR(sm_rp_mr) + } +); + +template (value) GSUP_PDU ts_GSUP_MT_FORWARD_SM_ERR( + hexstring imsi, + OCT1 sm_rp_mr, /* Message Reference, see GSM TS 04.11, 8.2.3 */ + OCT1 sm_rp_cause /* RP-Cause value, see GSM TS 04.11, 8.2.5.4 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR, + { + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), + valueof(ts_GSUP_IE_SM_RP_CAUSE(sm_rp_cause)) + } +); +template GSUP_PDU tr_GSUP_MT_FORWARD_SM_ERR( + template hexstring imsi := ?, + template OCT1 sm_rp_mr := ?, /* Message Reference, see GSM TS 04.11, 8.2.3 */ + template OCT1 sm_rp_cause := ? /* RP-Cause value, see GSM TS 04.11, 8.2.5.4 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR, + { + tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_SM_RP_MR(sm_rp_mr), + tr_GSUP_IE_SM_RP_CAUSE(sm_rp_cause) + } +); + function f_gsup_find_ie(GSUP_PDU msg, GSUP_IEI iei, out GSUP_IeValue ret) return boolean { for (var integer i := 0; i < sizeof(msg.ies); i := i+1) { if (msg.ies[i].tag == iei) { -- To view, visit https://gerrit.osmocom.org/11062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibf49474a81235096c032ea21f217170f523bd94e Gerrit-Change-Number: 11062 Gerrit-PatchSet: 11 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 20:01:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 2 Dec 2018 20:01:22 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12052 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 3 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: d0gtail Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 02 Dec 2018 20:01:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 20:01:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 2 Dec 2018 20:01:27 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12052 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... UHDDevice: log exception information on device open failure Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 3db09a8..765150f 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -635,8 +635,8 @@ LOGC(DDEV, INFO) << "Using discovered UHD device " << dev_addrs[0].to_string(); try { usrp_dev = uhd::usrp::multi_usrp::make(addr); - } catch(...) { - LOGC(DDEV, ALERT) << "UHD make failed, device " << args; + } catch(uhd::key_error::exception &e) { + LOGC(DDEV, ALERT) << "UHD make failed, device " << args << ", exception:\n" << e.what(); return -1; } -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 4 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: d0gtail Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 22:08:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 22:08:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11924 to look at the new patch set (#3). Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} The idea of this test case is to verify MT SMS transmission initiated by ESME over GSUP. Basically, the algorythm is the following: 1.0 send MT-ForwardSM-Req on GSUP, 1.1 expect Paging Request on RAN, 1.2 establish a RAN connection, 1.3 expect CP-DATA/RP-DATA on BSSAP/DTAP, 2.1 send CP-DATA/RP-ACK on BSSAP/DTAP, 2.2.a expect MT-ForwardSM-Res 2.2.b expect MT-ForwardSM-Err Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Related: OS#3587 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 149 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/11924/3 -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 22:08:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 22:08:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12058 Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms The idea of this test case is to verify the process of multi-part MT SMS transmission. The MSC should keep the RAN connection until the last message part is transmitted. Change-Id: I6308586a70c4fb3254c519330a61a9667372149f Related: OS#3587 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/12058/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 3364e64..8a29696 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2291,6 +2291,77 @@ f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); } +/* Test multi-part MT-SMS over GSUP */ +private function f_tc_gsup_mt_multi_part_sms(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + /* Register an 'expect' for given IMSI (+TMSI) */ + if (isvalue(g_pars.tmsi)) { + f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi); + } else { + f_bssmap_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + } + + var template GSUP_PDU mt_forwardSM_res := tr_GSUP_MT_FORWARD_SM_RES( + imsi := g_pars.imsi, + /* NOTE: MSC should assign RP-MR itself */ + sm_rp_mr := ? + ); + + /* Send 4 messages (NOTE: SM-RP-UI remains unchanged) */ + for (var integer i := 3; i >= 0; i := i-1) { + /* Submit a MT SMS on GSUP (MMS is decremented) */ + f_gsup_forwardSM_req(spars, int2oct(i, 1)); + + /* Expect Paging Request and Establish connection */ + if (i == 3) { /* ... only once! */ + BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)); + f_establish_fully(EST_TYPE_PAG_RESP); + } + + /* Wait for MT SMS on DTAP */ + f_mt_sms_expect(spars); + + /* Send RP-ACK and expect MT-forwardSM-Res on GSUP */ + f_mt_sms_send_rp_ack(spars); + alt { + [] GSUP.receive(mt_forwardSM_res) { + log("RX MT-forwardSM-Res (RP-ACK)"); + setverdict(pass); + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + /* Keep some 'distance' between transmissions */ + f_sleep(1.5); + } + + f_expect_clear(); +} +testcase TC_gsup_mt_multi_part_sms() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(); + pars := f_init_pars(91); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler_with_pars(refers(f_tc_gsup_mt_multi_part_sms), pars); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + /* convert GSM L3 TON to SMPP_TON enum */ function f_sm_ton_from_gsm(BIT3 ton) return SMPP_TON { select (ton) { @@ -3122,6 +3193,7 @@ execute( TC_gsup_mo_smma() ); execute( TC_gsup_mt_sms_ack() ); execute( TC_gsup_mt_sms_err() ); + execute( TC_gsup_mt_multi_part_sms() ); execute( TC_lu_and_mo_ussd_single_request() ); execute( TC_lu_and_mt_ussd_notification() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 710d6d4..a4a3322 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -67,6 +67,7 @@ + -- To view, visit https://gerrit.osmocom.org/12058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6308586a70c4fb3254c519330a61a9667372149f Gerrit-Change-Number: 12058 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 22:11:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 22:11:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11924 to look at the new patch set (#4). Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} The idea of this test case is to verify MT SMS transmission initiated by ESME over GSUP. Basically, the algorythm is the following: 1.0 send MT-ForwardSM-Req on GSUP, 1.1 expect Paging Request on RAN, 1.2 establish a RAN connection, 1.3 expect CP-DATA/RP-DATA on BSSAP/DTAP, 2.1 send CP-DATA/RP-ACK on BSSAP/DTAP, 2.2.a expect MT-ForwardSM-Res, 2.2.b expect MT-ForwardSM-Err. Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Related: OS#3587 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 149 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/11924/4 -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 22:11:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 22:11:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12058 to look at the new patch set (#2). Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms The idea of this test case is to verify the process of multi-part MT SMS transmission. The MSC should keep the RAN connection until the last message part is transmitted. Change-Id: I6308586a70c4fb3254c519330a61a9667372149f Related: OS#3587 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/12058/2 -- To view, visit https://gerrit.osmocom.org/12058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6308586a70c4fb3254c519330a61a9667372149f Gerrit-Change-Number: 12058 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 22:11:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 22:11:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: add READY-FOR-SM message In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11752 ) Change subject: library/GSUP_Types.ttcn: add READY-FOR-SM message ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If2256607527ecfcb10285583332fb8b0515d7c78 Gerrit-Change-Number: 11752 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 02 Dec 2018 22:11:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 22:11:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 22:11:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler.ttcn: split up f_mo_sms() into two functions In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11717 ) Change subject: BSC_ConnectionHandler.ttcn: split up f_mo_sms() into two functions ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b35206286ae8add8b5bd34b0ab41ba7862c28e4 Gerrit-Change-Number: 11717 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 02 Dec 2018 22:11:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 22:11:32 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 22:11:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mo_sms for MO SMS over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11718 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mo_sms for MO SMS over GSUP ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id14bbd8bd51558cdacefea0fe042769cd69ed5c8 Gerrit-Change-Number: 11718 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 02 Dec 2018 22:11:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 22:11:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 22:11:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11776 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7abc95b8e416f7308d54e11be11c08586d18e6c5 Gerrit-Change-Number: 11776 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 02 Dec 2018 22:11:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 22:21:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 22:21:25 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 10 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 02 Dec 2018 22:21:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 22:21:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 22:21:29 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11751 ) Change subject: GSUP/SMS: introduce READY-FOR-SM message ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Gerrit-Change-Number: 11751 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 02 Dec 2018 22:21:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 22:22:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 22:22:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms for MT SMS over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11777 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms for MT SMS over GSUP ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ic93105e8f9d230ac7c1991395e719c461b3cd8ab Gerrit-Change-Number: 11777 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 2 23:13:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 2 Dec 2018 23:13:13 +0000 Subject: Change in osmo-msc[master]: (HACK) libmsc/gsm_04_11.c: properly handle MMS indication Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12059 Change subject: (HACK) libmsc/gsm_04_11.c: properly handle MMS indication ...................................................................... (HACK) libmsc/gsm_04_11.c: properly handle MMS indication MMS (More Messages to Send) is a part of MT-ForwardSM-Req message, that is used by ESME to indicate that there are more MT SMS messages to be sent, so the MSC should keep RAN connection open. Change-Id: Ic46b04913b2e8cc5d11a39426dcc1bfe11f1d31e Related Change-Id: (TTCN) I6308586a70c4fb3254c519330a61a9667372149f Related: OS#3587 --- M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/ran_conn.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_11_gsup.c M src/libmsc/osmo_msc.c 6 files changed, 25 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/59/12059/1 diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index 4297cdb..0e5b3d2 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -42,7 +42,8 @@ int gsm411_send_sms(struct gsm_network *net, struct vlr_subscr *vsub, struct gsm_sms *sms); -int gsm411_send_rp_data(struct gsm_network *net, struct vlr_subscr *vsub, +int gsm411_send_rp_data(struct gsm_network *net, + struct vlr_subscr *vsub, uint8_t *mms_ind, size_t sm_rp_oa_len, const uint8_t *sm_rp_oa, size_t sm_rp_ud_len, const uint8_t *sm_rp_ud); diff --git a/include/osmocom/msc/ran_conn.h b/include/osmocom/msc/ran_conn.h index d71872e..5975a59 100644 --- a/include/osmocom/msc/ran_conn.h +++ b/include/osmocom/msc/ran_conn.h @@ -220,6 +220,7 @@ RAN_CONN_USE_TRANS_SMS, RAN_CONN_USE_TRANS_NC_SS, RAN_CONN_USE_SILENT_CALL, + RAN_CONN_USE_MT_SMS_MMTS, RAN_CONN_USE_RELEASE, }; diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 0760c07..a987b1c 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -78,6 +78,9 @@ /* SM-RP-MR, Message Reference (see GSM TS 04.11, section 8.2.3) */ uint8_t sm_rp_mr; + /* SM-RP-MMS, More Messages to Send + * (see GSM 3GPP TS 29.002, section 7.6.8.7) */ + bool sm_rp_mms; struct gsm_sms *sms; } sms; diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 01f1cb5..c77c4ec 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -1133,7 +1133,8 @@ } /* Low-level function to send raw RP-DATA to a given subscriber */ -int gsm411_send_rp_data(struct gsm_network *net, struct vlr_subscr *vsub, +int gsm411_send_rp_data(struct gsm_network *net, + struct vlr_subscr *vsub, uint8_t *mms_ind, size_t sm_rp_oa_len, const uint8_t *sm_rp_oa, size_t sm_rp_ud_len, const uint8_t *sm_rp_ud) { @@ -1146,6 +1147,10 @@ if (!trans) return -ENOMEM; + /* Handle MMS indication */ + if (mms_ind != NULL && *mms_ind != 0x00) + trans->sms.sm_rp_mms = true; + /* Allocate a message buffer for to be encoded SMS */ msg = gsm411_msgb_alloc(); if (!msg) { @@ -1277,6 +1282,17 @@ trans->sms.smc_inst.mn_recv = NULL; trans->sms.smc_inst.mm_send = NULL; + /* HACK: handle SM-RP-MMS (More Messages to Send) */ + if (trans->conn != NULL) { + if (trans->sms.sm_rp_mms) { + if (!ran_conn_used_by(trans->conn, RAN_CONN_USE_MT_SMS_MMTS)) + ran_conn_get(trans->conn, RAN_CONN_USE_MT_SMS_MMTS); + } else { + if (ran_conn_used_by(trans->conn, RAN_CONN_USE_MT_SMS_MMTS)) + ran_conn_put(trans->conn, RAN_CONN_USE_MT_SMS_MMTS); + } + } + if (trans->sms.sms) { LOGP(DLSMS, LOGL_ERROR, "Transaction contains SMS.\n"); send_signal(S_SMS_UNKNOWN_ERROR, trans, trans->sms.sms, 0); diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index 9b15961..2aedbf4 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -280,7 +280,7 @@ goto msg_error; /* Send RP-DATA */ - rc = gsm411_send_rp_data(net, vsub, + rc = gsm411_send_rp_data(net, vsub, gsup_msg->sm_rp_mms, gsup_msg->sm_rp_oa_len, gsup_msg->sm_rp_oa, gsup_msg->sm_rp_ui_len, gsup_msg->sm_rp_ui); if (rc) { diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 52277b7..a996e14 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -316,6 +316,7 @@ {RAN_CONN_USE_TRANS_SMS, "trans_sms"}, {RAN_CONN_USE_TRANS_NC_SS, "trans_nc_ss"}, {RAN_CONN_USE_SILENT_CALL, "silent_call"}, + {RAN_CONN_USE_MT_SMS_MMTS, "mt_sms_mmts"}, {RAN_CONN_USE_RELEASE, "release"}, {0, NULL}, }; -- To view, visit https://gerrit.osmocom.org/12059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic46b04913b2e8cc5d11a39426dcc1bfe11f1d31e Gerrit-Change-Number: 12059 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 00:31:31 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 00:31:31 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 00:31:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 00:31:35 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 00:31:35 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 03 Dec 2018 00:31:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 00:43:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 00:43:20 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: fix direction for SS messages Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12060 Change subject: chapters/gsup.adoc: fix direction for SS messages ...................................................................... chapters/gsup.adoc: fix direction for SS messages Most likely, this was a copy-paste error. SGSN is not involved in Supplemeptary Services handling, they are pure CS data. Moreover, HLR is not the only entity that can initiate both Process Supplementary Service Error and Response messages, there is also EUSE (External USSD handling Entity). Change-Id: I46ad7311747f2b392244c49d3df1e152e6f1bfe3 --- M common/chapters/gsup.adoc 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/60/12060/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index e87d979..70295cf 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -474,7 +474,7 @@ ==== Process Supplementary Service Error -Direction: HLR => SGSN / VLR +Direction: EUSE / HLR => MSC [options="header",cols="5%,20%,45%,10%,10%,10%"] |=== @@ -488,7 +488,7 @@ ==== Process Supplementary Service Response -Direction: HLR => SGSN / VLR +Direction: EUSE / HLR => MSC [options="header",cols="5%,20%,45%,10%,10%,10%"] |=== -- To view, visit https://gerrit.osmocom.org/12060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I46ad7311747f2b392244c49d3df1e152e6f1bfe3 Gerrit-Change-Number: 12060 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 3 06:17:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 3 Dec 2018 06:17:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7201?= Message-ID: <1905540806.974.1543817841542.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-msc" build number 7201 originally caused by: Started by upstream project "master-libosmo-sccp" build number 1872 originally caused by: Started by timer Building remotely on build2-deb9build-ansible (ttcn3 osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-msc > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-msc +refs/heads/*:refs/remotes/origin/* Checking out Revision 1263bc801749af648cf4fae790ddbdd348d87e69 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 1263bc801749af648cf4fae790ddbdd348d87e69 Commit message: "move gsm_cbfn to gsm_subscriber.h, the only user" > git rev-list --no-walk 1263bc801749af648cf4fae790ddbdd348d87e69 # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins9135587703213621573.sh + ARTIFACT_STORE=/home/osmocom-build/jenkins_build_artifact_store + mkdir -p /home/osmocom-build/jenkins_build_artifact_store + docker run --rm=true -i -e HOME=/build -e ARTIFACT_STORE=/artifact_store -e JOB_NAME=master-osmo-msc/IU=--disable-iu,a2=default,a3=default,label=osmocom-master-debian9 -e MAKE=make -e PARALLEL_MAKE=-j 8 -e IU=--disable-iu -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -w /build -u build -v :/build -v /home/osmocom-build/bin:/build_bin -v /home/osmocom-build/jenkins_build_artifact_store:/artifact_store osmocom:amd64 /build/contrib/jenkins.sh --publish + base=/build + deps=/build/deps + inst=/build/deps/install + export deps inst + osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf Skipping repository deps/libosmocore Skipping repository deps/libosmo-sccp Skipping repository deps/libosmo-netif Skipping repository deps/libsmpp34 Skipping repository deps/osmo-hlr Skipping repository deps/libosmo-abis Skipping repository deps/osmo-mgw + [ -d /build/deps ] + git_clean /build/deps/libosmo-abis + repos=/build/deps/libosmo-abis + [ ! -d /build/deps/libosmo-abis ] + [ ! -d /build/deps/libosmo-abis/.git ] + git -C /build/deps/libosmo-abis checkout -f HEAD + git -C /build/deps/libosmo-abis clean -dxf + git_clean /build/deps/libosmo-netif + repos=/build/deps/libosmo-netif + [ ! -d /build/deps/libosmo-netif ] + [ ! -d /build/deps/libosmo-netif/.git ] + git -C /build/deps/libosmo-netif checkout -f HEAD + git -C /build/deps/libosmo-netif clean -dxf + git_clean /build/deps/libosmo-sccp + repos=/build/deps/libosmo-sccp + [ ! -d /build/deps/libosmo-sccp ] + [ ! -d /build/deps/libosmo-sccp/.git ] + git -C /build/deps/libosmo-sccp checkout -f HEAD + git -C /build/deps/libosmo-sccp clean -dxf + git_clean /build/deps/libosmocore + repos=/build/deps/libosmocore + [ ! -d /build/deps/libosmocore ] + [ ! -d /build/deps/libosmocore/.git ] + git -C /build/deps/libosmocore checkout -f HEAD + git -C /build/deps/libosmocore clean -dxf + git_clean /build/deps/libsmpp34 + repos=/build/deps/libsmpp34 + [ ! -d /build/deps/libsmpp34 ] + [ ! -d /build/deps/libsmpp34/.git ] + git -C /build/deps/libsmpp34 checkout -f HEAD + git -C /build/deps/libsmpp34 clean -dxf + git_clean /build/deps/osmo-hlr + repos=/build/deps/osmo-hlr + [ ! -d /build/deps/osmo-hlr ] + [ ! -d /build/deps/osmo-hlr/.git ] + git -C /build/deps/osmo-hlr checkout -f HEAD + git -C /build/deps/osmo-hlr clean -dxf + git_clean /build/deps/osmo-mgw + repos=/build/deps/osmo-mgw + [ ! -d /build/deps/osmo-mgw ] + [ ! -d /build/deps/osmo-mgw/.git ] + git -C /build/deps/osmo-mgw checkout -f HEAD + git -C /build/deps/osmo-mgw clean -dxf + [ -d layer1-headers ] + mkdir /build/deps mkdir: cannot create directory '/build/deps': File exists + true + osmo-build-dep.sh libosmocore '' ac_cv_path_DOXYGEN=false =============================== libosmocore =============================== + mkdir -p /build/deps + cd /build/deps + osmo-deps.sh libosmocore + project=libosmocore + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmocore + cd libosmocore + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master HEAD is now at f69aa9c... Move BSSMAP_MSG_* defines to header file + git rev-parse HEAD f69aa9cb6a3e2174a12fa2864b4869485d0c917a + cd libosmocore + mkdir -p /build/deps/install/stow + autoreconf --install --force autom4te: cannot create /tmp/arKvlzHb/am4t9705.93: No space left on device at /usr/bin/autom4te line 969. aclocal: error: echo failed with exit status: 28 autoreconf: aclocal failed with exit status: 28 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Dec 3 06:17:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 3 Dec 2018 06:17:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3319?= Message-ID: <598626546.975.1543817843596.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 13.03 KB...] error: unable to write file openbsc/include/openbsc/ipaccess.h error: unable to write file openbsc/include/openbsc/iu.h error: unable to write file openbsc/include/openbsc/meas_feed.h error: unable to write file openbsc/include/openbsc/meas_rep.h error: unable to write file openbsc/include/openbsc/mgcp.h error: unable to write file openbsc/include/openbsc/mgcp_internal.h error: unable to write file openbsc/include/openbsc/mgcp_transcode.h error: unable to write file openbsc/include/openbsc/misdn.h error: unable to write file openbsc/include/openbsc/mncc.h error: unable to write file openbsc/include/openbsc/mncc_int.h error: unable to write file openbsc/include/openbsc/nat_rewrite_trie.h error: unable to write file openbsc/include/openbsc/network_listen.h error: unable to write file openbsc/include/openbsc/oap_client.h error: unable to write file openbsc/include/openbsc/openbscdefines.h error: unable to write file openbsc/include/openbsc/osmo_bsc.h error: unable to write file openbsc/include/openbsc/osmo_bsc_grace.h error: unable to write file openbsc/include/openbsc/osmo_bsc_rf.h error: unable to write file openbsc/include/openbsc/osmo_msc.h error: unable to write file openbsc/include/openbsc/osmux.h error: unable to write file openbsc/include/openbsc/paging.h error: unable to write file openbsc/include/openbsc/pcu_if.h error: unable to write file openbsc/include/openbsc/pcuif_proto.h error: unable to write file openbsc/include/openbsc/rest_octets.h error: unable to write file openbsc/include/openbsc/rrlp.h error: unable to write file openbsc/include/openbsc/rs232.h error: unable to write file openbsc/include/openbsc/rtp_proxy.h error: unable to write file openbsc/include/openbsc/signal.h error: unable to write file openbsc/include/openbsc/silent_call.h error: unable to write file openbsc/include/openbsc/smpp.h error: unable to write file openbsc/include/openbsc/sms_queue.h error: unable to write file openbsc/include/openbsc/socket.h error: unable to write file openbsc/include/openbsc/system_information.h error: unable to write file openbsc/include/openbsc/token_auth.h error: unable to write file openbsc/include/openbsc/transaction.h error: unable to write file openbsc/include/openbsc/trau_mux.h error: unable to write file openbsc/include/openbsc/trau_upqueue.h error: unable to write file openbsc/include/openbsc/ussd.h error: unable to write file openbsc/include/openbsc/vty.h error: unable to write file openbsc/m4/README error: unable to write file openbsc/m4/ax_check_compile_flag.m4 error: unable to write file openbsc/openbsc.pc.in error: unable to write file openbsc/osmoappdesc.py error: unable to write file openbsc/src/Makefile.am error: unable to write file openbsc/src/ipaccess/Makefile.am error: unable to write file openbsc/src/ipaccess/abisip-find.c error: unable to write file openbsc/src/ipaccess/ipaccess-config.c error: unable to write file openbsc/src/ipaccess/ipaccess-firmware.c error: unable to write file openbsc/src/ipaccess/ipaccess-proxy.c error: unable to write file openbsc/src/ipaccess/network_listen.c error: unable to write file openbsc/src/libbsc/Makefile.am error: unable to write file openbsc/src/libbsc/abis_nm.c error: unable to write file openbsc/src/libbsc/abis_nm_ipaccess.c error: unable to write file openbsc/src/libbsc/abis_nm_vty.c error: unable to write file openbsc/src/libbsc/abis_om2000.c error: unable to write file openbsc/src/libbsc/abis_om2000_vty.c error: unable to write file openbsc/src/libbsc/abis_rsl.c error: unable to write file openbsc/src/libbsc/acc_ramp.c error: unable to write file openbsc/src/libbsc/arfcn_range_encode.c error: unable to write file openbsc/src/libbsc/bsc_api.c error: unable to write file openbsc/src/libbsc/bsc_ctrl_commands.c error: unable to write file openbsc/src/libbsc/bsc_ctrl_lookup.c error: unable to write file openbsc/src/libbsc/bsc_dyn_ts.c error: unable to write file openbsc/src/libbsc/bsc_init.c error: unable to write file openbsc/src/libbsc/bsc_msc.c error: unable to write file openbsc/src/libbsc/bsc_rf_ctrl.c error: unable to write file openbsc/src/libbsc/bsc_rll.c error: unable to write file openbsc/src/libbsc/bsc_subscriber.c error: unable to write file openbsc/src/libbsc/bsc_vty.c error: unable to write file openbsc/src/libbsc/bts_ericsson_rbs2000.c error: unable to write file openbsc/src/libbsc/bts_init.c error: unable to write file openbsc/src/libbsc/bts_ipaccess_nanobts.c error: unable to write file openbsc/src/libbsc/bts_ipaccess_nanobts_omlattr.c error: unable to write file openbsc/src/libbsc/bts_nokia_site.c error: unable to write file openbsc/src/libbsc/bts_siemens_bs11.c error: unable to write file openbsc/src/libbsc/bts_sysmobts.c error: unable to write file openbsc/src/libbsc/bts_unknown.c error: unable to write file openbsc/src/libbsc/chan_alloc.c error: unable to write file openbsc/src/libbsc/e1_config.c error: unable to write file openbsc/src/libbsc/gsm_04_08_utils.c error: unable to write file openbsc/src/libbsc/gsm_04_80_utils.c error: unable to write file openbsc/src/libbsc/handover_decision.c error: unable to write file openbsc/src/libbsc/handover_logic.c error: unable to write file openbsc/src/libbsc/meas_proc.c error: unable to write file openbsc/src/libbsc/meas_rep.c error: unable to write file openbsc/src/libbsc/net_init.c error: unable to write file openbsc/src/libbsc/paging.c error: unable to write file openbsc/src/libbsc/pcu_sock.c error: unable to write file openbsc/src/libbsc/rest_octets.c error: unable to write file openbsc/src/libbsc/system_information.c error: unable to write file openbsc/src/libcommon-cs/Makefile.am error: unable to write file openbsc/src/libcommon-cs/common_cs.c error: unable to write file openbsc/src/libcommon-cs/common_cs_vty.c error: unable to write file openbsc/src/libcommon/Makefile.am error: unable to write file openbsc/src/libcommon/bsc_version.c error: unable to write file openbsc/src/libcommon/common_vty.c error: unable to write file openbsc/src/libcommon/debug.c error: unable to write file openbsc/src/libcommon/gsm_data.c error: unable to write file openbsc/src/libcommon/gsm_data_shared.c error: unable to write file openbsc/src/libcommon/gsm_subscriber_base.c error: unable to write file openbsc/src/libcommon/gsup_client.c error: unable to write file openbsc/src/libcommon/gsup_test_client.c error: unable to write file openbsc/src/libcommon/oap_client.c error: unable to write file openbsc/src/libcommon/socket.c error: unable to write file openbsc/src/libcommon/talloc_ctx.c error: unable to write file openbsc/src/libfilter/Makefile.am error: unable to write file openbsc/src/libfilter/bsc_msg_acc.c error: unable to write file openbsc/src/libfilter/bsc_msg_filter.c error: unable to write file openbsc/src/libfilter/bsc_msg_vty.c error: unable to write file openbsc/src/libiu/Makefile.am error: unable to write file openbsc/src/libiu/iu.c error: unable to write file openbsc/src/libiu/iu_vty.c error: unable to write file openbsc/src/libmgcp/Makefile.am error: unable to write file openbsc/src/libmgcp/g711common.h error: unable to write file openbsc/src/libmgcp/mgcp_network.c error: unable to write file openbsc/src/libmgcp/mgcp_osmux.c error: unable to write file openbsc/src/libmgcp/mgcp_protocol.c error: unable to write file openbsc/src/libmgcp/mgcp_sdp.c error: unable to write file openbsc/src/libmgcp/mgcp_transcode.c error: unable to write file openbsc/src/libmgcp/mgcp_vty.c error: unable to write file openbsc/src/libmsc/Makefile.am error: unable to write file openbsc/src/libmsc/auth.c error: unable to write file openbsc/src/libmsc/ctrl_commands.c error: unable to write file openbsc/src/libmsc/db.c error: unable to write file openbsc/src/libmsc/gsm_04_08.c error: unable to write file openbsc/src/libmsc/gsm_04_11.c error: unable to write file openbsc/src/libmsc/gsm_04_14.c error: unable to write file openbsc/src/libmsc/gsm_04_80.c error: unable to write file openbsc/src/libmsc/gsm_subscriber.c error: unable to write file openbsc/src/libmsc/meas_feed.c error: unable to write file openbsc/src/libmsc/meas_feed.h error: unable to write file openbsc/src/libmsc/mncc.c error: unable to write file openbsc/src/libmsc/mncc_builtin.c error: unable to write file openbsc/src/libmsc/mncc_sock.c error: unable to write file openbsc/src/libmsc/osmo_msc.c error: unable to write file openbsc/src/libmsc/rrlp.c error: unable to write file openbsc/src/libmsc/silent_call.c error: unable to write file openbsc/src/libmsc/smpp_openbsc.c error: unable to write file openbsc/src/libmsc/smpp_smsc.c error: unable to write file openbsc/src/libmsc/smpp_smsc.h error: unable to write file openbsc/src/libmsc/smpp_utils.c error: unable to write file openbsc/src/libmsc/smpp_vty.c error: unable to write file openbsc/src/libmsc/sms_queue.c error: unable to write file openbsc/src/libmsc/token_auth.c error: unable to write file openbsc/src/libmsc/transaction.c error: unable to write file openbsc/src/libmsc/ussd.c error: unable to write file openbsc/src/libmsc/vty_interface_layer3.c error: unable to write file openbsc/src/libtrau/Makefile.am error: unable to write file openbsc/src/libtrau/rtp_proxy.c error: unable to write file openbsc/src/libtrau/trau_mux.c error: unable to write file openbsc/src/libtrau/trau_upqueue.c error: unable to write file openbsc/src/osmo-bsc/Makefile.am error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_api.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_audio.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_bssap.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_ctrl.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_filter.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_grace.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_main.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_msc.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_sccp.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_vty.c error: unable to write file openbsc/src/osmo-bsc_mgcp/Makefile.am error: unable to write file openbsc/src/osmo-bsc_mgcp/mgcp_main.c error: unable to write file openbsc/src/osmo-bsc_nat/Makefile.am error: unable to write file openbsc/src/osmo-bsc_nat/bsc_filter.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_filter.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_utils.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_vty.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_sccp.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_ussd.c error: unable to write file openbsc/src/osmo-nitb/Makefile.am error: unable to write file openbsc/src/osmo-nitb/bsc_hack.c error: unable to write file openbsc/src/utils/Makefile.am error: unable to write file openbsc/src/utils/bs11_config.c error: unable to write file openbsc/src/utils/isdnsync.c error: unable to write file openbsc/src/utils/meas_db.c error: unable to write file openbsc/src/utils/meas_db.h error: unable to write file openbsc/src/utils/meas_json.c error: unable to write file openbsc/src/utils/meas_pcap2db.c error: unable to write file openbsc/src/utils/meas_udp2db.c error: unable to write file openbsc/src/utils/meas_vis.c error: unable to write file openbsc/src/utils/smpp_mirror.c error: unable to write file openbsc/tests/Makefile.am error: unable to write file openbsc/tests/abis/Makefile.am error: unable to write file openbsc/tests/abis/abis_test.c error: unable to write file openbsc/tests/abis/abis_test.ok error: unable to write file openbsc/tests/atlocal.in error: unable to write file openbsc/tests/bsc-nat-trie/Makefile.am error: unable to write file openbsc/tests/bsc-nat-trie/bsc_nat_trie_test.c error: unable to write file openbsc/tests/bsc-nat-trie/bsc_nat_trie_test.ok error: unable to write file openbsc/tests/bsc-nat-trie/prefixes.csv error: unable to write file openbsc/tests/bsc-nat/Makefile.am error: unable to write file openbsc/tests/bsc-nat/barr.cfg error: unable to write file openbsc/tests/bsc-nat/barr_dup.cfg error: unable to write file openbsc/tests/bsc-nat/bsc_data.c error: unable to write file openbsc/tests/bsc-nat/bsc_nat_test.c error: unable to write file openbsc/tests/bsc-nat/bsc_nat_test.ok error: unable to write file openbsc/tests/bsc-nat/prefixes.csv error: unable to write file openbsc/tests/bsc/Makefile.am error: unable to write file openbsc/tests/bsc/bsc_test.c error: unable to write file openbsc/tests/bsc/bsc_test.ok error: unable to write file openbsc/tests/channel/Makefile.am error: unable to write file openbsc/tests/channel/channel_test.c error: unable to write file openbsc/tests/channel/channel_test.ok error: unable to write file openbsc/tests/ctrl_test_runner.py error: unable to write file openbsc/tests/db/Makefile.am error: unable to write file openbsc/tests/db/db_test.c error: unable to write file openbsc/tests/db/db_test.err error: unable to write file openbsc/tests/db/db_test.ok error: unable to write file openbsc/tests/db/hlr.sqlite3 error: unable to write file openbsc/tests/gsm0408/Makefile.am error: unable to write file openbsc/tests/gsm0408/gsm0408_test.c error: unable to write file openbsc/tests/gsm0408/gsm0408_test.ok error: unable to write file openbsc/tests/mgcp/Makefile.am error: unable to write file openbsc/tests/mgcp/mgcp_test.c error: unable to write file openbsc/tests/mgcp/mgcp_test.ok error: unable to write file openbsc/tests/mgcp/mgcp_transcoding_test.c error: unable to write file openbsc/tests/mgcp/mgcp_transcoding_test.ok error: unable to write file openbsc/tests/mm_auth/Makefile.am error: unable to write file openbsc/tests/mm_auth/mm_auth_test.c error: unable to write file openbsc/tests/mm_auth/mm_auth_test.ok error: unable to write file openbsc/tests/nanobts_omlattr/Makefile.am error: unable to write file openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.c error: unable to write file openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.ok error: unable to write file openbsc/tests/smpp/Makefile.am error: unable to write file openbsc/tests/smpp/smpp_test.c error: unable to write file openbsc/tests/smpp/smpp_test.err error: unable to write file openbsc/tests/smpp/smpp_test.ok error: unable to write file openbsc/tests/smpp_test_runner.py error: unable to write file openbsc/tests/subscr/Makefile.am error: unable to write file openbsc/tests/subscr/bsc_subscr_test.c error: unable to write file openbsc/tests/subscr/bsc_subscr_test.err error: unable to write file openbsc/tests/subscr/bsc_subscr_test.ok error: unable to write file openbsc/tests/subscr/subscr_test.c error: unable to write file openbsc/tests/subscr/subscr_test.ok error: unable to write file openbsc/tests/testsuite.at error: unable to write file openbsc/tests/trau/Makefile.am error: unable to write file openbsc/tests/trau/trau_test.c error: unable to write file openbsc/tests/trau/trau_test.ok error: unable to write file openbsc/tests/vty_test_runner.py error: unable to write file openbsc/tools/hlrstat.pl fatal: unable to write new index file Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Dec 3 06:17:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 3 Dec 2018 06:17:25 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3319?= Message-ID: <1347965270.976.1543817845522.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 13.02 KB...] error: unable to write file openbsc/include/openbsc/ipaccess.h error: unable to write file openbsc/include/openbsc/iu.h error: unable to write file openbsc/include/openbsc/meas_feed.h error: unable to write file openbsc/include/openbsc/meas_rep.h error: unable to write file openbsc/include/openbsc/mgcp.h error: unable to write file openbsc/include/openbsc/mgcp_internal.h error: unable to write file openbsc/include/openbsc/mgcp_transcode.h error: unable to write file openbsc/include/openbsc/misdn.h error: unable to write file openbsc/include/openbsc/mncc.h error: unable to write file openbsc/include/openbsc/mncc_int.h error: unable to write file openbsc/include/openbsc/nat_rewrite_trie.h error: unable to write file openbsc/include/openbsc/network_listen.h error: unable to write file openbsc/include/openbsc/oap_client.h error: unable to write file openbsc/include/openbsc/openbscdefines.h error: unable to write file openbsc/include/openbsc/osmo_bsc.h error: unable to write file openbsc/include/openbsc/osmo_bsc_grace.h error: unable to write file openbsc/include/openbsc/osmo_bsc_rf.h error: unable to write file openbsc/include/openbsc/osmo_msc.h error: unable to write file openbsc/include/openbsc/osmux.h error: unable to write file openbsc/include/openbsc/paging.h error: unable to write file openbsc/include/openbsc/pcu_if.h error: unable to write file openbsc/include/openbsc/pcuif_proto.h error: unable to write file openbsc/include/openbsc/rest_octets.h error: unable to write file openbsc/include/openbsc/rrlp.h error: unable to write file openbsc/include/openbsc/rs232.h error: unable to write file openbsc/include/openbsc/rtp_proxy.h error: unable to write file openbsc/include/openbsc/signal.h error: unable to write file openbsc/include/openbsc/silent_call.h error: unable to write file openbsc/include/openbsc/smpp.h error: unable to write file openbsc/include/openbsc/sms_queue.h error: unable to write file openbsc/include/openbsc/socket.h error: unable to write file openbsc/include/openbsc/system_information.h error: unable to write file openbsc/include/openbsc/token_auth.h error: unable to write file openbsc/include/openbsc/transaction.h error: unable to write file openbsc/include/openbsc/trau_mux.h error: unable to write file openbsc/include/openbsc/trau_upqueue.h error: unable to write file openbsc/include/openbsc/ussd.h error: unable to write file openbsc/include/openbsc/vty.h error: unable to write file openbsc/m4/README error: unable to write file openbsc/m4/ax_check_compile_flag.m4 error: unable to write file openbsc/openbsc.pc.in error: unable to write file openbsc/osmoappdesc.py error: unable to write file openbsc/src/Makefile.am error: unable to write file openbsc/src/ipaccess/Makefile.am error: unable to write file openbsc/src/ipaccess/abisip-find.c error: unable to write file openbsc/src/ipaccess/ipaccess-config.c error: unable to write file openbsc/src/ipaccess/ipaccess-firmware.c error: unable to write file openbsc/src/ipaccess/ipaccess-proxy.c error: unable to write file openbsc/src/ipaccess/network_listen.c error: unable to write file openbsc/src/libbsc/Makefile.am error: unable to write file openbsc/src/libbsc/abis_nm.c error: unable to write file openbsc/src/libbsc/abis_nm_ipaccess.c error: unable to write file openbsc/src/libbsc/abis_nm_vty.c error: unable to write file openbsc/src/libbsc/abis_om2000.c error: unable to write file openbsc/src/libbsc/abis_om2000_vty.c error: unable to write file openbsc/src/libbsc/abis_rsl.c error: unable to write file openbsc/src/libbsc/acc_ramp.c error: unable to write file openbsc/src/libbsc/arfcn_range_encode.c error: unable to write file openbsc/src/libbsc/bsc_api.c error: unable to write file openbsc/src/libbsc/bsc_ctrl_commands.c error: unable to write file openbsc/src/libbsc/bsc_ctrl_lookup.c error: unable to write file openbsc/src/libbsc/bsc_dyn_ts.c error: unable to write file openbsc/src/libbsc/bsc_init.c error: unable to write file openbsc/src/libbsc/bsc_msc.c error: unable to write file openbsc/src/libbsc/bsc_rf_ctrl.c error: unable to write file openbsc/src/libbsc/bsc_rll.c error: unable to write file openbsc/src/libbsc/bsc_subscriber.c error: unable to write file openbsc/src/libbsc/bsc_vty.c error: unable to write file openbsc/src/libbsc/bts_ericsson_rbs2000.c error: unable to write file openbsc/src/libbsc/bts_init.c error: unable to write file openbsc/src/libbsc/bts_ipaccess_nanobts.c error: unable to write file openbsc/src/libbsc/bts_ipaccess_nanobts_omlattr.c error: unable to write file openbsc/src/libbsc/bts_nokia_site.c error: unable to write file openbsc/src/libbsc/bts_siemens_bs11.c error: unable to write file openbsc/src/libbsc/bts_sysmobts.c error: unable to write file openbsc/src/libbsc/bts_unknown.c error: unable to write file openbsc/src/libbsc/chan_alloc.c error: unable to write file openbsc/src/libbsc/e1_config.c error: unable to write file openbsc/src/libbsc/gsm_04_08_utils.c error: unable to write file openbsc/src/libbsc/gsm_04_80_utils.c error: unable to write file openbsc/src/libbsc/handover_decision.c error: unable to write file openbsc/src/libbsc/handover_logic.c error: unable to write file openbsc/src/libbsc/meas_proc.c error: unable to write file openbsc/src/libbsc/meas_rep.c error: unable to write file openbsc/src/libbsc/net_init.c error: unable to write file openbsc/src/libbsc/paging.c error: unable to write file openbsc/src/libbsc/pcu_sock.c error: unable to write file openbsc/src/libbsc/rest_octets.c error: unable to write file openbsc/src/libbsc/system_information.c error: unable to write file openbsc/src/libcommon-cs/Makefile.am error: unable to write file openbsc/src/libcommon-cs/common_cs.c error: unable to write file openbsc/src/libcommon-cs/common_cs_vty.c error: unable to write file openbsc/src/libcommon/Makefile.am error: unable to write file openbsc/src/libcommon/bsc_version.c error: unable to write file openbsc/src/libcommon/common_vty.c error: unable to write file openbsc/src/libcommon/debug.c error: unable to write file openbsc/src/libcommon/gsm_data.c error: unable to write file openbsc/src/libcommon/gsm_data_shared.c error: unable to write file openbsc/src/libcommon/gsm_subscriber_base.c error: unable to write file openbsc/src/libcommon/gsup_client.c error: unable to write file openbsc/src/libcommon/gsup_test_client.c error: unable to write file openbsc/src/libcommon/oap_client.c error: unable to write file openbsc/src/libcommon/socket.c error: unable to write file openbsc/src/libcommon/talloc_ctx.c error: unable to write file openbsc/src/libfilter/Makefile.am error: unable to write file openbsc/src/libfilter/bsc_msg_acc.c error: unable to write file openbsc/src/libfilter/bsc_msg_filter.c error: unable to write file openbsc/src/libfilter/bsc_msg_vty.c error: unable to write file openbsc/src/libiu/Makefile.am error: unable to write file openbsc/src/libiu/iu.c error: unable to write file openbsc/src/libiu/iu_vty.c error: unable to write file openbsc/src/libmgcp/Makefile.am error: unable to write file openbsc/src/libmgcp/g711common.h error: unable to write file openbsc/src/libmgcp/mgcp_network.c error: unable to write file openbsc/src/libmgcp/mgcp_osmux.c error: unable to write file openbsc/src/libmgcp/mgcp_protocol.c error: unable to write file openbsc/src/libmgcp/mgcp_sdp.c error: unable to write file openbsc/src/libmgcp/mgcp_transcode.c error: unable to write file openbsc/src/libmgcp/mgcp_vty.c error: unable to write file openbsc/src/libmsc/Makefile.am error: unable to write file openbsc/src/libmsc/auth.c error: unable to write file openbsc/src/libmsc/ctrl_commands.c error: unable to write file openbsc/src/libmsc/db.c error: unable to write file openbsc/src/libmsc/gsm_04_08.c error: unable to write file openbsc/src/libmsc/gsm_04_11.c error: unable to write file openbsc/src/libmsc/gsm_04_14.c error: unable to write file openbsc/src/libmsc/gsm_04_80.c error: unable to write file openbsc/src/libmsc/gsm_subscriber.c error: unable to write file openbsc/src/libmsc/meas_feed.c error: unable to write file openbsc/src/libmsc/meas_feed.h error: unable to write file openbsc/src/libmsc/mncc.c error: unable to write file openbsc/src/libmsc/mncc_builtin.c error: unable to write file openbsc/src/libmsc/mncc_sock.c error: unable to write file openbsc/src/libmsc/osmo_msc.c error: unable to write file openbsc/src/libmsc/rrlp.c error: unable to write file openbsc/src/libmsc/silent_call.c error: unable to write file openbsc/src/libmsc/smpp_openbsc.c error: unable to write file openbsc/src/libmsc/smpp_smsc.c error: unable to write file openbsc/src/libmsc/smpp_smsc.h error: unable to write file openbsc/src/libmsc/smpp_utils.c error: unable to write file openbsc/src/libmsc/smpp_vty.c error: unable to write file openbsc/src/libmsc/sms_queue.c error: unable to write file openbsc/src/libmsc/token_auth.c error: unable to write file openbsc/src/libmsc/transaction.c error: unable to write file openbsc/src/libmsc/ussd.c error: unable to write file openbsc/src/libmsc/vty_interface_layer3.c error: unable to write file openbsc/src/libtrau/Makefile.am error: unable to write file openbsc/src/libtrau/rtp_proxy.c error: unable to write file openbsc/src/libtrau/trau_mux.c error: unable to write file openbsc/src/libtrau/trau_upqueue.c error: unable to write file openbsc/src/osmo-bsc/Makefile.am error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_api.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_audio.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_bssap.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_ctrl.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_filter.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_grace.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_main.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_msc.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_sccp.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_vty.c error: unable to write file openbsc/src/osmo-bsc_mgcp/Makefile.am error: unable to write file openbsc/src/osmo-bsc_mgcp/mgcp_main.c error: unable to write file openbsc/src/osmo-bsc_nat/Makefile.am error: unable to write file openbsc/src/osmo-bsc_nat/bsc_filter.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_filter.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_utils.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_vty.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_sccp.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_ussd.c error: unable to write file openbsc/src/osmo-nitb/Makefile.am error: unable to write file openbsc/src/osmo-nitb/bsc_hack.c error: unable to write file openbsc/src/utils/Makefile.am error: unable to write file openbsc/src/utils/bs11_config.c error: unable to write file openbsc/src/utils/isdnsync.c error: unable to write file openbsc/src/utils/meas_db.c error: unable to write file openbsc/src/utils/meas_db.h error: unable to write file openbsc/src/utils/meas_json.c error: unable to write file openbsc/src/utils/meas_pcap2db.c error: unable to write file openbsc/src/utils/meas_udp2db.c error: unable to write file openbsc/src/utils/meas_vis.c error: unable to write file openbsc/src/utils/smpp_mirror.c error: unable to write file openbsc/tests/Makefile.am error: unable to write file openbsc/tests/abis/Makefile.am error: unable to write file openbsc/tests/abis/abis_test.c error: unable to write file openbsc/tests/abis/abis_test.ok error: unable to write file openbsc/tests/atlocal.in error: unable to write file openbsc/tests/bsc-nat-trie/Makefile.am error: unable to write file openbsc/tests/bsc-nat-trie/bsc_nat_trie_test.c error: unable to write file openbsc/tests/bsc-nat-trie/bsc_nat_trie_test.ok error: unable to write file openbsc/tests/bsc-nat-trie/prefixes.csv error: unable to write file openbsc/tests/bsc-nat/Makefile.am error: unable to write file openbsc/tests/bsc-nat/barr.cfg error: unable to write file openbsc/tests/bsc-nat/barr_dup.cfg error: unable to write file openbsc/tests/bsc-nat/bsc_data.c error: unable to write file openbsc/tests/bsc-nat/bsc_nat_test.c error: unable to write file openbsc/tests/bsc-nat/bsc_nat_test.ok error: unable to write file openbsc/tests/bsc-nat/prefixes.csv error: unable to write file openbsc/tests/bsc/Makefile.am error: unable to write file openbsc/tests/bsc/bsc_test.c error: unable to write file openbsc/tests/bsc/bsc_test.ok error: unable to write file openbsc/tests/channel/Makefile.am error: unable to write file openbsc/tests/channel/channel_test.c error: unable to write file openbsc/tests/channel/channel_test.ok error: unable to write file openbsc/tests/ctrl_test_runner.py error: unable to write file openbsc/tests/db/Makefile.am error: unable to write file openbsc/tests/db/db_test.c error: unable to write file openbsc/tests/db/db_test.err error: unable to write file openbsc/tests/db/db_test.ok error: unable to write file openbsc/tests/db/hlr.sqlite3 error: unable to write file openbsc/tests/gsm0408/Makefile.am error: unable to write file openbsc/tests/gsm0408/gsm0408_test.c error: unable to write file openbsc/tests/gsm0408/gsm0408_test.ok error: unable to write file openbsc/tests/mgcp/Makefile.am error: unable to write file openbsc/tests/mgcp/mgcp_test.c error: unable to write file openbsc/tests/mgcp/mgcp_test.ok error: unable to write file openbsc/tests/mgcp/mgcp_transcoding_test.c error: unable to write file openbsc/tests/mgcp/mgcp_transcoding_test.ok error: unable to write file openbsc/tests/mm_auth/Makefile.am error: unable to write file openbsc/tests/mm_auth/mm_auth_test.c error: unable to write file openbsc/tests/mm_auth/mm_auth_test.ok error: unable to write file openbsc/tests/nanobts_omlattr/Makefile.am error: unable to write file openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.c error: unable to write file openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.ok error: unable to write file openbsc/tests/smpp/Makefile.am error: unable to write file openbsc/tests/smpp/smpp_test.c error: unable to write file openbsc/tests/smpp/smpp_test.err error: unable to write file openbsc/tests/smpp/smpp_test.ok error: unable to write file openbsc/tests/smpp_test_runner.py error: unable to write file openbsc/tests/subscr/Makefile.am error: unable to write file openbsc/tests/subscr/bsc_subscr_test.c error: unable to write file openbsc/tests/subscr/bsc_subscr_test.err error: unable to write file openbsc/tests/subscr/bsc_subscr_test.ok error: unable to write file openbsc/tests/subscr/subscr_test.c error: unable to write file openbsc/tests/subscr/subscr_test.ok error: unable to write file openbsc/tests/testsuite.at error: unable to write file openbsc/tests/trau/Makefile.am error: unable to write file openbsc/tests/trau/trau_test.c error: unable to write file openbsc/tests/trau/trau_test.ok error: unable to write file openbsc/tests/vty_test_runner.py error: unable to write file openbsc/tools/hlrstat.pl fatal: unable to write new index file Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Dec 3 06:26:18 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 3 Dec 2018 06:26:18 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7202?= In-Reply-To: <1905540806.974.1543817841542.JavaMail.jenkins@jenkins.osmocom.org> References: <1905540806.974.1543817841542.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <757598227.978.1543818378950.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Dec 3 06:52:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 3 Dec 2018 06:52:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#208?= In-Reply-To: <2098739966.955.1543733524711.JavaMail.jenkins@jenkins.osmocom.org> References: <2098739966.955.1543733524711.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1884317031.979.1543819922755.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 168.04 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Dec 3 09:31:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 09:31:13 +0000 Subject: Change in osmo-hlr[master]: add 'show subscriber' command, alias for 'subscriber ... show' In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12055 ) Change subject: add 'show subscriber' command, alias for 'subscriber ... show' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I01ce9b0868302d40ed05c6a588316a194d6071e4 Gerrit-Change-Number: 12055 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 09:31:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 09:34:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 09:34:21 +0000 Subject: Change in osmo-hlr[master]: implement removal of MSISDN In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12056 ) Change subject: implement removal of MSISDN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I15419105ea461137776adb92d384d8985210c90e Gerrit-Change-Number: 12056 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 09:34:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 09:36:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 09:36:46 +0000 Subject: Change in osmo-gsm-tester[master]: Fix and use the right member variable In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12054 ) Change subject: Fix and use the right member variable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib5d50322ecd30c7724eef8452d22845450e9c633 Gerrit-Change-Number: 12054 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 09:36:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 09:44:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 09:44:30 +0000 Subject: Change in osmo-gsm-tester[master]: Fix and use the right member variable In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12054 ) Change subject: Fix and use the right member variable ...................................................................... Patch Set 1: Not sure why but I am unable to re-trigger the job. Re-trigger it or remove jenkins -1 and merge it. Test run failed because somehow the modem net ifaces were moved out of net namespaces in osmo-gsm-tester main unit. I moved them back into their respective netns. -- To view, visit https://gerrit.osmocom.org/12054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib5d50322ecd30c7724eef8452d22845450e9c633 Gerrit-Change-Number: 12054 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 09:44:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:11:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:11:34 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: with_manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12045 ) Change subject: gerrit-verifications/master-builds: with_manuals ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12045/2/jobs/master-builds.yml File jobs/master-builds.yml: https://gerrit.osmocom.org/#/c/12045/2/jobs/master-builds.yml at 206 PS2, Line 206: cmd: GTP="$GTP" ./contrib/jenkins.sh --publish Quick recap of what we discussed in private chat about this, as I was about to leave on Friday: * you said, --publish is fine * I'll change the environment variable to WITH_MANUALS, so it is uppercase as all environment variables should be. > AFAIU the var is not redundant because it is not exported, so you'd need to either export GTP="$GTP" before calling jenkins.sh or, do it as it is done now. I'm sure that it is redundant. See the osmo-trx section from master-builds.yml for example. Currently in master, we have this code: - osmo-trx: a1_name: INSTR # ARM variants temporarily disabled due to issue OS#3061 # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] concurrent: true cmd: ./contrib/jenkins.sh --publish So there's no INSTR="$INSTR" statement in front of jenkins.sh. The jenkins.sh script of osmo-trx.git has the following line: ./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR And executed by jenkins, it it shows that INSTR holds --with-sse: + ./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms --with-sse https://jenkins.osmocom.org/jenkins/view/master/job/master-osmo-trx/710/INSTR=--with-sse,a2=default,a3=default,label=osmocom-master-debian9/console > If that's not the case, then let's remove the GTP="$GTP" fomr verywhere I'll post a patch for that. > but I'd at least investigate git log why do wo do that. The GTP="$GTP" line was introduced to master-builds.yml in the initial commit here: https://gerrit.osmocom.org/#/c/osmo-ci/+/4827/ Seems to be copy-pasted from gerrit-verifications.yml at the time, where the line was introduced here: https://gerrit.osmocom.org/#/c/osmo-ci/+/4826/1/jobs/gerrit-verifications.yml No additional message explaining the purpose of GTP="$GTP" is in the commit message or review. Looks like it was just a misunderstanding. -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 03 Dec 2018 10:11:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:26:38 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 3 Dec 2018 10:26:38 +0000 Subject: Change in osmo-gsm-tester[master]: Fix and use the right member variable In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/12054 ) Change subject: Fix and use the right member variable ...................................................................... Fix and use the right member variable Change-Id: Ib5d50322ecd30c7724eef8452d22845450e9c633 --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index 634370f..b29859b 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -82,7 +82,7 @@ """ # Get the base directory for the virtphy/mobile application - inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb'))) + inst = util.Dir(os.path.abspath(self._suite_run.trial.get_inst('osmocom-bb'))) # Assume these are dynamically linked and verify there is a lib dir. lib = inst.child('lib') @@ -113,7 +113,7 @@ options = self.build_binary_options() self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf, self._ev_server, - util.Dir(self.suite_run.get_test_run_dir()), + util.Dir(self._suite_run.get_test_run_dir()), suite_run=self._suite_run) # TODO: We should pass subscribers down to the test and not get it from -- To view, visit https://gerrit.osmocom.org/12054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib5d50322ecd30c7724eef8452d22845450e9c633 Gerrit-Change-Number: 12054 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:29:52 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 10:29:52 +0000 Subject: Change in osmo-hlr[master]: add 'show subscriber' command, alias for 'subscriber ... show' In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12055 ) Change subject: add 'show subscriber' command, alias for 'subscriber ... show' ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I01ce9b0868302d40ed05c6a588316a194d6071e4 Gerrit-Change-Number: 12055 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 10:29:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:32:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:32:37 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: WITH_MANUALS In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12045 to look at the new patch set (#4). Change subject: gerrit-verifications/master-builds: WITH_MANUALS ...................................................................... gerrit-verifications/master-builds: WITH_MANUALS Add a new "WITH_MANUALS" axis to all jobs generated by gerrit-verifications.yml and master-builds.yml, which already have at least one axis. Adjust the combination filters, so the manuals are generated (and published) only once. The contrib/jenkins.sh scripts will be adjusted to append --enable-manuals to the configure options, when WITH_MANUALS is set. For all jobs that do not have any axes, we can always append this flag. Two different methods of passing through the configure flags are used in both yml files already. One is creating a "WITH_VAR" variable with True and False as arguments. The other is creating a "VAR" variable with "--enable-foo" and "--disable-foo" as values. I decided to use the "WITH_VAR" approach, so we could use it to activate multiple configure options at once: --enable-manuals and --enable-man when the UNIX man pages feature gets implemented (OS#3386). Related: OS#3385 Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 92 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/12045/4 -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:32:54 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 10:32:54 +0000 Subject: Change in osmo-hlr[master]: implement removal of MSISDN In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12056 ) Change subject: implement removal of MSISDN ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I15419105ea461137776adb92d384d8985210c90e Gerrit-Change-Number: 12056 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 10:32:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:38:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 10:38:07 +0000 Subject: Change in osmo-trx[master]: lms: Fix start after stop of device Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12061 Change subject: lms: Fix start after stop of device ...................................................................... lms: Fix start after stop of device Change-Id: I56358a1d1601853bc6dd2e6bb5f80798d0ba84b2 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/61/12061/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 1cda4f9..cb5e31d 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -213,6 +213,11 @@ unsigned int i; + if (started) { + LOGC(DDEV, ERR) << "Device already started"; + return false; + } + /* configure the channels/streams */ for (i=0; i -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:38:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 10:38:07 +0000 Subject: Change in osmo-trx[master]: lms: Destroy streams on device stop Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12062 Change subject: lms: Destroy streams on device stop ...................................................................... lms: Destroy streams on device stop They are recreated during start(). Actually, if they are not stopped here, during start() after stop(), LMS_SetupStream() will fail because it will detect the streams are already opened. Change-Id: I70d47c287aabdabc5dc1304a942d130aeb10bdc5 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/62/12062/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index cb5e31d..2ceca0d 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -277,7 +277,11 @@ for (i=0; i -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:43:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 10:43:44 +0000 Subject: Change in osmo-trx[master]: lms: Fix start after stop of device In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12061 ) Change subject: lms: Fix start after stop of device ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I56358a1d1601853bc6dd2e6bb5f80798d0ba84b2 Gerrit-Change-Number: 12061 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 10:43:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:45:58 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:45:58 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11976 to look at the new patch set (#4). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 --- M contrib/jenkins.sh 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/76/11976/4 -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:46:06 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:46:06 +0000 Subject: Change in osmo-ggsn[master]: contrib/jenkins.sh: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12063 Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b --- M contrib/jenkins.sh 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/63/12063/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 19df974..8ef5124 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -9,6 +9,10 @@ set -ex +# gerrit-verifications.yml: leaves this empty +# master-builds.yml: sets this to "--publish" +publish="$1" + base="$PWD" deps="$base/deps" inst="$deps/install" @@ -27,6 +31,14 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "True" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi set +x echo @@ -38,8 +50,12 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-werror $GTP +./configure --enable-sanitize --enable-werror $GTP $CONFIG $MAKE $PARALLEL_MAKE $MAKE distcheck +if [ "$WITH_MANUALS" = "True" ] && [ "$publish" = "--publish" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b Gerrit-Change-Number: 12063 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:46:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:46:17 +0000 Subject: Change in libosmo-sccp[master]: contrib/jenkins.sh: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12064 Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 --- M contrib/jenkins.sh 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/12064/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a417a9e..52430d2 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -9,6 +9,10 @@ set -ex +# gerrit-verifications.yml: leaves this empty +# master-builds.yml: sets this to "--publish" +publish="$1" + base="$PWD" deps="$base/deps" inst="$deps/install" @@ -22,10 +26,12 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmocore "" --disable-doxygen osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif +osmo-build-dep.sh osmo-gsm-manuals set +x echo @@ -36,10 +42,14 @@ set -x autoreconf --install --force -./configure --enable-sanitize --enable-werror --enable-external-tests +./configure --enable-sanitize --enable-werror --enable-external-tests --enable-manuals $MAKE $PARALLEL_MAKE DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests" \ $MAKE distcheck \ || cat-testlogs.sh +if [ "$publish" = "--publish" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 Gerrit-Change-Number: 12064 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:46:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:46:34 +0000 Subject: Change in osmo-mgw[master]: contrib/jenkins.sh: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12065 Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: I24179b21ce4ff182649243e286c87c824b889454 --- M contrib/jenkins.sh 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/12065/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 222bd8f..1e404d0 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -9,6 +9,10 @@ set -ex +# gerrit-verifications.yml: leaves this empty +# master-builds.yml: sets this to "--publish" +publish="$1" + base="$PWD" deps="$base/deps" inst="$deps/install" @@ -23,10 +27,18 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "True" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi + set +x echo echo @@ -37,7 +49,7 @@ cd "$base" autoreconf --install --force -./configure $MGCP --enable-vty-tests --enable-external-tests --enable-werror +./configure $MGCP --enable-vty-tests --enable-external-tests --enable-werror $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh @@ -46,4 +58,8 @@ $MAKE distcheck \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "True" ] && [ "$publish" = "--publish" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I24179b21ce4ff182649243e286c87c824b889454 Gerrit-Change-Number: 12065 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:46:45 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:46:45 +0000 Subject: Change in osmo-sgsn[master]: contrib/jenkins.sh: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12066 Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: Ic45322c809f9f65d0fd24b828dab0cd929fa6267 --- M contrib/jenkins.sh 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/66/12066/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 64663d6..00bd0f6 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -9,6 +9,10 @@ set -ex +# gerrit-verifications.yml: leaves this empty +# master-builds.yml: sets this to "--publish" +publish="$1" + base="$PWD" deps="$base/deps" inst="$deps/install" @@ -24,6 +28,7 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif @@ -40,6 +45,13 @@ enable_werror="--enable-werror" fi +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "True" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi + set +x echo echo @@ -50,7 +62,7 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize $enable_werror $IU --enable-external-tests +./configure --enable-sanitize $enable_werror $IU --enable-external-tests $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh @@ -59,4 +71,8 @@ $MAKE distcheck \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "True" ] && [ "$publish" = "--publish" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic45322c809f9f65d0fd24b828dab0cd929fa6267 Gerrit-Change-Number: 12066 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:46:50 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:46:50 +0000 Subject: Change in osmo-sip-connector[master]: Add VTY reference for osmo-sip-connector Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12067 Change subject: Add VTY reference for osmo-sip-connector ...................................................................... Add VTY reference for osmo-sip-connector Ticket: OS#1684 Change-Id: I1045c20dd7234d425836ba93fa292a35ccddc7fd --- A doc/manuals/Makefile A doc/manuals/osmosipconnector-vty-reference.xml A doc/manuals/vty/sipconn_vty_additions.xml A doc/manuals/vty/sipconn_vty_reference.xml 4 files changed, 1,086 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/67/12067/1 diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile new file mode 100644 index 0000000..5a47759 --- /dev/null +++ b/doc/manuals/Makefile @@ -0,0 +1,6 @@ +TOPDIR = .. + +VTY_REFERENCE = osmosipconnector-vty-reference.xml +include $(TOPDIR)/build/Makefile.vty-reference.inc + +include $(TOPDIR)/build/Makefile.common.inc diff --git a/doc/manuals/osmosipconnector-vty-reference.xml b/doc/manuals/osmosipconnector-vty-reference.xml new file mode 100644 index 0000000..fe22a99 --- /dev/null +++ b/doc/manuals/osmosipconnector-vty-reference.xml @@ -0,0 +1,38 @@ + + + + +]> + + + + + + v1 + 21st August 2018 + dw + Initial + + + + OsmoSIPConnector VTY Reference + + + 2018 + + + + This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/doc/manuals/vty/sipconn_vty_additions.xml b/doc/manuals/vty/sipconn_vty_additions.xml new file mode 100644 index 0000000..a4c675e --- /dev/null +++ b/doc/manuals/vty/sipconn_vty_additions.xml @@ -0,0 +1,2 @@ + + diff --git a/doc/manuals/vty/sipconn_vty_reference.xml b/doc/manuals/vty/sipconn_vty_reference.xml new file mode 100644 index 0000000..35aad6b --- /dev/null +++ b/doc/manuals/vty/sipconn_vty_reference.xml @@ -0,0 +1,1040 @@ + + + Common Commands + These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + view + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + enable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-log + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-line + + + + + + + + + + + + + + + + + + + + config-sip + + + + + + + + + + + + + + + + + + + + + + + + config-mncc + + + + + + + + + config-app + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/12067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1045c20dd7234d425836ba93fa292a35ccddc7fd Gerrit-Change-Number: 12067 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:46:51 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:46:51 +0000 Subject: Change in osmo-sip-connector[master]: Add manual for OsmoSIPConnector Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12068 Change subject: Add manual for OsmoSIPConnector ...................................................................... Add manual for OsmoSIPConnector Ticket: OS#1684 Change-Id: I70d3014deb459e0b91a9a92c60710b994153538e --- M doc/manuals/Makefile A doc/manuals/chapters/configuration.adoc A doc/manuals/chapters/overview.adoc A doc/manuals/chapters/running.adoc A doc/manuals/osmosipconnector-usermanual-docinfo.xml A doc/manuals/osmosipconnector-usermanual.adoc 6 files changed, 233 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/68/12068/1 diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile index 5a47759..cd3bb89 100644 --- a/doc/manuals/Makefile +++ b/doc/manuals/Makefile @@ -1,5 +1,9 @@ TOPDIR = .. +ASCIIDOC = osmosipconnector-usermanual.adoc +ASCIIDOC_DEPS = chapters/*.adoc +include $(TOPDIR)/build/Makefile.asciidoc.inc + VTY_REFERENCE = osmosipconnector-vty-reference.xml include $(TOPDIR)/build/Makefile.vty-reference.inc diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc new file mode 100644 index 0000000..0a9a51f --- /dev/null +++ b/doc/manuals/chapters/configuration.adoc @@ -0,0 +1,49 @@ +== Configuring OsmoSIPConnector + +The configuration of OsmoSIPConnector consists mainly of two parts: +configuring the MNCC interface towards the MSC and configuring the SIP +interface towards the PBX. + +=== Configuring MNCC + +Configuring the MNCC interface is very simple. It has to be pointed to +the same path that OsmoMSC is also using. This means that OsmoMSC and +OsmoSIPConnector need to be running on the same machine or have a shared +directory that supports UNIX domain sockets. + +The example config below assumes that OsmoMSC was started with the command +line `osmo-msc -M /tmp/msc_mncc`. + +.Example: MNCC configuration +---- +OsmoMGW(config)# mncc +OsmoMGW(config-mncc)# socket-path /tmp/msc_mncc +---- + +=== Configuring SIP + +This section covers the SIP configuration. Source and destination IP and port +can be set for the connection to the PBX. + +.Example: SIP configuration +---- +OsmoMGW(config)# sip +OsmoMGW(config-sip)# local 10.0.0.1 5060 <1> +OsmoMGW(config-sip)# remote 10.0.0.2 5060 <2> +---- +<1> The local IP/port to use +<2> The remote SIP IP/port that the PBX uses + +There is also an option to use the IMSI as calling (source) address for +MO- and as called (destination) address for MT-calls. + +.Example: Use IMSI instead of MSISDN +---- +OsmoMGW(config)# app +OsmoMGW(config-app)# use-imsi <1> +---- +<1> Use the IMSI for MO calling and MT called address + +Since OsmoSIPConnector is just a shim between OsmoMSC and a proper SIP server +this is the extent of the configuration. Setting up a dialplan and other +SIP-related configuration should be done in the actual SIP server. diff --git a/doc/manuals/chapters/overview.adoc b/doc/manuals/chapters/overview.adoc new file mode 100644 index 0000000..24fe8b9 --- /dev/null +++ b/doc/manuals/chapters/overview.adoc @@ -0,0 +1,48 @@ +[[overview]] +== Overview + +This manual should help you getting started with OsmoSIPConnector. It will +cover aspects of configuring and running OsmoSIPConnector. + +[[intro_overview]] +=== About OsmoSIPConnector + +OsmoSIPConnector translates between Mobile Network Call Control (MNCC) +used in the GSM newtwork and Voice over IP SIP call control messages so that +speech calls can traverse through the mobile network to SIP and vice versa. It +has the following interfaces: + +- MNCC UNIX domain socket towards `osmo-msc` +- SIP towards the PBX +- The Osmocom typical telnet VTY interface. + +Find the OsmoSIPConnector issue tracker and wiki online at + +- https://osmocom.org/projects/osmo-sip-connector +- https://osmocom.org/projects/osmo-sip-connector/wiki + + +[[fig-gsm]] +.Typical GSM network architecture used with OsmoSIPConnector +[graphviz] +---- +digraph G{ + rankdir = LR; + "osmo-sip-connector" [color="red"]; + OsmoMGWB [label="OsmoMGW\n(BSC)"]; + OsmoMGWM [label="OsmoMGW\n(MSC)"]; + MS -> BTS [label = "Um"]; + BTS -> OsmoBSC [label = "Abis"]; + OsmoBSC -> OsmoMSC [label = "AoIP" ]; + OsmoMSC -> "osmo-sip-connector" [label = "MNCC"]; + "osmo-sip-connector" -> "PBX" [label = "SIP"]; + BTS -> OsmoMGWB [label = "RTP"]; + OsmoMGWB -> OsmoMGWM [label = "RTP"]; + OsmoMGWM -> "PBX" [label = "RTP"]; + OsmoBSC -> OsmoMGWB [label = "MGCP" ]; + OsmoMSC -> OsmoMGWM [label = "MGCP" ]; + { rank = same; OsmoBSC; OsmoMGWB; } + { rank = same; OsmoMSC; OsmoMGWM; } +} +---- + diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc new file mode 100644 index 0000000..5e0d583 --- /dev/null +++ b/doc/manuals/chapters/running.adoc @@ -0,0 +1,58 @@ +== Running OsmoSIPConnectoer + +The OsmoSIPConnector executable (`osmo-sip-connector`) offers the following +command-line arguments: + +=== SYNOPSIS + +*osmo-sip-connector* [-h] [-c 'CONFIGFILE'] + +=== OPTIONS + +*-h, --help*:: + Print a short help message about the supported options +*-c, --config-file 'CONFIGFILE'*:: + Specify the file and path name of the configuration file to be + used. If none is specified, use `osmo-sip-connector.cfg` in the + current working directory. + +=== Colocation with OsmoMSC + +Since the MNCC interface used to communicate between OsmoMSC and +OsmoSIPConnector is a UNIX domain socket both processes must run on the same +machine or have a shared directory that supports sharing UNIX domain sockets. + +=== Multiple instances + +Running multiple instances of `osmo-sip-connector` on the same computer is +possible if all interfaces (VTY, CTRL) are separated using the appropriate +configuration options. The IP based interfaces are binding to local host by +default. In order to separate the processes, the user has to bind those +services to specific but different IP addresses and/or ports. + +The VTY and the Control interface can be bound to IP addresses from the +loopback address range, for example: + +---- +line vty + bind 127.0.0.2 +ctrl + bind 127.0.0.2 +---- + +For the SIP client a different IP/port combination also needs to be used, for +example: + +---- +sip + local 0.0.0.0 5061 +---- + +The socket path for the MNCC interface also needs to change, which can be done +with the following configuration snippet: + +---- +mncc + socket-path /tmp/msc2_mncc +---- + diff --git a/doc/manuals/osmosipconnector-usermanual-docinfo.xml b/doc/manuals/osmosipconnector-usermanual-docinfo.xml new file mode 100644 index 0000000..937e054 --- /dev/null +++ b/doc/manuals/osmosipconnector-usermanual-docinfo.xml @@ -0,0 +1,46 @@ + + + 1 + August 04th, 2018 + DW + + Initial version + + + + + + + Daniel + Willmann + dwillmann at sysmocom.de + DW + + sysmocom + sysmocom - s.f.m.c. GmbH + + + + + + 2018 + sysmocom - s.f.m.c. GmbH + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with the Invariant Sections being just 'Foreword', + 'Acknowledgements' and 'Preface', with no Front-Cover Texts, + and no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + + + The Asciidoc source code of this manual can be found at + + http://git.osmocom.org/osmo-gsm-manuals/ + + + diff --git a/doc/manuals/osmosipconnector-usermanual.adoc b/doc/manuals/osmosipconnector-usermanual.adoc new file mode 100644 index 0000000..72f6c1f --- /dev/null +++ b/doc/manuals/osmosipconnector-usermanual.adoc @@ -0,0 +1,28 @@ +:gfdl-enabled: +:program-name: OsmoSIPConnector + +OsmoSIPConnector User Manual +============================ +Daniel Willmann + + +include::../common/chapters/preface.adoc[] + +include::chapters/overview.adoc[] + +include::chapters/running.adoc[] + +include::../common/chapters/vty.adoc[] + +include::../common/chapters/logging.adoc[] + +include::chapters/configuration.adoc[] + +include::../common/chapters/port_numbers.adoc[] + +include::../common/chapters/bibliography.adoc[] + +include::../common/chapters/glossary.adoc[] + +include::../common/chapters/gfdl.adoc[] + -- To view, visit https://gerrit.osmocom.org/12068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I70d3014deb459e0b91a9a92c60710b994153538e Gerrit-Change-Number: 12068 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:46:51 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:46:51 +0000 Subject: Change in osmo-sip-connector[master]: OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12069 Change subject: OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion ...................................................................... OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion Change-Id: If20700d94775e91f174a1a07e00820ef0a91cd2f --- M doc/manuals/chapters/configuration.adoc 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/69/12069/1 diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 0a9a51f..24ac3a5 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -16,8 +16,8 @@ .Example: MNCC configuration ---- -OsmoMGW(config)# mncc -OsmoMGW(config-mncc)# socket-path /tmp/msc_mncc +OsmoSIPcon(config)# mncc +OsmoSIPcon(config-mncc)# socket-path /tmp/msc_mncc ---- === Configuring SIP @@ -27,9 +27,9 @@ .Example: SIP configuration ---- -OsmoMGW(config)# sip -OsmoMGW(config-sip)# local 10.0.0.1 5060 <1> -OsmoMGW(config-sip)# remote 10.0.0.2 5060 <2> +OsmoSIPcon(config)# sip +OsmoSIPcon(config-sip)# local 10.0.0.1 5060 <1> +OsmoSIPcon(config-sip)# remote 10.0.0.2 5060 <2> ---- <1> The local IP/port to use <2> The remote SIP IP/port that the PBX uses @@ -39,8 +39,8 @@ .Example: Use IMSI instead of MSISDN ---- -OsmoMGW(config)# app -OsmoMGW(config-app)# use-imsi <1> +OsmoSIPcon(config)# app +OsmoSIPcon(config-app)# use-imsi <1> ---- <1> Use the IMSI for MO calling and MT called address -- To view, visit https://gerrit.osmocom.org/12069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If20700d94775e91f174a1a07e00820ef0a91cd2f Gerrit-Change-Number: 12069 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:46:51 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:46:51 +0000 Subject: Change in osmo-sip-connector[master]: osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12070 Change subject: osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC ...................................................................... osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC Change-Id: Ia186ea48b1012e65dc6446c839fdb548d44b6a6c --- M doc/manuals/chapters/configuration.adoc 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/70/12070/1 diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 24ac3a5..5cd57fa 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -11,6 +11,10 @@ OsmoSIPConnector need to be running on the same machine or have a shared directory that supports UNIX domain sockets. +Note that you need to start `osmo-msc` with the `--mncc-sock` option and point +to the same file that osmo-sip-connector is configured to use. See the OsmoMSC +manual for more information. + The example config below assumes that OsmoMSC was started with the command line `osmo-msc -M /tmp/msc_mncc`. -- To view, visit https://gerrit.osmocom.org/12070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia186ea48b1012e65dc6446c839fdb548d44b6a6c Gerrit-Change-Number: 12070 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:46:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:46:52 +0000 Subject: Change in osmo-sip-connector[master]: running: Add note about DTMF support Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12071 Change subject: running: Add note about DTMF support ...................................................................... running: Add note about DTMF support osmo-sip-connector does not yet support full DTMF support. The current implementation only supports DTMF tones to be send from MNCC to SIP, but not in the opposite direction. Change-Id: I578e50b0a42d88b05cf6da80443b71494b5eb26f Related: OS#2777 --- M doc/manuals/chapters/running.adoc 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/71/12071/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 5e0d583..85ccddc 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -56,3 +56,29 @@ socket-path /tmp/msc2_mncc ---- +=== DTMF signaling + +In VoIP based telephony networks DTMF (Dual-tone multi-frequency signaling) can +be signaled through multiple methods. Common methods are in-band, RFC2833 and +sip-info messages. + +Osmo-sip-connector is using sip-info messages to signal DTMF tones. When a DTMF +tone is signaled at the MNCC socket interface, osmo-sip-connector will generate +a matching sip-info message to forward the DTMF signal to the PBX. Depending on +the PBX software reconfiguring the DTMF signaling method to sip-info may be +necessary. + +While sending DTMF tones through the MNCC interface to a SIP leg, the current +implementation of osmo-sip-connector does not support sending DTMF tones in the +opposite direction. Any attempts to send DTMF tones to an MNCC leg will be +confirmed with a status 405 "Method not allowed". + +The reason for this limitation is that in mobile networks, depending on the +signaling direction, the signaling of DTMF tones is implemented differently. +A mobile originated DTMF tone is signaled through out of band messages, +which arrive at osmo-sip-connector on as MNCC DTMF START/STOP messages. Those +messages can be directly translated to sip-info messages. However, in the +other direction (mobile terminated), an in-band signaling method is used. This +means that osmo-sip-connector would have to translate an incoming DTMF sip-info +message into an audio sample that then would have to be injected into the +voice stream. Currently this scheme is not implemented in osmo-sip-connector. \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/12071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I578e50b0a42d88b05cf6da80443b71494b5eb26f Gerrit-Change-Number: 12071 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:46:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:46:52 +0000 Subject: Change in osmo-sip-connector[master]: sip-connector: update vty reference Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12072 Change subject: sip-connector: update vty reference ...................................................................... sip-connector: update vty reference Change-Id: I79b91847337b6022f8f750533301b3bf0eb086df --- M doc/manuals/vty/sipconn_vty_reference.xml 1 file changed, 106 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/72/12072/1 diff --git a/doc/manuals/vty/sipconn_vty_reference.xml b/doc/manuals/vty/sipconn_vty_reference.xml index 35aad6b..dee42e6 100644 --- a/doc/manuals/vty/sipconn_vty_reference.xml +++ b/doc/manuals/vty/sipconn_vty_reference.xml @@ -188,7 +188,7 @@ - + @@ -196,6 +196,7 @@ + @@ -205,11 +206,10 @@ - + - @@ -232,7 +232,6 @@ - @@ -240,6 +239,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -308,8 +339,7 @@ - - + @@ -451,7 +481,7 @@ - + @@ -459,6 +489,7 @@ + @@ -468,11 +499,10 @@ - + - @@ -495,7 +525,6 @@ - @@ -503,6 +532,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -855,7 +916,7 @@ - + @@ -863,13 +924,13 @@ + - + - @@ -892,7 +953,6 @@ - @@ -900,6 +960,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats -- To view, visit https://gerrit.osmocom.org/12072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I79b91847337b6022f8f750533301b3bf0eb086df Gerrit-Change-Number: 12072 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:46:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:46:53 +0000 Subject: Change in osmo-sip-connector[master]: add manuals from osmo-gsm-manuals.git Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12073 Change subject: add manuals from osmo-gsm-manuals.git ...................................................................... add manuals from osmo-gsm-manuals.git Move to doc/manuals/, with full commit history. Build with: $ autoreconf -fi $ ./configure --enable-manuals $ make Shared files from osmo-gsm-manuals.git are found automatically if the repository is checked out in ../osmo-gsm-manuals, or if it was installed with "make install". Otherwise OSMO_GSM_MANUALS_DIR needs to be set. Related: OS#3385 Change-Id: I1317131ed6765fec996344fc6ed08350187b615b --- M .gitignore M configure.ac M doc/Makefile.am D doc/manuals/Makefile A doc/manuals/Makefile.am M doc/manuals/osmosipconnector-usermanual.adoc M doc/manuals/osmosipconnector-vty-reference.xml 7 files changed, 85 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/73/12073/1 diff --git a/.gitignore b/.gitignore index 87bed96..0fa1ce0 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,14 @@ osmo-sip-connector .tarball-version .version + +# manuals +doc/manuals/*.html +doc/manuals/*.svg +doc/manuals/*.pdf +doc/manuals/*__*.png +doc/manuals/*.check +doc/manuals/generated/ +doc/manuals/osmomsc-usermanual.xml +doc/manuals/common +doc/manuals/build diff --git a/configure.ac b/configure.ac index cdb42a5..407bd9e 100644 --- a/configure.ac +++ b/configure.ac @@ -77,6 +77,48 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# Generate manuals +AC_ARG_ENABLE(manuals, + [AS_HELP_STRING( + [--enable-manuals], + [Generate manual PDFs [default=no]], + )], + [osmo_ac_build_manuals=$enableval], [osmo_ac_build_manuals="no"]) +AM_CONDITIONAL([BUILD_MANUALS], [test x"$osmo_ac_build_manuals" = x"yes"]) +AC_ARG_VAR(OSMO_GSM_MANUALS_DIR, [path to common osmo-gsm-manuals files, overriding pkg-config and "../osmo-gsm-manuals" + fallback]) +if test x"$osmo_ac_build_manuals" = x"yes" +then + # Find OSMO_GSM_MANUALS_DIR (env, pkg-conf, fallback) + if test -n "$OSMO_GSM_MANUALS_DIR"; then + echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from env)" + else + OSMO_GSM_MANUALS_DIR="$($PKG_CONFIG osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null)" + if test -n "$OSMO_GSM_MANUALS_DIR"; then + echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from pkg-conf)" + else + OSMO_GSM_MANUALS_DIR="../osmo-gsm-manuals" + echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (fallback)" + fi + fi + if ! test -d "$OSMO_GSM_MANUALS_DIR"; then + AC_MSG_ERROR("OSMO_GSM_MANUALS_DIR does not exist! Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR.") + fi + + # Find and run check-depends + CHECK_DEPENDS="$OSMO_GSM_MANUALS_DIR/check-depends.sh" + if ! test -x "$CHECK_DEPENDS"; then + CHECK_DEPENDS="osmo-gsm-manuals-check-depends" + fi + if ! $CHECK_DEPENDS; then + AC_MSG_ERROR("missing dependencies for --enable-manuals") + fi + + # Put in Makefile with absolute path + OSMO_GSM_MANUALS_DIR="$(realpath "$OSMO_GSM_MANUALS_DIR")" + AC_SUBST([OSMO_GSM_MANUALS_DIR]) +fi + # https://www.freedesktop.org/software/systemd/man/daemon.html AC_ARG_WITH([systemdsystemunitdir], [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, @@ -101,6 +143,7 @@ AC_OUTPUT( src/Makefile tests/Makefile + doc/manuals/Makefile contrib/Makefile contrib/systemd/Makefile doc/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index aee2d7b..15f36b7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1 +1,4 @@ -SUBDIRS = examples +SUBDIRS = \ + examples \ + manuals \ + $(NULL) diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile deleted file mode 100644 index cd3bb89..0000000 --- a/doc/manuals/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -TOPDIR = .. - -ASCIIDOC = osmosipconnector-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmosipconnector-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc - -include $(TOPDIR)/build/Makefile.common.inc diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am new file mode 100644 index 0000000..1a9b5b9 --- /dev/null +++ b/doc/manuals/Makefile.am @@ -0,0 +1,16 @@ +EXTRA_DIST = osmosipconnector-usermanual.adoc \ + osmosipconnector-usermanual-docinfo.xml \ + osmosipconnector-vty-reference.xml \ + chapters \ + vty + +if BUILD_MANUALS + ASCIIDOC = osmosipconnector-usermanual.adoc + ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + + VTY_REFERENCE = osmosipconnector-vty-reference.xml + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc + + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc +endif diff --git a/doc/manuals/osmosipconnector-usermanual.adoc b/doc/manuals/osmosipconnector-usermanual.adoc index 72f6c1f..72d7127 100644 --- a/doc/manuals/osmosipconnector-usermanual.adoc +++ b/doc/manuals/osmosipconnector-usermanual.adoc @@ -6,23 +6,23 @@ Daniel Willmann -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/doc/manuals/osmosipconnector-vty-reference.xml b/doc/manuals/osmosipconnector-vty-reference.xml index fe22a99..0eeb952 100644 --- a/doc/manuals/osmosipconnector-vty-reference.xml +++ b/doc/manuals/osmosipconnector-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> -- To view, visit https://gerrit.osmocom.org/12073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1317131ed6765fec996344fc6ed08350187b615b Gerrit-Change-Number: 12073 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:46:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:46:53 +0000 Subject: Change in osmo-sip-connector[master]: contrib/jenkins.sh: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12074 Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 --- M contrib/jenkins.sh 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/74/12074/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 00cd5ff..bed1f04 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -2,6 +2,10 @@ set -ex +# gerrit-verifications.yml: leaves this empty +# master-builds.yml: sets this to "--publish" +publish="$1" + base="$PWD" deps="$base/deps" inst="$deps/install" @@ -17,6 +21,9 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +osmo-build-dep.sh osmo-gsm-manuals set +x echo @@ -27,11 +34,15 @@ set -x autoreconf --install --force -./configure --enable-werror --enable-vty-tests --enable-external-tests +./configure --enable-werror --enable-vty-tests --enable-external-tests --enable-manuals $MAKE $PARALLEL_MAKE $MAKE check \ || cat-testlogs.sh $MAKE distcheck \ || cat-testlogs.sh +if [ "$publish" = "--publish" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 Gerrit-Change-Number: 12074 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:47:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 10:47:11 +0000 Subject: Change in osmo-trx[master]: lms: Destroy streams on device stop In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12062 ) Change subject: lms: Destroy streams on device stop ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I70d47c287aabdabc5dc1304a942d130aeb10bdc5 Gerrit-Change-Number: 12062 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 10:47:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:47:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:47:57 +0000 Subject: Change in osmo-trx[master]: contrib/jenkins.sh: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12075 Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: I54fdd18e405b2c84762ea06d91359867ceec8184 --- M contrib/jenkins.sh 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/75/12075/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 029f0e1..2d4ab7e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -15,6 +15,10 @@ mychroot_nocwd -w / "$@" } +# gerrit-verifications.yml: leaves this empty +# master-builds.yml: sets this to "--publish" +publish="$1" + base="$PWD" deps="$base/deps" inst="$deps/install" @@ -68,6 +72,14 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "True" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi set +x echo @@ -79,9 +91,13 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR +./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR $CONFIG $MAKE $PARALLEL_MAKE $MAKE check \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "True" ] && [ "$publish" = "--publish" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I54fdd18e405b2c84762ea06d91359867ceec8184 Gerrit-Change-Number: 12075 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:48:08 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:48:08 +0000 Subject: Change in osmo-bts[master]: contrib/jenkins_*.sh: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12076 Change subject: contrib/jenkins_*.sh: build and publish manuals ...................................................................... contrib/jenkins_*.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins_bts_model.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860 --- M contrib/jenkins_bts_model.sh M contrib/jenkins_common.sh 2 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/76/12076/1 diff --git a/contrib/jenkins_bts_model.sh b/contrib/jenkins_bts_model.sh index 9aa943f..8ccf77c 100755 --- a/contrib/jenkins_bts_model.sh +++ b/contrib/jenkins_bts_model.sh @@ -16,6 +16,10 @@ set -x -e +# gerrit-verifications.yml: leaves this empty +# master-builds.yml: sets this to "--publish" +export publish="$2" + case "$bts_model" in sysmo) diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh index bdb12d5..7ceba4f 100644 --- a/contrib/jenkins_common.sh +++ b/contrib/jenkins_common.sh @@ -38,10 +38,23 @@ osmo-deps.sh libosmocore cd $base shift + + # Manuals: build conf_flags="$*" + if [ "$WITH_MANUALS" = "True" ]; then + conf_flags="$conf_flags --enable-manuals" + osmo-build-dep.sh osmo-gsm-manuals + export PATH="$inst/bin:$PATH" + fi + autoreconf --install --force ./configure $conf_flags $MAKE $PARALLEL_MAKE $MAKE check || cat-testlogs.sh DISTCHECK_CONFIGURE_FLAGS="$conf_flags" $MAKE distcheck || cat-testlogs.sh + + # Manuals: publish + if [ "$WITH_MANUALS" = "True" ] && [ "$publish" = "--publish" ]; then + $MAKE -C "$base/doc/manuals" publish + fi } -- To view, visit https://gerrit.osmocom.org/12076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860 Gerrit-Change-Number: 12076 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:49:07 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:49:07 +0000 Subject: Change in osmo-sip-connector[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12074 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 --- M contrib/jenkins.sh 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/74/12074/2 -- To view, visit https://gerrit.osmocom.org/12074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 Gerrit-Change-Number: 12074 Gerrit-PatchSet: 2 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:50:23 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:50:23 +0000 Subject: Change in osmo-sip-connector[master]: Add VTY reference for osmo-sip-connector In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12067 ) Change subject: Add VTY reference for osmo-sip-connector ...................................................................... Abandoned did not rebase this on master properly, sorry for the noise. -- To view, visit https://gerrit.osmocom.org/12067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I1045c20dd7234d425836ba93fa292a35ccddc7fd Gerrit-Change-Number: 12067 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:50:31 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:50:31 +0000 Subject: Change in osmo-sip-connector[master]: Add manual for OsmoSIPConnector In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12068 ) Change subject: Add manual for OsmoSIPConnector ...................................................................... Abandoned did not rebase this on master properly, sorry for the noise. -- To view, visit https://gerrit.osmocom.org/12068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I70d3014deb459e0b91a9a92c60710b994153538e Gerrit-Change-Number: 12068 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:50:35 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:50:35 +0000 Subject: Change in osmo-sip-connector[master]: OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12069 ) Change subject: OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion ...................................................................... Abandoned did not rebase this on master properly, sorry for the noise. -- To view, visit https://gerrit.osmocom.org/12069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: If20700d94775e91f174a1a07e00820ef0a91cd2f Gerrit-Change-Number: 12069 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:50:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:50:39 +0000 Subject: Change in osmo-sip-connector[master]: osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12070 ) Change subject: osmo-sip-connector: Explicitly note OsmoMSC config with external MNCC ...................................................................... Abandoned did not rebase this on master properly, sorry for the noise. -- To view, visit https://gerrit.osmocom.org/12070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ia186ea48b1012e65dc6446c839fdb548d44b6a6c Gerrit-Change-Number: 12070 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:50:43 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:50:43 +0000 Subject: Change in osmo-sip-connector[master]: running: Add note about DTMF support In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12071 ) Change subject: running: Add note about DTMF support ...................................................................... Abandoned did not rebase this on master properly, sorry for the noise. -- To view, visit https://gerrit.osmocom.org/12071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I578e50b0a42d88b05cf6da80443b71494b5eb26f Gerrit-Change-Number: 12071 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:50:47 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:50:47 +0000 Subject: Change in osmo-sip-connector[master]: sip-connector: update vty reference In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12072 ) Change subject: sip-connector: update vty reference ...................................................................... Abandoned did not rebase this on master properly, sorry for the noise. -- To view, visit https://gerrit.osmocom.org/12072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I79b91847337b6022f8f750533301b3bf0eb086df Gerrit-Change-Number: 12072 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:50:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:50:53 +0000 Subject: Change in osmo-sip-connector[master]: add manuals from osmo-gsm-manuals.git In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12073 ) Change subject: add manuals from osmo-gsm-manuals.git ...................................................................... Abandoned did not rebase this on master properly, sorry for the noise. -- To view, visit https://gerrit.osmocom.org/12073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I1317131ed6765fec996344fc6ed08350187b615b Gerrit-Change-Number: 12073 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:51:08 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:51:08 +0000 Subject: Change in osmo-bsc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11972 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 Gerrit-Change-Number: 11972 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 03 Dec 2018 10:51:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:51:19 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:51:19 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12046 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id460a932431b46b88937d96637edd209ca56db97 Gerrit-Change-Number: 12046 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Mon, 03 Dec 2018 10:51:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 10:56:29 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 10:56:29 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12046 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 2: > I see two separate issues and would prefer these to be solved first: Oh, too bad I saw the comment only after posting the patches to the other repos... :\ I'm sorry for all the e-mail noise this has caused. > The scripts should work with "set -u" I can do the change, but I'm wondering for the reasons - as I understand, we are not using "set -u" with these scripts, right? Why make them work with it in theory then? > Positionable arguments are a slippery hill (ask about iptables). Okay, understandable. Well then I'll go change the scripts to use getopt. -- To view, visit https://gerrit.osmocom.org/12046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id460a932431b46b88937d96637edd209ca56db97 Gerrit-Change-Number: 12046 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Mon, 03 Dec 2018 10:56:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 11:21:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 11:21:05 +0000 Subject: Change in osmo-trx[master]: radioInterface: Fix memleak during close() Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12077 Change subject: radioInterface: Fix memleak during close() ...................................................................... radioInterface: Fix memleak during close() destructors of pointers created through "new" must be destroyed manually through "delete". Change-Id: I10d37579f16bec89cc762f200a8951218305c708 --- M Transceiver52M/radioInterface.cpp 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/77/12077/1 diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index 6245cfc..f488b0d 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -75,6 +75,14 @@ void RadioInterface::close() { + for (std::vector::iterator it = sendBuffer.begin(); it != sendBuffer.end(); ++it) + delete *it; + for (std::vector::iterator it = recvBuffer.begin(); it != recvBuffer.end(); ++it) + delete *it; + for (std::vector::iterator it = convertSendBuffer.begin(); it != convertSendBuffer.end(); ++it) + delete[] *it; + for (std::vector::iterator it = convertRecvBuffer.begin(); it != convertRecvBuffer.end(); ++it) + delete[] *it; sendBuffer.resize(0); recvBuffer.resize(0); convertSendBuffer.resize(0); -- To view, visit https://gerrit.osmocom.org/12077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I10d37579f16bec89cc762f200a8951218305c708 Gerrit-Change-Number: 12077 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 11:36:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 11:36:57 +0000 Subject: Change in osmo-trx[master]: PointerFIFO: Fix memleak of ListNode Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12078 Change subject: PointerFIFO: Fix memleak of ListNode ...................................................................... PointerFIFO: Fix memleak of ListNode Found by ASan. when PointerFIFO::release() is called, alloicated node being release is stored into an internal list for later-reuse without having to access memory allocator. However, nodes from this list are never freed. Change-Id: I40e5e28603cde67005d9d92772967b05465ea2b8 --- M CommonLibs/LinkedLists.cpp M CommonLibs/LinkedLists.h 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/78/12078/1 diff --git a/CommonLibs/LinkedLists.cpp b/CommonLibs/LinkedLists.cpp index 35a8541..b73a579 100644 --- a/CommonLibs/LinkedLists.cpp +++ b/CommonLibs/LinkedLists.cpp @@ -29,6 +29,25 @@ #include "LinkedLists.h" +PointerFIFO::~PointerFIFO() +{ + ListNode *node, *next; + + node = mHead; + while (node != NULL) { + next = node->next(); + delete node; + node = next; + } + + node = mFreeList; + while (node != NULL) { + next = node->next(); + delete node; + node = next; + } +} + void PointerFIFO::push_front(void* val) // by pat { // Pat added this routine for completeness, but never used or tested. diff --git a/CommonLibs/LinkedLists.h b/CommonLibs/LinkedLists.h index 31fb9c5..136d13d 100644 --- a/CommonLibs/LinkedLists.h +++ b/CommonLibs/LinkedLists.h @@ -70,6 +70,7 @@ :mHead(NULL),mTail(NULL),mFreeList(NULL), mSize(0) {} + ~PointerFIFO(); unsigned size() const { return mSize; } unsigned totalSize() const { return 0; } // Not used in this version. -- To view, visit https://gerrit.osmocom.org/12078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I40e5e28603cde67005d9d92772967b05465ea2b8 Gerrit-Change-Number: 12078 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 12:28:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 12:28:57 +0000 Subject: Change in osmo-trx[master]: radioInterface: Fix memleak during close() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12077 ) Change subject: radioInterface: Fix memleak during close() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12077/1/Transceiver52M/radioInterface.cpp File Transceiver52M/radioInterface.cpp: https://gerrit.osmocom.org/#/c/12077/1/Transceiver52M/radioInterface.cpp at 79 PS1, Line 79: delete *it; I guess we could introduce a template-based function here. -- To view, visit https://gerrit.osmocom.org/12077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I10d37579f16bec89cc762f200a8951218305c708 Gerrit-Change-Number: 12077 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 12:28:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 12:32:46 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 12:32:46 +0000 Subject: Change in osmo-trx[master]: PointerFIFO: Fix memleak of ListNode In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12078 ) Change subject: PointerFIFO: Fix memleak of ListNode ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12078/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12078/1//COMMIT_MSG at 9 PS1, Line 9: alloicated typo https://gerrit.osmocom.org/#/c/12078/1//COMMIT_MSG at 10 PS1, Line 10: being release is stored do you mean "is being stored"? or am I missing something? -- To view, visit https://gerrit.osmocom.org/12078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40e5e28603cde67005d9d92772967b05465ea2b8 Gerrit-Change-Number: 12078 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 12:32:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 12:42:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 12:42:53 +0000 Subject: Change in osmo-trx[master]: PointerFIFO: Fix memleak of ListNode In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12078 ) Change subject: PointerFIFO: Fix memleak of ListNode ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12078/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12078/1//COMMIT_MSG at 10 PS1, Line 10: being release is stored > do you mean "is being stored"? or am I missing something? "allocated node being released is actually stored" -- To view, visit https://gerrit.osmocom.org/12078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40e5e28603cde67005d9d92772967b05465ea2b8 Gerrit-Change-Number: 12078 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 12:42:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 12:49:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 12:49:49 +0000 Subject: Change in osmo-ggsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12063 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b Gerrit-Change-Number: 12063 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 03 Dec 2018 12:49:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 12:52:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 12:52:51 +0000 Subject: Change in osmo-trx[master]: radioInterface: Fix memleak during close() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12077 ) Change subject: radioInterface: Fix memleak during close() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I10d37579f16bec89cc762f200a8951218305c708 Gerrit-Change-Number: 12077 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 12:52:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 12:55:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 12:55:52 +0000 Subject: Change in osmo-trx[master]: lms: Fix start after stop of device In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12061 ) Change subject: lms: Fix start after stop of device ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I56358a1d1601853bc6dd2e6bb5f80798d0ba84b2 Gerrit-Change-Number: 12061 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 12:55:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 12:56:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 12:56:54 +0000 Subject: Change in osmo-trx[master]: lms: Destroy streams on device stop In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12062 ) Change subject: lms: Destroy streams on device stop ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I70d47c287aabdabc5dc1304a942d130aeb10bdc5 Gerrit-Change-Number: 12062 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 12:56:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 12:59:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 12:59:16 +0000 Subject: Change in osmo-trx[master]: PointerFIFO: Fix memleak of ListNode In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2) to the change originally created by Pau Espin Pedrol. ( https://gerrit.osmocom.org/12078 ) Change subject: PointerFIFO: Fix memleak of ListNode ...................................................................... PointerFIFO: Fix memleak of ListNode Found by ASan. when PointerFIFO::release() is called, alloicated node being released is actually stored into an internal list for later-reuse without having to access memory allocator. However, nodes from this list are never freed. Change-Id: I40e5e28603cde67005d9d92772967b05465ea2b8 --- M CommonLibs/LinkedLists.cpp M CommonLibs/LinkedLists.h 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/78/12078/2 -- To view, visit https://gerrit.osmocom.org/12078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I40e5e28603cde67005d9d92772967b05465ea2b8 Gerrit-Change-Number: 12078 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 12:59:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 12:59:58 +0000 Subject: Change in osmo-trx[master]: PointerFIFO: Fix memleak of ListNode In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12078 ) Change subject: PointerFIFO: Fix memleak of ListNode ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40e5e28603cde67005d9d92772967b05465ea2b8 Gerrit-Change-Number: 12078 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 12:59:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:04:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 13:04:14 +0000 Subject: Change in osmo-trx[master]: lms: Fix start after stop of device In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12061 ) Change subject: lms: Fix start after stop of device ...................................................................... lms: Fix start after stop of device Change-Id: I56358a1d1601853bc6dd2e6bb5f80798d0ba84b2 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 1cda4f9..cb5e31d 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -213,6 +213,11 @@ unsigned int i; + if (started) { + LOGC(DDEV, ERR) << "Device already started"; + return false; + } + /* configure the channels/streams */ for (i=0; i Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:04:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 13:04:15 +0000 Subject: Change in osmo-trx[master]: lms: Destroy streams on device stop In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12062 ) Change subject: lms: Destroy streams on device stop ...................................................................... lms: Destroy streams on device stop They are recreated during start(). Actually, if they are not stopped here, during start() after stop(), LMS_SetupStream() will fail because it will detect the streams are already opened. Change-Id: I70d47c287aabdabc5dc1304a942d130aeb10bdc5 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index cb5e31d..2ceca0d 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -277,7 +277,11 @@ for (i=0; i Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:04:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 13:04:16 +0000 Subject: Change in osmo-trx[master]: radioInterface: Fix memleak during close() In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12077 ) Change subject: radioInterface: Fix memleak during close() ...................................................................... radioInterface: Fix memleak during close() destructors of pointers created through "new" must be destroyed manually through "delete". Change-Id: I10d37579f16bec89cc762f200a8951218305c708 --- M Transceiver52M/radioInterface.cpp 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index 6245cfc..f488b0d 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -75,6 +75,14 @@ void RadioInterface::close() { + for (std::vector::iterator it = sendBuffer.begin(); it != sendBuffer.end(); ++it) + delete *it; + for (std::vector::iterator it = recvBuffer.begin(); it != recvBuffer.end(); ++it) + delete *it; + for (std::vector::iterator it = convertSendBuffer.begin(); it != convertSendBuffer.end(); ++it) + delete[] *it; + for (std::vector::iterator it = convertRecvBuffer.begin(); it != convertRecvBuffer.end(); ++it) + delete[] *it; sendBuffer.resize(0); recvBuffer.resize(0); convertSendBuffer.resize(0); -- To view, visit https://gerrit.osmocom.org/12077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I10d37579f16bec89cc762f200a8951218305c708 Gerrit-Change-Number: 12077 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:04:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 13:04:16 +0000 Subject: Change in osmo-trx[master]: PointerFIFO: Fix memleak of ListNode In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12078 ) Change subject: PointerFIFO: Fix memleak of ListNode ...................................................................... PointerFIFO: Fix memleak of ListNode Found by ASan. when PointerFIFO::release() is called, alloicated node being released is actually stored into an internal list for later-reuse without having to access memory allocator. However, nodes from this list are never freed. Change-Id: I40e5e28603cde67005d9d92772967b05465ea2b8 --- M CommonLibs/LinkedLists.cpp M CommonLibs/LinkedLists.h 2 files changed, 20 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/LinkedLists.cpp b/CommonLibs/LinkedLists.cpp index 35a8541..b73a579 100644 --- a/CommonLibs/LinkedLists.cpp +++ b/CommonLibs/LinkedLists.cpp @@ -29,6 +29,25 @@ #include "LinkedLists.h" +PointerFIFO::~PointerFIFO() +{ + ListNode *node, *next; + + node = mHead; + while (node != NULL) { + next = node->next(); + delete node; + node = next; + } + + node = mFreeList; + while (node != NULL) { + next = node->next(); + delete node; + node = next; + } +} + void PointerFIFO::push_front(void* val) // by pat { // Pat added this routine for completeness, but never used or tested. diff --git a/CommonLibs/LinkedLists.h b/CommonLibs/LinkedLists.h index 31fb9c5..136d13d 100644 --- a/CommonLibs/LinkedLists.h +++ b/CommonLibs/LinkedLists.h @@ -70,6 +70,7 @@ :mHead(NULL),mTail(NULL),mFreeList(NULL), mSize(0) {} + ~PointerFIFO(); unsigned size() const { return mSize; } unsigned totalSize() const { return 0; } // Not used in this version. -- To view, visit https://gerrit.osmocom.org/12078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I40e5e28603cde67005d9d92772967b05465ea2b8 Gerrit-Change-Number: 12078 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:05:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:05:17 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 3: Code-Review-1 (6 comments) https://gerrit.osmocom.org/#/c/11836/3/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11836/3/common/chapters/gsup.adoc at 523 PS3, Line 523: ESME (External Short Message : Entity) I'm sorry, it's not really an ESME here. It's actually the SMSC. ESME is an external entity after/beyound the SMSC. https://gerrit.osmocom.org/#/c/11836/3/common/chapters/gsup.adoc at 529 PS3, Line 529: ESME SMSC https://gerrit.osmocom.org/#/c/11836/3/common/chapters/gsup.adoc at 548 PS3, Line 548: ESME smsc https://gerrit.osmocom.org/#/c/11836/3/common/chapters/gsup.adoc at 565 PS3, Line 565: ESME SMSC https://gerrit.osmocom.org/#/c/11836/3/common/chapters/gsup.adoc at 580 PS3, Line 580: ESME (External Short Message Entity) SMSC, not ESME. https://gerrit.osmocom.org/#/c/11836/3/common/chapters/gsup.adoc at 586 PS3, Line 586: ESME SMSC -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 13:05:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:07:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 13:07:06 +0000 Subject: Change in osmocom-bb[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11998 ) Change subject: doc/manuals: integrate into this repository ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11998/1/.gitignore File .gitignore: https://gerrit.osmocom.org/#/c/11998/1/.gitignore at 41 PS1, Line 41: doc/manuals/osmomsc-usermanual.xml looks like a copy-paste mistake... -- To view, visit https://gerrit.osmocom.org/11998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 Gerrit-Change-Number: 11998 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 13:07:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:07:23 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 3 Dec 2018 13:07:23 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 5: Code-Review+1 Looks fine to me now. Your point about later command re-use makes sense. -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 03 Dec 2018 13:07:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:08:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:08:51 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Patch Set 3: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/11837/3/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11837/3/common/chapters/gsup.adoc at 622 PS3, Line 622: ESME SMSC https://gerrit.osmocom.org/#/c/11837/3/common/chapters/gsup.adoc at 634 PS3, Line 634: ESME (External Short Message Entity) SMSC https://gerrit.osmocom.org/#/c/11837/3/common/chapters/gsup.adoc at 641 PS3, Line 641: ESME SMSC https://gerrit.osmocom.org/#/c/11837/3/common/chapters/gsup.adoc at 660 PS3, Line 660: ESME SMSC -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 03 Dec 2018 13:08:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:10:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Dec 2018 13:10:10 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12046 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12046/2/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/12046/2/contrib/jenkins.sh at 74 PS2, Line 74: if [ "$WITH_MANUALS" = "True" ]; then I think the permutations of --publish and WITH_MANUALS need to be explained somewhere. Maybe in a comment on top? (Also thinking, maybe also use an env var instead of --publish, a bit weird to use two different ways to pass options for the same kind-of-thing) -- To view, visit https://gerrit.osmocom.org/12046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id460a932431b46b88937d96637edd209ca56db97 Gerrit-Change-Number: 12046 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Mon, 03 Dec 2018 13:10:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:10:54 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 13:10:54 +0000 Subject: Change in osmocom-bb[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11998 to look at the new patch set (#2). Change subject: doc/manuals: integrate into this repository ...................................................................... doc/manuals: integrate into this repository Update .gitignore and make the manuals build without a toplevel configure.ac file from autotools: $ cd doc/manuals $ make Related: OS#3385 Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 --- M .gitignore R doc/manuals/Makefile A doc/manuals/osmo-gsm-manuals-dir.sh 3 files changed, 38 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/98/11998/2 -- To view, visit https://gerrit.osmocom.org/11998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 Gerrit-Change-Number: 11998 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:11:23 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 13:11:23 +0000 Subject: Change in osmocom-bb[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11998 ) Change subject: doc/manuals: integrate into this repository ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11998/1/.gitignore File .gitignore: https://gerrit.osmocom.org/#/c/11998/1/.gitignore at 41 PS1, Line 41: doc/manuals/osmomsc-usermanual.xml > looks like a copy-paste mistake... Oh, good catch! Fixed. -- To view, visit https://gerrit.osmocom.org/11998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 Gerrit-Change-Number: 11998 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 03 Dec 2018 13:11:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:14:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:14:09 +0000 Subject: Change in osmo-hlr[master]: implement removal of MSISDN In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12056 ) Change subject: implement removal of MSISDN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I15419105ea461137776adb92d384d8985210c90e Gerrit-Change-Number: 12056 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 13:14:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:14:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:14:19 +0000 Subject: Change in osmo-hlr[master]: add 'show subscriber' command, alias for 'subscriber ... show' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12055 ) Change subject: add 'show subscriber' command, alias for 'subscriber ... show' ...................................................................... add 'show subscriber' command, alias for 'subscriber ... show' When I wrote the osmo-hlr subscriber command, I failed to heed the common 'show foo' scheme and instead created a 'subscriber [...] show' command. Relieve that weirdness by creating an alias that has 'show' at the start. Arrange string macros so that the 'show subscriber' cmd doesn't end in a space (the SUBSCR macro ends in a space ' ' to implicitly include the space to commands like 'create', 'show', 'update'). Add the new command to test_nodes.vty and test_subscriber.vty. Change-Id: I01ce9b0868302d40ed05c6a588316a194d6071e4 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 16 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index 6ce96fe..ddbaf26 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -130,14 +130,14 @@ #define SUBSCR_CMD "subscriber " #define SUBSCR_CMD_HELP "Subscriber management commands\n" -#define SUBSCR_ID "(imsi|msisdn|id) IDENT " +#define SUBSCR_ID "(imsi|msisdn|id) IDENT" #define SUBSCR_ID_HELP \ "Identify subscriber by IMSI\n" \ "Identify subscriber by MSISDN (phone number)\n" \ "Identify subscriber by database ID\n" \ "IMSI/MSISDN/ID of the subscriber\n" -#define SUBSCR SUBSCR_CMD SUBSCR_ID +#define SUBSCR SUBSCR_CMD SUBSCR_ID " " #define SUBSCR_HELP SUBSCR_CMD_HELP SUBSCR_ID_HELP #define SUBSCR_UPDATE SUBSCR "update " @@ -159,6 +159,10 @@ return CMD_SUCCESS; } +ALIAS(subscriber_show, show_subscriber_cmd, + "show " SUBSCR_CMD SUBSCR_ID, + SHOW_STR SUBSCR_CMD_HELP SUBSCR_ID_HELP); + DEFUN(subscriber_create, subscriber_create_cmd, SUBSCR_CMD "imsi IDENT create", @@ -478,6 +482,7 @@ void hlr_vty_subscriber_init(void) { install_element_ve(&subscriber_show_cmd); + install_element_ve(&show_subscriber_cmd); install_element(ENABLE_NODE, &subscriber_create_cmd); install_element(ENABLE_NODE, &subscriber_delete_cmd); install_element(ENABLE_NODE, &subscriber_msisdn_cmd); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index a9d4ac4..e1f57a9 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -18,6 +18,7 @@ show talloc-context (application|all) (full|brief|DEPTH) filter REGEXP show gsup-connections subscriber (imsi|msisdn|id) IDENT show + show subscriber (imsi|msisdn|id) IDENT OsmoHLR> enable OsmoHLR# list diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty index 2da455f..c22f2df 100644 --- a/tests/test_subscriber.vty +++ b/tests/test_subscriber.vty @@ -3,6 +3,7 @@ OsmoHLR# list ... subscriber (imsi|msisdn|id) IDENT show + show subscriber (imsi|msisdn|id) IDENT subscriber imsi IDENT create subscriber (imsi|msisdn|id) IDENT delete subscriber (imsi|msisdn|id) IDENT update msisdn MSISDN @@ -33,6 +34,13 @@ OsmoHLR# subscriber msisdn 12345 show % No subscriber for msisdn = '12345' +OsmoHLR# show subscriber imsi 123456789023000 +% No subscriber for imsi = '123456789023000' +OsmoHLR# show subscriber id 1 +% No subscriber for id = '1' +OsmoHLR# show subscriber msisdn 12345 +% No subscriber for msisdn = '12345' + OsmoHLR# subscriber imsi 1234567890230001 create % Not a valid IMSI: 1234567890230001 OsmoHLR# subscriber imsi 12345678902300x create -- To view, visit https://gerrit.osmocom.org/12055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I01ce9b0868302d40ed05c6a588316a194d6071e4 Gerrit-Change-Number: 12055 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:14:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:14:20 +0000 Subject: Change in osmo-hlr[master]: implement removal of MSISDN In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12056 ) Change subject: implement removal of MSISDN ...................................................................... implement removal of MSISDN Add the first "official" way to remove the MSISDN from a subscriber entry, to go back to 'MSISDN: none' like just after 'subscriber create'. Add VTY command 'subscriber update msisdn none' to drop the MSISDN from the subscriber. (Like 'subscriber update aud3g none') Add DB_STMT_DELETE_MSISDN_BY_IMSI. In db_subscr_update_msisdn_by_imsi(), allow passing a NULL msisdn, and if NULL, call above delete SQL statement. Change-Id: I15419105ea461137776adb92d384d8985210c90e --- M src/db.c M src/db.h M src/db_hlr.c M src/hlr_vty_subscr.c M tests/test_subscriber.vty 5 files changed, 56 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/db.c b/src/db.c index 4b0577f..bcf83c6 100644 --- a/src/db.c +++ b/src/db.c @@ -62,6 +62,7 @@ [DB_STMT_SUBSCR_CREATE] = "INSERT INTO subscriber (imsi) VALUES ($imsi)", [DB_STMT_DEL_BY_ID] = "DELETE FROM subscriber WHERE id = $subscriber_id", [DB_STMT_SET_MSISDN_BY_IMSI] = "UPDATE subscriber SET msisdn = $msisdn WHERE imsi = $imsi", + [DB_STMT_DELETE_MSISDN_BY_IMSI] = "UPDATE subscriber SET msisdn = NULL WHERE imsi = $imsi", [DB_STMT_AUC_2G_INSERT] = "INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki)" " VALUES($subscriber_id, $algo_id_2g, $ki)", diff --git a/src/db.h b/src/db.h index 956b5ed..34582c8 100644 --- a/src/db.h +++ b/src/db.h @@ -20,6 +20,7 @@ DB_STMT_SUBSCR_CREATE, DB_STMT_DEL_BY_ID, DB_STMT_SET_MSISDN_BY_IMSI, + DB_STMT_DELETE_MSISDN_BY_IMSI, DB_STMT_AUC_2G_INSERT, DB_STMT_AUC_2G_DELETE, DB_STMT_AUC_3G_INSERT, diff --git a/src/db_hlr.c b/src/db_hlr.c index c4d4974..2bccc38 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -135,7 +135,7 @@ /*! Set a subscriber's MSISDN in the HLR database. * \param[in,out] dbc database context. - * \param[in] imsi ASCII string of IMSI digits. + * \param[in] imsi ASCII string of IMSI digits, or NULL to remove the MSISDN. * \param[in] msisdn ASCII string of MSISDN digits. * \returns 0 on success, -EINVAL in case of invalid MSISDN string, -EIO on * database failure, -ENOENT if no such subscriber exists. @@ -146,19 +146,22 @@ int rc; int ret = 0; - if (!osmo_msisdn_str_valid(msisdn)) { + if (msisdn && !osmo_msisdn_str_valid(msisdn)) { LOGHLR(imsi, LOGL_ERROR, "Cannot update subscriber: invalid MSISDN: '%s'\n", msisdn); return -EINVAL; } - sqlite3_stmt *stmt = dbc->stmt[DB_STMT_SET_MSISDN_BY_IMSI]; + sqlite3_stmt *stmt = dbc->stmt[ + msisdn ? DB_STMT_SET_MSISDN_BY_IMSI : DB_STMT_DELETE_MSISDN_BY_IMSI]; if (!db_bind_text(stmt, "$imsi", imsi)) return -EIO; - if (!db_bind_text(stmt, "$msisdn", msisdn)) - return -EIO; + if (msisdn) { + if (!db_bind_text(stmt, "$msisdn", msisdn)) + return -EIO; + } /* execute the statement */ rc = sqlite3_step(stmt); diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index ddbaf26..bc6f6a5 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -142,6 +142,7 @@ #define SUBSCR_UPDATE SUBSCR "update " #define SUBSCR_UPDATE_HELP SUBSCR_HELP "Set or update subscriber data\n" +#define SUBSCR_MSISDN_HELP "Set MSISDN (phone number) of the subscriber\n" DEFUN(subscriber_show, subscriber_show_cmd, @@ -228,9 +229,9 @@ DEFUN(subscriber_msisdn, subscriber_msisdn_cmd, - SUBSCR_UPDATE "msisdn MSISDN", - SUBSCR_UPDATE_HELP - "Set MSISDN (phone number) of the subscriber\n" + SUBSCR_UPDATE "msisdn (none|MSISDN)", + SUBSCR_UPDATE_HELP SUBSCR_MSISDN_HELP + "Remove MSISDN (phone number)\n" "New MSISDN (phone number)\n") { struct hlr_subscriber subscr; @@ -238,15 +239,19 @@ const char *id = argv[1]; const char *msisdn = argv[2]; - if (strlen(msisdn) > sizeof(subscr.msisdn) - 1) { - vty_out(vty, "%% MSISDN is too long, max. %zu characters are allowed%s", - sizeof(subscr.msisdn)-1, VTY_NEWLINE); - return CMD_WARNING; - } + if (strcmp(msisdn, "none") == 0) + msisdn = NULL; + else { + if (strlen(msisdn) > sizeof(subscr.msisdn) - 1) { + vty_out(vty, "%% MSISDN is too long, max. %zu characters are allowed%s", + sizeof(subscr.msisdn)-1, VTY_NEWLINE); + return CMD_WARNING; + } - if (!osmo_msisdn_str_valid(msisdn)) { - vty_out(vty, "%% MSISDN invalid: '%s'%s", msisdn, VTY_NEWLINE); - return CMD_WARNING; + if (!osmo_msisdn_str_valid(msisdn)) { + vty_out(vty, "%% MSISDN invalid: '%s'%s", msisdn, VTY_NEWLINE); + return CMD_WARNING; + } } if (get_subscr_by_argv(vty, id_type, id, &subscr)) @@ -258,11 +263,18 @@ return CMD_WARNING; } - vty_out(vty, "%% Updated subscriber IMSI='%s' to MSISDN='%s'%s", - subscr.imsi, msisdn, VTY_NEWLINE); + if (msisdn) { + vty_out(vty, "%% Updated subscriber IMSI='%s' to MSISDN='%s'%s", + subscr.imsi, msisdn, VTY_NEWLINE); - if (db_subscr_get_by_msisdn(g_hlr->dbc, msisdn, &subscr) == 0) + if (db_subscr_get_by_msisdn(g_hlr->dbc, msisdn, &subscr) == 0) + osmo_hlr_subscriber_update_notify(&subscr); + } else { + vty_out(vty, "%% Updated subscriber IMSI='%s': removed MSISDN%s", + subscr.imsi, VTY_NEWLINE); + osmo_hlr_subscriber_update_notify(&subscr); + } return CMD_SUCCESS; } diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty index c22f2df..8677c9b 100644 --- a/tests/test_subscriber.vty +++ b/tests/test_subscriber.vty @@ -6,7 +6,7 @@ show subscriber (imsi|msisdn|id) IDENT subscriber imsi IDENT create subscriber (imsi|msisdn|id) IDENT delete - subscriber (imsi|msisdn|id) IDENT update msisdn MSISDN + subscriber (imsi|msisdn|id) IDENT update msisdn (none|MSISDN) subscriber (imsi|msisdn|id) IDENT update aud2g none subscriber (imsi|msisdn|id) IDENT update aud2g (comp128v1|comp128v2|comp128v3|xor) ki KI subscriber (imsi|msisdn|id) IDENT update aud3g none @@ -86,6 +86,21 @@ OsmoHLR# subscriber msisdn 12345 show % No subscriber for msisdn = '12345' +OsmoHLR# subscriber msisdn 423 update msisdn none +% Updated subscriber IMSI='123456789023000': removed MSISDN +OsmoHLR# subscriber msisdn 423 show +% No subscriber for msisdn = '423' +OsmoHLR# subscriber imsi 123456789023000 show + ID: 1 + IMSI: 123456789023000 + MSISDN: none +OsmoHLR# subscriber imsi 123456789023000 update msisdn 423 +% Updated subscriber IMSI='123456789023000' to MSISDN='423' +OsmoHLR# subscriber msisdn 423 show + ID: 1 + IMSI: 123456789023000 + MSISDN: 423 + OsmoHLR# subscriber imsi 123456789023000 show ID: 1 IMSI: 123456789023000 @@ -104,6 +119,10 @@ aud2g Set 2G authentication data aud3g Set UMTS authentication data (3G, and 2G with UMTS AKA) +OsmoHLR# subscriber imsi 123456789023000 update msisdn ? + none Remove MSISDN (phone number) + MSISDN New MSISDN (phone number) + OsmoHLR# subscriber imsi 123456789023000 update aud2g ? none Delete 2G authentication data comp128v1 Use COMP128v1 algorithm -- To view, visit https://gerrit.osmocom.org/12056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I15419105ea461137776adb92d384d8985210c90e Gerrit-Change-Number: 12056 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:15:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:15:16 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: fix direction for SS messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12060 ) Change subject: chapters/gsup.adoc: fix direction for SS messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I46ad7311747f2b392244c49d3df1e152e6f1bfe3 Gerrit-Change-Number: 12060 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 03 Dec 2018 13:15:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:15:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:15:19 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: fix direction for SS messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12060 ) Change subject: chapters/gsup.adoc: fix direction for SS messages ...................................................................... chapters/gsup.adoc: fix direction for SS messages Most likely, this was a copy-paste error. SGSN is not involved in Supplemeptary Services handling, they are pure CS data. Moreover, HLR is not the only entity that can initiate both Process Supplementary Service Error and Response messages, there is also EUSE (External USSD handling Entity). Change-Id: I46ad7311747f2b392244c49d3df1e152e6f1bfe3 --- M common/chapters/gsup.adoc 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index e87d979..70295cf 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -474,7 +474,7 @@ ==== Process Supplementary Service Error -Direction: HLR => SGSN / VLR +Direction: EUSE / HLR => MSC [options="header",cols="5%,20%,45%,10%,10%,10%"] |=== @@ -488,7 +488,7 @@ ==== Process Supplementary Service Response -Direction: HLR => SGSN / VLR +Direction: EUSE / HLR => MSC [options="header",cols="5%,20%,45%,10%,10%,10%"] |=== -- To view, visit https://gerrit.osmocom.org/12060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I46ad7311747f2b392244c49d3df1e152e6f1bfe3 Gerrit-Change-Number: 12060 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:16:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:16:55 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: release IUSE sessions immediately after response In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12023 ) Change subject: SS/USSD: release IUSE sessions immediately after response ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaefe37512da79e10fbe92378236bfff0eae0f8b9 Gerrit-Change-Number: 12023 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 13:16:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:18:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 13:18:03 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11836/3/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11836/3/common/chapters/gsup.adoc at 523 PS3, Line 523: ESME (External Short Message : Entity) > I'm sorry, it's not really an ESME here. It's actually the SMSC. [?] Thanks for the clarification. I'll fix. -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 13:18:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:18:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 13:18:13 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11836 to look at the new patch set (#4). Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... chapters/gsup.adoc: document MO-/MT-forwardSM messages Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Related Change-Id: (core) Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Related Change-Id: (TTCN) Ibf49474a81235096c032ea21f217170f523bd94e Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 219 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/36/11836/4 -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:18:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 13:18:13 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11837 to look at the new patch set (#4). Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... chapters/gsup.adoc: document READY-FOR-SM message Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Related Change-Id: (core) Ic37f3b2114b8095cfce22977e67133b9103942e3 Related Change-Id: (TTCN) If2256607527ecfcb10285583332fb8b0515d7c78 Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 77 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/37/11837/4 -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:19:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:19:39 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: make NCSS session timeout configurable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12048 ) Change subject: SS/USSD: make NCSS session timeout configurable ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12048/2/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/#/c/12048/2/src/hlr_vty.c at 291 PS2, Line 291: if (g_hlr->ncss_guard_timeout > 0) I think this should check for != DEFAULT and only save a non-default value. -- To view, visit https://gerrit.osmocom.org/12048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d Gerrit-Change-Number: 12048 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 13:19:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:21:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:21:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: add READY-FOR-SM message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11752 ) Change subject: library/GSUP_Types.ttcn: add READY-FOR-SM message ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If2256607527ecfcb10285583332fb8b0515d7c78 Gerrit-Change-Number: 11752 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 13:21:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:22:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:22:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler.ttcn: split up f_mo_sms() into two functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11717 ) Change subject: BSC_ConnectionHandler.ttcn: split up f_mo_sms() into two functions ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b35206286ae8add8b5bd34b0ab41ba7862c28e4 Gerrit-Change-Number: 11717 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 03 Dec 2018 13:22:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:23:09 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 13:23:09 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: make NCSS session timeout configurable In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12048 ) Change subject: SS/USSD: make NCSS session timeout configurable ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12048/2/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/#/c/12048/2/src/hlr_vty.c at 291 PS2, Line 291: if (g_hlr->ncss_guard_timeout > 0) > I think this should check for != DEFAULT and only save a non-default value. Sure, thanks! Copy-pasted :/ -- To view, visit https://gerrit.osmocom.org/12048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d Gerrit-Change-Number: 12048 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 13:23:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:30:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 13:30:16 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: make NCSS session timeout configurable In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12048 to look at the new patch set (#3). Change subject: SS/USSD: make NCSS session timeout configurable ...................................................................... SS/USSD: make NCSS session timeout configurable It may happen that either the MS or an ESME would become unresponsive, e.g. due to a bug, or a dropped message. This is why we have SS session timeout, that prevents keeping 'stalled' sessions forever. Let's introduce a VTY option, which can be used to configure this timer (by default it's set to 30 seconds): hlr ... ! Use 0 to disable this timer ncss-guard-timeout 30 Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d Related: OS#3717 --- M src/hlr.c M src/hlr.h M src/hlr_ussd.c M src/hlr_ussd.h M src/hlr_vty.c M tests/test_nodes.vty 6 files changed, 29 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/48/12048/3 -- To view, visit https://gerrit.osmocom.org/12048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d Gerrit-Change-Number: 12048 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:38:22 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 13:38:22 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12046 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 2: After a longer chat discussion: * I looked into getopt/getopts parsing, and whether it would be really worth the overhead. Neels and I both argued that it's unlikely that other commandline options will appear in the future, so we were against any argument parsing method. Holger said: "fair enough. I just wanted to point out that the approach is fragile and not scalable. We can re-evaluate the next time somebody is adding an option to the scripts." * Regarding set -u ("$publish" = "--publish" vs. "y$publish" = "y--publish"), since we don't use either set +u or #!/bin/sh -u in this script, this would not make any difference. * Neels suggested to explain all incoming parameters (environment and the only commandline parameter, --publish) on top of each of the jenkins.sh scripts I'm modifying. I'm working on that now. Thanks everybody for reviewing, highly appreciated! -- To view, visit https://gerrit.osmocom.org/12046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id460a932431b46b88937d96637edd209ca56db97 Gerrit-Change-Number: 12046 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Mon, 03 Dec 2018 13:38:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:39:00 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 13:39:00 +0000 Subject: Change in osmo-ci[master]: master-builds: make SSH keys available in Docker In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12042 ) Change subject: master-builds: make SSH keys available in Docker ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icfff3b6a620de79d1bab7ff6a35309f828581c09 Gerrit-Change-Number: 12042 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 03 Dec 2018 13:39:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:39:02 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 13:39:02 +0000 Subject: Change in osmo-ci[master]: master-builds: make SSH keys available in Docker In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12042 ) Change subject: master-builds: make SSH keys available in Docker ...................................................................... master-builds: make SSH keys available in Docker At runtime, mount the Jenkins host's ~/.ssh folder inside the Docker containers, from which manual PDFs will be published. To my surprise, local testing showed that ssh is looking for the keys in /home/build/.ssh, although the HOME variable inside the image is set to /build, not /home/build. Related: OS#3385 Change-Id: Icfff3b6a620de79d1bab7ff6a35309f828581c09 --- M jobs/master-builds.yml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved osmith: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 67a9b80..d485a5f 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -175,6 +175,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + -v "$HOME/.ssh:/home/build/.ssh:ro" \ osmocom:amd64 /build/contrib/jenkins.sh --publish - osmo-bts: @@ -235,6 +236,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + -v "$HOME/.ssh:/home/build/.ssh:ro" \ osmocom:amd64 /build/contrib/jenkins.sh --publish trigger: master-osmo-msc, master-osmo-bsc @@ -258,6 +260,7 @@ -w /build -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ + -v "$HOME/.ssh:/home/build/.ssh:ro" \ osmocom:amd64 /build/contrib/jenkins.sh --publish - osmo-pcap @@ -298,6 +301,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + -v "$HOME/.ssh:/home/build/.ssh:ro" \ osmocom:amd64 /build/contrib/jenkins.sh --publish - osmo-sip-connector: -- To view, visit https://gerrit.osmocom.org/12042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icfff3b6a620de79d1bab7ff6a35309f828581c09 Gerrit-Change-Number: 12042 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:47:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Dec 2018 13:47:50 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 7: Code-Review-1 (5 comments) I feel a bit apologetic to -1 again... https://gerrit.osmocom.org/#/c/11898/7/sql/hlr_index.sql File sql/hlr_index.sql: https://gerrit.osmocom.org/#/c/11898/7/sql/hlr_index.sql at 3 PS7, Line 3: CREATE UNIQUE INDEX idx_subscr_imsi ON subscriber (imsi); we're now only using the hlr.sql file when the db is empty; what is the reason to keep this file separate? There is none, right, or am I missing something? https://gerrit.osmocom.org/#/c/11898/7/src/db.c File src/db.c: https://gerrit.osmocom.org/#/c/11898/7/src/db.c at 243 PS7, Line 243: static bool db_is_bootstrapped_v0(struct db_context *dbc) this is still kind of a mix between "is_bootstrapped" and "is_correct". What if a future db scheme would, for example, drop one of those tables? Since you're always calling this function in db_open() that would need revisiting here. I think just checking for 'subscriber' presence to distinguish between v0-empty and v0-bootstrapped would have identical use with less tails attached. https://gerrit.osmocom.org/#/c/11898/7/src/db.c at 346 PS7, Line 346: if (!db_is_bootstrapped_v0(dbc)) { let's break it down: empty: - user_version set to 0 - no table 'subscriber' present v0: - user_version is set to 0 - 'subscriber' present vN: - user_version is set to N So, IIUC, checking table presence makes sense *only* if the user_version is set to 0, to distinguish between "empty" and "v0 bootstrapped"? Hence I would expect first getting the user_version, then iff zero check db table presence (and it would suffice to check presence of only table 'subscriber', IMHO). If then the verdict is "empty", go for bootstrapping? https://gerrit.osmocom.org/#/c/11898/7/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/11898/7/src/hlr.c at 651 PS7, Line 651: } (For a unit test, it would be helpful to exit the program right after a db upgrade, so first up I thought, the --upgrade-db option should exit right away. Then again opening up the possibility to automatically upgrade the db when hlr service gets restarted would imply to not exit. So maybe the unit test use case needs a separate option like --check-db-and-exit. i.e. nm) https://gerrit.osmocom.org/#/c/11898/7/src/hlr_db_tool.c File src/hlr_db_tool.c: https://gerrit.osmocom.org/#/c/11898/7/src/hlr_db_tool.c at 64 PS7, Line 64: printf(" -U --upgrade-db Allow HLR database schema upgrades.\n"); (the variables and other options are all called 'db-foo', this is the only one called 'foo-db') -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 13:47:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:52:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:52:29 +0000 Subject: Change in libosmocore[master]: configure.ac: check clock_gettime for glib < 2.17 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/7907 ) Change subject: configure.ac: check clock_gettime for glib < 2.17 ...................................................................... configure.ac: check clock_gettime for glib < 2.17 glib < 2.17 doesn't support clock_gettime directly, it is available via librt. Change-Id: Ice853d85ffe859b1d4df48b91b050c24d85c861b --- M configure.ac M src/Makefile.am 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index bc3358a..4a00e69 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,10 @@ AC_CHECK_LIB(execinfo, backtrace, BACKTRACE_LIB=-lexecinfo, BACKTRACE_LIB=) AC_SUBST(BACKTRACE_LIB) +# check for old glibc < 2.17 to get clock_gettime +AC_SEARCH_LIBS([clock_gettime], [rt posix4], [LIBRARY_RT="$LIBS";LIBS=""]) +AC_SUBST(LIBRARY_RT) + AC_ARG_ENABLE(doxygen, [AS_HELP_STRING( [--disable-doxygen], diff --git a/src/Makefile.am b/src/Makefile.am index e9db32f..dca5865 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ lib_LTLIBRARIES = libosmocore.la -libosmocore_la_LIBADD = $(BACKTRACE_LIB) $(TALLOC_LIBS) +libosmocore_la_LIBADD = $(BACKTRACE_LIB) $(TALLOC_LIBS) $(LIBRARY_RT) libosmocore_la_SOURCES = timer.c timer_gettimeofday.c timer_clockgettime.c \ select.c signal.c msgb.c bits.c \ bitvec.c bitcomp.c counter.c fsm.c \ -- To view, visit https://gerrit.osmocom.org/7907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ice853d85ffe859b1d4df48b91b050c24d85c861b Gerrit-Change-Number: 7907 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:54:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:54:29 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 13:54:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:54:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:54:32 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... gsm0808: add message generator for BSSMAP HANDOVER PERFORMED We currently have no generator function that can generate BSSMAP HANDOVER PERFORMED messages. Lets add function for this. Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Related: OS#3645 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 3 files changed, 71 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 298b3e4..e3fb6ad 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -172,6 +172,30 @@ }; struct msgb *gsm0808_create_handover_failure(const struct gsm0808_handover_failure *params); +struct gsm0808_handover_performed { + uint16_t cause; + struct gsm0808_cell_id cell_id; + + bool chosen_channel_present; + uint8_t chosen_channel; + + bool chosen_encr_alg_present; + uint8_t chosen_encr_alg; + + bool speech_version_chosen_present; + uint8_t speech_version_chosen; + + bool speech_codec_chosen_present; + struct gsm0808_speech_codec speech_codec_chosen; + + bool lcls_bss_status_present; + enum gsm0808_lcls_status lcls_bss_status; + + /* more items are defined in the spec and may be added later */ + bool more_items; /*< always set this to false */ +}; +struct msgb *gsm0808_create_handover_performed(const struct gsm0808_handover_performed *params); + struct msgb *gsm0808_create_dtap(struct msgb *msg, uint8_t link_id); void gsm0808_prepend_dtap_header(struct msgb *msg, uint8_t link_id); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 2566ad5..c0d5f39 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -892,6 +892,52 @@ return msg; } +/*! Create BSSMAP HANDOVER PERFORMED message, 3GPP TS 48.008 3.2.1.25. + * \param[in] params All information to be encoded. + * \returns callee-allocated msgb with BSSMAP HANDOVER PERFORMED message */ +struct msgb *gsm0808_create_handover_performed(const struct gsm0808_handover_performed *params) +{ + struct msgb *msg; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-HANDOVER-PERFORMED"); + if (!msg) + return NULL; + + /* Message Type, 3.2.2.1 */ + msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_PERFORMED); + + /* Cause, 3.2.2.5 */ + msgb_tlv_put(msg, GSM0808_IE_CAUSE, gsm0808_cause_ext(params->cause) ? 2 : 1, (const uint8_t *)¶ms->cause); + + /* Cell Identifier, 3.2.2.17 */ + gsm0808_enc_cell_id(msg, ¶ms->cell_id); + + /* Chosen Channel 3.2.2.33 */ + if (params->chosen_channel_present) + msgb_tv_put(msg, GSM0808_IE_CHOSEN_CHANNEL, params->chosen_channel); + + /* Chosen Encryption Algorithm 3.2.2.44 */ + if (params->chosen_encr_alg_present) + msgb_tv_put(msg, GSM0808_IE_CHOSEN_ENCR_ALG, params->chosen_encr_alg); + + /* Speech Version (chosen) 3.2.2.51 */ + if (params->speech_version_chosen_present) + msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, params->speech_version_chosen); + + /* AoIP: Speech Codec (chosen) 3.2.2.104 */ + if (params->speech_codec_chosen_present) + gsm0808_enc_speech_codec(msg, ¶ms->speech_codec_chosen); + + /* LCLS-BSS-Status 3.2.2.119 */ + if (params->lcls_bss_status_present) + msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, params->lcls_bss_status); + + /* prepend header with final length */ + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + + return msg; +} + /*! Prepend a DTAP header to given Message Buffer * \param[in] msgb Message Buffer * \param[in] link_id Link Identifier */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 3fe9dfc..04a9826 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -181,6 +181,7 @@ gsm0808_create_handover_detect; gsm0808_create_handover_complete; gsm0808_create_handover_failure; +gsm0808_create_handover_performed; gsm0808_prepend_dtap_header; gsm0808_enc_aoip_trasp_addr; gsm0808_dec_aoip_trasp_addr; -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 13:57:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 13:57:57 +0000 Subject: Change in libosmocore[master]: gsm0808: add encoder for cause codes and use it In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12044 ) Change subject: gsm0808: add encoder for cause codes and use it ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12044/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12044/1//COMMIT_MSG at 13 PS1, Line 13: extended up to two bytes. Lets implement the encoding over and over > I guess you menat: "Instead of implementing the encoding over and over and again, let's rather have [?] this wording should be fixed. the remainder of the patch is fine for me. -- To view, visit https://gerrit.osmocom.org/12044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb Gerrit-Change-Number: 12044 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 13:57:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:05:44 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 14:05:44 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12046 to look at the new patch set (#3). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters (--publish and all env vars) on top of jenkins.sh. Related: OS#3385 Change-Id: Id460a932431b46b88937d96637edd209ca56db97 --- M contrib/jenkins.sh 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/12046/3 -- To view, visit https://gerrit.osmocom.org/12046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id460a932431b46b88937d96637edd209ca56db97 Gerrit-Change-Number: 12046 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 3 14:07:46 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 3 Dec 2018 14:07:46 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-iuh_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2577?= Message-ID: <1251207335.984.1543846066295.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 678.99 KB...] CC UnsuccessfulOutcome.o CC HNBRegisterRequest.o CC SuccessfulOutcome.o CC HNBRegisterAccept.o CC HNBRegisterReject.o CC UERegisterRequest.o CC UERegisterAccept.o CC UERegisterReject.o CC UEDe-Register.o CC HNBDe-Register.o CC ErrorIndication.o CC CSGMembershipUpdate.o CC TNLUpdateRequest.o CC TNLUpdateResponse.o CC TNLUpdateFailure.o CC HNBConfigTransferRequest.o CC HNBConfigTransferResponse.o CC RelocationComplete.o CC U-RNTIQueryRequest.o CC U-RNTIQueryResponse.o CC PrivateMessage.o CC IE.o AR libosmo-asn1-hnbap.a ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' Making all in rua make[4]: Entering directory ' CC RUA_Criticality.o CC RUA_Presence.o CC RUA_ProcedureCode.o CC RUA_PrivateIE-ID.o CC RUA_CN-DomainIndicator.o CC RUA_ProtocolIE-ID.o CC RUA_TriggeringMessage.o CC RUA_IE-Extensions.o CC RUA_CSGMembershipStatus.o CC RUA_Establishment-Cause.o CC RUA_Context-ID.o CC RUA_IntraDomainNasNodeSelector.o CC RUA_Gsm-map-IDNNS.o CC RUA_Ansi-41-IDNNS.o CC RUA_RANAP-Message.o CC RUA_RoutingParameter.o CC RUA_Cause.o CC RUA_CauseTransport.o CC RUA_CauseRadioNetwork.o CC RUA_CauseProtocol.o CC RUA_CauseMisc.o CC RUA_CriticalityDiagnostics.o CC RUA_CriticalityDiagnostics-IE-List.o CC RUA_TypeOfError.o CC RUA_RUA-PDU.o In file included from :8:0, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:14, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics.h:17, from RUA_CriticalityDiagnostics.c:7: ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ In file included from :8:0, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:14, from RUA_CriticalityDiagnostics-IE-List.c:7: ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC RUA_SuccessfulOutcome.o CC RUA_InitiatingMessage.o CC RUA_UnsuccessfulOutcome.o CC RUA_Connect.o CC RUA_DirectTransfer.o CC RUA_Disconnect.o CC RUA_ConnectionlessTransfer.o CC RUA_ErrorIndication.o CC RUA_PrivateMessage.o CC RUA_IE.o AR libosmo-asn1-rua.a ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' Making all in ranap make[4]: Entering directory ' CC RANAP_Criticality.lo CC RANAP_PrivateIE-ID.lo CC RANAP_ProcedureCode.lo CC RANAP_Presence.lo CC RANAP_ProtocolExtensionID.lo CC RANAP_TriggeringMessage.lo CC RANAP_ProtocolIE-ID.lo CC RANAP_IE-Extensions.lo CC RANAP_AccuracyFulfilmentIndicator.lo CC RANAP_AllocationOrRetentionPriority.lo CC RANAP_Alt-RAB-Parameters.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateType.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-MaxBitrates.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.lo CC RANAP_AlternativeRABConfigurationRequest.lo CC RANAP_APN.lo CC RANAP_AreaIdentity.lo CC RANAP_Ass-RAB-Parameters.lo CC RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_Ass-RAB-Parameter-MaxBitrateList.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_IE-Extensions.h:15, from ../../include/osmocom/ranap/RANAP_SAI.h:17, from ../../include/osmocom/ranap/RANAP_AreaIdentity.h:14, from RANAP_AreaIdentity.c:7: ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC RANAP_AuthorisedPLMNs.lo CC RANAP_AuthorisedSNAs.lo CC RANAP_BindingID.lo CC RANAP_BroadcastAssistanceDataDecipheringKeys.lo CC RANAP_Cause.lo CC RANAP_CauseMisc.lo CC RANAP_CauseNAS.lo CC RANAP_CauseProtocol.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:14, from RANAP_AuthorisedPLMNs.c:7: ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:23: warning: ?struct MemberC? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberC { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberC { ^~~~~~~~~~~~~ CC RANAP_CauseRadioNetwork.lo CC RANAP_CauseRadioNetworkExtension.lo CC RANAP_CauseNon-Standard.lo CC RANAP_CauseTransmissionNetwork.lo CC RANAP_Cell-Access-Mode.lo CC RANAP_CellBased.lo CC RANAP_CellIdList.lo CC RANAP_Cell-Id.lo CC RANAP_Cell-Capacity-Class-Value.lo CC RANAP_CellLoadInformation.lo CC RANAP_CellLoadInformationGroup.lo CC RANAP_CellType.lo CC RANAP_ClientType.lo CC RANAP_CriticalityDiagnostics.lo CC RANAP_CriticalityDiagnostics-IE-List.lo CC RANAP_MessageStructure.lo CC RANAP_CGI.lo CC RANAP_ChosenEncryptionAlgorithm.lo CC RANAP_ChosenIntegrityProtectionAlgorithm.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:14, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics.h:17, from RANAP_CriticalityDiagnostics.c:7: ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct MemberG? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberG { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberG { ^~~~~~~~~~~~~ In file included from :8:0, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:14, from RANAP_CriticalityDiagnostics-IE-List.c:7: ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct MemberG? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberG { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberG { ^~~~~~~~~~~~~ CC RANAP_CI.lo CC RANAP_ClassmarkInformation2.lo CC RANAP_ClassmarkInformation3.lo CC RANAP_CN-DomainIndicator.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_MessageStructure.h:14, from RANAP_MessageStructure.c:7: ../../include/osmocom/ranap/RANAP_MessageStructure.h:27:23: warning: ?struct MemberL? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberL { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_MessageStructure.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberL { ^~~~~~~~~~~~~ CC RANAP_CN-ID.lo CC RANAP_Correlation-ID.lo RANAP_CI.c: In function ?RANAP_CI_encode_uper?: RANAP_CI.c:116:1: internal compiler error: Segmentation fault } ^ Please submit a full bug report, with preprocessed source if appropriate. See for instructions. Makefile:2506: recipe for target 'RANAP_CI.lo' failed make[4]: *** [RANAP_CI.lo] Error 1 make[4]: *** Waiting for unfinished jobs.... make[4]: Leaving directory ' Makefile:642: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory ' Makefile:454: recipe for target 'all' failed make[2]: *** [all] Error 2 make[2]: Leaving directory ' Makefile:458: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:10:10 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 3 Dec 2018 14:10:10 +0000 Subject: Change in libosmocore[master]: Update msgb Lx helpers Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12079 Change subject: Update msgb Lx helpers ...................................................................... Update msgb Lx helpers * add missing L1 and L4 hexdump * add msgb_l4() for consistency and convert msgb_sms() into simple alias Those will be used in follow-up patches for msgb debug/test helpers. Change-Id: I8d6dd1b1ff3aa98a452711c692ca7dee0449203b --- M include/osmocom/core/msgb.h 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/79/12079/1 diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index 2449151..1bb5fe5 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -130,8 +130,10 @@ #define msgb_l2(m) ((void *)(m->l2h)) /*! obtain L3 header of msgb */ #define msgb_l3(m) ((void *)(m->l3h)) +/*! obtain L4 header of msgb */ +#define msgb_l4(m) ((void *)(m->l4h)) /*! obtain SMS header of msgb */ -#define msgb_sms(m) ((void *)(m->l4h)) +#define msgb_sms(m) msgb_l4(m) /*! determine length of L1 message * \param[in] msgb message buffer @@ -566,6 +568,13 @@ void msgb_set_talloc_ctx(void *ctx) OSMO_DEPRECATED("Use msgb_talloc_ctx_init() instead"); int msgb_printf(struct msgb *msgb, const char *format, ...); +static inline const char *msgb_hexdump_l1(const struct msgb *msg) +{ + if (!msgb_l1(msg) || !(msgb_l1len(msg))) + return "[]"; + return osmo_hexdump((const unsigned char *) msgb_l1(msg), msgb_l1len(msg)); +} + static inline const char *msgb_hexdump_l2(const struct msgb *msg) { if (!msgb_l2(msg) || !(msgb_l2len(msg))) @@ -580,4 +589,11 @@ return osmo_hexdump((const unsigned char*) msgb_l3(msg), msgb_l3len(msg)); } +static inline const char *msgb_hexdump_l4(const struct msgb *msg) +{ + if (!msgb_l4(msg) || !(msgb_l4len(msg))) + return "[]"; + return osmo_hexdump((const unsigned char*) msgb_l4(msg), msgb_l4len(msg)); +} + /*! @} */ -- To view, visit https://gerrit.osmocom.org/12079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8d6dd1b1ff3aa98a452711c692ca7dee0449203b Gerrit-Change-Number: 12079 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:10:22 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 14:10:22 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11976 to look at the new patch set (#5). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 --- M contrib/jenkins.sh 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/76/11976/5 -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 3 14:13:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 3 Dec 2018 14:13:23 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?disable-mgcp-transcoding,--enable?= =?UTF-8?Q?-smpp,osmocom-master-debian9_#3320?= In-Reply-To: <598626546.975.1543817843596.JavaMail.jenkins@jenkins.osmocom.org> References: <598626546.975.1543817843596.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <326726621.985.1543846403503.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:13:53 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 3 Dec 2018 14:13:53 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 14:13:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 3 14:15:54 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 3 Dec 2018 14:15:54 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?enable-mgcp-transcoding,--enable-?= =?UTF-8?Q?smpp,osmocom-master-debian9_#3320?= In-Reply-To: <1347965270.976.1543817845522.JavaMail.jenkins@jenkins.osmocom.org> References: <1347965270.976.1543817845522.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1268946388.986.1543846554810.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:16:06 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 14:16:06 +0000 Subject: Change in osmo-ggsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12063 to look at the new patch set (#2). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters (--publish and all env vars) on top of jenkins.sh. Related: OS#3385 Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b --- M contrib/jenkins.sh 1 file changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/63/12063/2 -- To view, visit https://gerrit.osmocom.org/12063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b Gerrit-Change-Number: 12063 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:17:54 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 14:17:54 +0000 Subject: Change in libosmo-sccp[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12064 to look at the new patch set (#2). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 --- M contrib/jenkins.sh 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/12064/2 -- To view, visit https://gerrit.osmocom.org/12064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 Gerrit-Change-Number: 12064 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:19:10 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 14:19:10 +0000 Subject: Change in osmo-bsc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11972 to look at the new patch set (#3). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 --- M contrib/jenkins.sh 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/72/11972/3 -- To view, visit https://gerrit.osmocom.org/11972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 Gerrit-Change-Number: 11972 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:21:02 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 3 Dec 2018 14:21:02 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 14 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 14:21:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:22:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 3 Dec 2018 14:22:20 +0000 Subject: Change in libosmocore[master]: LCLS: update osmo_lcls struct In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12019 ) Change subject: LCLS: update osmo_lcls struct ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 Gerrit-Change-Number: 12019 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 14:22:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:36:48 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 3 Dec 2018 14:36:48 +0000 Subject: Change in libosmocore[master]: Add msgb_tl_put() helper Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12080 Change subject: Add msgb_tl_put() helper ...................................................................... Add msgb_tl_put() helper When adding complex TLV structures where length of V is not known in advance it's handy to be able to simply add Tag and save the pointer to the Length field so it can be updated once entire Value is added and its length is known. Change-Id: I8dc1e4880352833a0a49c1dd0d7cb4148ac43aff --- M include/osmocom/gsm/tlv.h 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/80/12080/1 diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index 1ab964a..51bedd6 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -324,6 +324,18 @@ return v_put(buf, val); } +/*! put (append) a TL fields to a \ref msgb + * \returns pointer to the length field so it can be updated after adding new information under specified tag */ +static inline uint8_t *msgb_tl_put(struct msgb *msg, uint8_t tag) +{ + uint8_t *len = msgb_v_put(msg, tag); + + /* reserve space for length, len points to this reserved space already */ + msgb_v_put(msg, 0); + + return len; +} + /*! put (append) a TV16 field to a \ref msgb * \returns pointer to first byte after newly-put information */ static inline uint8_t *msgb_tv16_put(struct msgb *msg, uint8_t tag, uint16_t val) -- To view, visit https://gerrit.osmocom.org/12080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8dc1e4880352833a0a49c1dd0d7cb4148ac43aff Gerrit-Change-Number: 12080 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:40:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 14:40:29 +0000 Subject: Change in osmocom-bb[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11998 ) Change subject: doc/manuals: integrate into this repository ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 Gerrit-Change-Number: 11998 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 03 Dec 2018 14:40:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:41:48 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 14:41:48 +0000 Subject: Change in libosmocore[master]: Update msgb Lx helpers In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12079 ) Change subject: Update msgb Lx helpers ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d6dd1b1ff3aa98a452711c692ca7dee0449203b Gerrit-Change-Number: 12079 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 14:41:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:42:06 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 3 Dec 2018 14:42:06 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 14:42:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:42:09 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 3 Dec 2018 14:42:09 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass2() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass2() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 19 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 14:42:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:46:07 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 14:46:07 +0000 Subject: Change in osmo-msc[master]: contrib/jenkins.sh: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12081 Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 --- M contrib/jenkins.sh 1 file changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/81/12081/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 8b8b6e7..321405a 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,13 @@ #!/usr/bin/env bash # jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * IU: configure 3G support (values: --enable-iu, --disable-iu) +# * WITH_MANUALS: build the manual PDFs when set to "True" +# +# usage: jenkins.sh [--publish] +# --publish: upload the manuals after building (no effect if WITH_MANUALS is not "True") +# if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -9,6 +17,7 @@ set -ex +publish="$1" base="$PWD" deps="$base/deps" inst="$deps/install" @@ -24,6 +33,7 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif @@ -41,6 +51,13 @@ enable_werror="--enable-werror" fi +# Additional configure options and depends +CONFIG="" +if [ "$with_manuals" = "True" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi + set +x echo echo @@ -51,7 +68,7 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize $enable_werror --enable-smpp $IU --enable-external-tests +./configure --enable-sanitize $enable_werror --enable-smpp $IU --enable-external-tests $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh @@ -60,4 +77,8 @@ $MAKE distcheck \ || cat-testlogs.sh +if [ "$with_manuals" = "True" ] && [ "$publish" = "--publish" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 Gerrit-Change-Number: 12081 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:48:40 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 3 Dec 2018 14:48:40 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Patch Set 5: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12017/5/src/msgb.c File src/msgb.c: https://gerrit.osmocom.org/#/c/12017/5/src/msgb.c at 198 PS5, Line 198: printf I think we should avoid using printf() in libosmocore. Other parts of this unit are using 'LOGP(DLGLOBAL, ...)'. -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 14:48:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:49:00 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 14:49:00 +0000 Subject: Change in osmo-sgsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12066 to look at the new patch set (#2). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters (--publish and all env vars) on top of jenkins.sh. Related: OS#3385 Change-Id: Ic45322c809f9f65d0fd24b828dab0cd929fa6267 --- M contrib/jenkins.sh 1 file changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/66/12066/2 -- To view, visit https://gerrit.osmocom.org/12066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic45322c809f9f65d0fd24b828dab0cd929fa6267 Gerrit-Change-Number: 12066 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:49:43 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 14:49:43 +0000 Subject: Change in osmo-msc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12081 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters (--publish and all env vars) on top of jenkins.sh. Related: OS#3385 Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 --- M contrib/jenkins.sh 1 file changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/81/12081/2 -- To view, visit https://gerrit.osmocom.org/12081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 Gerrit-Change-Number: 12081 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:49:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 3 Dec 2018 14:49:44 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 7: (5 comments) https://gerrit.osmocom.org/#/c/11898/7/sql/hlr_index.sql File sql/hlr_index.sql: https://gerrit.osmocom.org/#/c/11898/7/sql/hlr_index.sql at 3 PS7, Line 3: CREATE UNIQUE INDEX idx_subscr_imsi ON subscriber (imsi); > we're now only using the hlr. [?] It is still necessary. Otherwise we get the following error when osmo-hlr is started without an existing database file: 20181129131330319 DLGLOBAL NOTICE Available via telnet 127.0.0.1 4258 (telnet_interface.c:104) 20181129131330323 DMAIN NOTICE hlr starting (hlr.c:639) 20181129131330323 DDB NOTICE using database: hlr.db (db.c:299) 20181129131330327 DDB NOTICE Missing database tables detected; Bootstrapping database 'hlr.db' (db.c:347) 20181129131330331 DDB ERROR (1) index idx_subscr_imsi already exists (db.c:79) 20181129131330331 DDB ERROR Unable to prepare SQL statement '-- These statements are executed after database tables have been bootstrapped. -- Statements which create indices can only be prepared once corresponding tables have been created. CREATE UNIQUE INDEX idx_subscr_imsi ON subscriber (imsi) ' (db.c:204) 20181129131330331 DDB ERROR Failed to bootstrap DB: (rc=1) index idx_subscr_imsi already exists (db.c:357) https://gerrit.osmocom.org/#/c/11898/7/src/db.c File src/db.c: https://gerrit.osmocom.org/#/c/11898/7/src/db.c at 243 PS7, Line 243: static bool db_is_bootstrapped_v0(struct db_context *dbc) > this is still kind of a mix between "is_bootstrapped" and "is_correct". [?] I would have thought that yes, indeed, this function will need to be revisted every time tables are added/removed with new schema versions. I don't see how this problem is any different for just one "subscriber" table vs. N tables. But well, since you insist, I'll change it... https://gerrit.osmocom.org/#/c/11898/7/src/db.c at 346 PS7, Line 346: if (!db_is_bootstrapped_v0(dbc)) { > let's break it down: [?] I'll try to apply these suggestions. https://gerrit.osmocom.org/#/c/11898/7/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/11898/7/src/hlr.c at 651 PS7, Line 651: } > (For a unit test, it would be helpful to exit the program right after a db upgrade, so first up I th [?] Can't the unit test simply be a separate program from osmo-hlr? https://gerrit.osmocom.org/#/c/11898/7/src/hlr_db_tool.c File src/hlr_db_tool.c: https://gerrit.osmocom.org/#/c/11898/7/src/hlr_db_tool.c at 64 PS7, Line 64: printf(" -U --upgrade-db Allow HLR database schema upgrades.\n"); > (the variables and other options are all called 'db-foo', this is the only one called 'foo-db') Thanks for spotting that. I'll fix it. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 14:49:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:51:49 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 3 Dec 2018 14:51:49 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/11898/7/sql/hlr_index.sql File sql/hlr_index.sql: https://gerrit.osmocom.org/#/c/11898/7/sql/hlr_index.sql at 3 PS7, Line 3: CREATE UNIQUE INDEX idx_subscr_imsi ON subscriber (imsi); > It is still necessary. [?] Sorry, I was wrong. My test was flawed. The files can indeed be merged back together. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 14:51:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:52:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 14:52:41 +0000 Subject: Change in osmo-msc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12081 to look at the new patch set (#3). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters (--publish and all env vars) on top of jenkins.sh. Related: OS#3385 Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 --- M contrib/jenkins.sh 1 file changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/81/12081/3 -- To view, visit https://gerrit.osmocom.org/12081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 Gerrit-Change-Number: 12081 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:52:47 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 3 Dec 2018 14:52:47 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Patch Set 5: > I think we should avoid using printf() in libosmocore In general I'd agree but those are "test helpers" (see commit description) which are intended to be used in tests/ code where printf() usage is common. For use outside of tests/ there're variants which don't print anything implemented via #define wrappers. -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 14:52:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 14:58:56 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 14:58:56 +0000 Subject: Change in osmo-trx[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12075 to look at the new patch set (#2). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters (--publish and all env vars) on top of jenkins.sh. Related: OS#3385 Change-Id: I54fdd18e405b2c84762ea06d91359867ceec8184 --- M contrib/jenkins.sh 1 file changed, 24 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/75/12075/2 -- To view, visit https://gerrit.osmocom.org/12075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I54fdd18e405b2c84762ea06d91359867ceec8184 Gerrit-Change-Number: 12075 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 15:01:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 15:01:40 +0000 Subject: Change in osmo-sip-connector[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12074 to look at the new patch set (#3). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 --- M contrib/jenkins.sh 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/74/12074/3 -- To view, visit https://gerrit.osmocom.org/12074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 Gerrit-Change-Number: 12074 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 15:12:26 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 3 Dec 2018 15:12:26 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11898 to look at the new patch set (#8). Change subject: add database schema versioning to the HLR database ...................................................................... add database schema versioning to the HLR database Make use of pragma user_version to store our database schema version. The present schema is now identitifed as 'version 0', which is also the default value for databases on which we never ran the statement 'pragma user_version' before. Only bootstrap the database if it hasn't been bootstrapped yet. Previously, bootstrap SQL statements ran every time osmo-hlr opened the database, and any errors were being ignored in SQL. Instead, we now first run a query which checks whether tables already exist, and only create them if necessary. This change will allow future schema updates to work properly. Prepare for future schema upgrades by adding a new command-line option which enables upgrades. This option defaults to 'false' in order to avoid accidental upgrades. Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Related: OS#2838 --- M sql/hlr.sql M src/Makefile.am M src/db.c M src/db.h R src/db_sql2c.sed M src/hlr.c M src/hlr_db_tool.c M tests/db/db_test.c 8 files changed, 133 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/98/11898/8 -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 8 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 15:13:29 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 15:13:29 +0000 Subject: Change in osmo-bts[master]: contrib/jenkins_*.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12076 to look at the new patch set (#2). Change subject: contrib/jenkins_*.sh: build and publish manuals ...................................................................... contrib/jenkins_*.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins_bts_model.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters (--publish and all env vars) on top of jenkins_bts_model.sh. Change the top description line to look like all the other contrib/jenkins.sh files (from other repositories), so it is clear that this is the entry point of Jenkins (and not the other contrib/jenkins*.sh scripts). Related: OS#3385 Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860 --- M contrib/jenkins_bts_model.sh M contrib/jenkins_common.sh 2 files changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/76/12076/2 -- To view, visit https://gerrit.osmocom.org/12076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860 Gerrit-Change-Number: 12076 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 15:35:29 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 15:35:29 +0000 Subject: Change in osmo-mgw[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12065 to look at the new patch set (#2). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: I24179b21ce4ff182649243e286c87c824b889454 --- M contrib/jenkins.sh 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/12065/2 -- To view, visit https://gerrit.osmocom.org/12065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I24179b21ce4ff182649243e286c87c824b889454 Gerrit-Change-Number: 12065 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 15:35:30 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 15:35:30 +0000 Subject: Change in osmo-mgw[master]: jenkins.sh: remove leftover MGCP env variable Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12082 Change subject: jenkins.sh: remove leftover MGCP env variable ...................................................................... jenkins.sh: remove leftover MGCP env variable Jenkins currently runs the build twice, once with MGCP="--enable-mgcp-transcoding" and once with MGCP="--disable-mgcp-transcoding" . The configure.ac does not have this parameter, so let's remove the confusing variable. This is in preparation for describing all environment variables used in jenkins.sh (follow up commit). Change-Id: I6223afef0f34d90170a691d7d5b1d9542c34c6b0 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/82/12082/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 222bd8f..b0ef7de 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -37,12 +37,12 @@ cd "$base" autoreconf --install --force -./configure $MGCP --enable-vty-tests --enable-external-tests --enable-werror +./configure --enable-vty-tests --enable-external-tests --enable-werror $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="$MGCP --enable-vty-tests --enable-external-tests" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests" \ $MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/12082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6223afef0f34d90170a691d7d5b1d9542c34c6b0 Gerrit-Change-Number: 12082 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 15:49:51 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 15:49:51 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: WITH_MANUALS In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12045 to look at the new patch set (#5). Change subject: gerrit-verifications/master-builds: WITH_MANUALS ...................................................................... gerrit-verifications/master-builds: WITH_MANUALS Add a new "WITH_MANUALS" axis to all jobs generated by gerrit-verifications.yml and master-builds.yml, which already have at least one axis. Adjust the combination filters, so the manuals are generated (and published) only once. The contrib/jenkins.sh scripts will be adjusted to append --enable-manuals to the configure options, when WITH_MANUALS is set. For all jobs that do not have any axes, we can always append this flag. Two different methods of passing through the configure flags are used in both yml files already. One is creating a "WITH_VAR" variable with True and False as arguments. The other is creating a "VAR" variable with "--enable-foo" and "--disable-foo" as values. I decided to use the "WITH_VAR" approach, so we could use it to activate multiple configure options at once: --enable-manuals and --enable-man when the UNIX man pages feature gets implemented (OS#3386). Related: OS#3385 Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 80 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/12045/5 -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 15:49:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 15:49:52 +0000 Subject: Change in osmo-ci[master]: osmo-mgw: don't try to build with transcoding Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12083 Change subject: osmo-mgw: don't try to build with transcoding ...................................................................... osmo-mgw: don't try to build with transcoding Do not build osmo-mgw twice anymore (once with "--enable-mgcp-transcoding" and once with "--disable-mgcp-transcoding"). configure.ac does not know these options. Change-Id: I080cd331caec31c53a43090e6c19d23e31abdec6 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/83/12083/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index e70d28e..edfcf99 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -135,8 +135,6 @@ - osmo-iuh - osmo-mgw: - a1_name: MGCP - a1: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding] concurrent: true cmd: > # keep first line with less indent to preserve newlines @@ -144,7 +142,6 @@ -e HOME=/build \ -e MAKE=make \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e MGCP="$MGCP" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index d485a5f..7572a20 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -222,8 +222,6 @@ master-osmo-sgsn - osmo-mgw: - a1_name: MGCP - a1: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding] concurrent: true cmd: > # keep first line with less indent to preserve newlines @@ -231,7 +229,6 @@ -e HOME=/build \ -e MAKE=make \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e MGCP="$MGCP" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -- To view, visit https://gerrit.osmocom.org/12083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I080cd331caec31c53a43090e6c19d23e31abdec6 Gerrit-Change-Number: 12083 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 15:52:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 15:52:26 +0000 Subject: Change in osmo-mgw[master]: jenkins.sh: remove leftover MGCP env variable In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12082 to look at the new patch set (#2). Change subject: jenkins.sh: remove leftover MGCP env variable ...................................................................... jenkins.sh: remove leftover MGCP env variable Jenkins currently runs the build twice, once with MGCP="--enable-mgcp-transcoding" and once with MGCP="--disable-mgcp-transcoding". The configure.ac does not have this parameter, so let's remove the confusing variable. This is in preparation for describing all environment variables used in jenkins.sh (follow up commit). Change-Id: I6223afef0f34d90170a691d7d5b1d9542c34c6b0 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/82/12082/2 -- To view, visit https://gerrit.osmocom.org/12082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6223afef0f34d90170a691d7d5b1d9542c34c6b0 Gerrit-Change-Number: 12082 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 15:52:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 15:52:26 +0000 Subject: Change in osmo-mgw[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12065 to look at the new patch set (#3). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: I24179b21ce4ff182649243e286c87c824b889454 --- M contrib/jenkins.sh 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/12065/3 -- To view, visit https://gerrit.osmocom.org/12065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I24179b21ce4ff182649243e286c87c824b889454 Gerrit-Change-Number: 12065 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 15:54:04 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 15:54:04 +0000 Subject: Change in osmo-mgw[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12065 to look at the new patch set (#4). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: I24179b21ce4ff182649243e286c87c824b889454 --- M contrib/jenkins.sh 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/12065/4 -- To view, visit https://gerrit.osmocom.org/12065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I24179b21ce4ff182649243e286c87c824b889454 Gerrit-Change-Number: 12065 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 16:08:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 16:08:37 +0000 Subject: Change in osmo-ci[master]: master-builds/gerrit: remove redundant GTP="$GTP" Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12084 Change subject: master-builds/gerrit: remove redundant GTP="$GTP" ...................................................................... master-builds/gerrit: remove redundant GTP="$GTP" Variables for axes are already exported as environment variables. Change 'GTP="$GTP" ./contrib/jenkins.sh' to './contrib/jenkins.sh' to avoid confusion when introducing other variables. Change-Id: I9238da3dd3c4461f82dc7c792f886177399be3dc --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/84/12084/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index e70d28e..14ff565 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -89,7 +89,7 @@ - openggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: GTP="$GTP" ./contrib/jenkins.sh + cmd: ./contrib/jenkins.sh - osmo-bsc: concurrent: true @@ -126,7 +126,7 @@ - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: GTP="$GTP" ./contrib/jenkins.sh + cmd: ./contrib/jenkins.sh - osmo-gsm-manuals diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index d485a5f..18bb1a0 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -197,7 +197,7 @@ - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: GTP="$GTP" ./contrib/jenkins.sh --publish + cmd: ./contrib/jenkins.sh --publish trigger: master-osmo-sgsn - osmo-gmr: -- To view, visit https://gerrit.osmocom.org/12084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9238da3dd3c4461f82dc7c792f886177399be3dc Gerrit-Change-Number: 12084 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 16:11:03 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 16:11:03 +0000 Subject: Change in osmo-ci[master]: master-builds/gerrit: remove redundant GTP="$GTP" In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12084 ) Change subject: master-builds/gerrit: remove redundant GTP="$GTP" ...................................................................... Patch Set 1: This patch resulted from the discussion here: https://gerrit.osmocom.org/#/c/osmo-ci/+/12045/ I gave an example of why this is redundant, repeating it below. --- I'm sure that it is redundant. See the osmo-trx section from master-builds.yml for example. Currently in master, we have this code: - osmo-trx: a1_name: INSTR # ARM variants temporarily disabled due to issue OS#3061 # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] concurrent: true cmd: ./contrib/jenkins.sh --publish So there's no INSTR="$INSTR" statement in front of jenkins.sh. The jenkins.sh script of osmo-trx.git has the following line: ./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR And executed by jenkins, it it shows that INSTR holds --with-sse: + ./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms --with-sse https://jenkins.osmocom.org/jenkins/view/master/job/master-osmo-trx/710/INSTR=--with-sse,a2=default,a3=default,label=osmocom-master-debian9/console -- To view, visit https://gerrit.osmocom.org/12084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9238da3dd3c4461f82dc7c792f886177399be3dc Gerrit-Change-Number: 12084 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 03 Dec 2018 16:11:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 16:11:50 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 3 Dec 2018 16:11:50 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: WITH_MANUALS In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12045 ) Change subject: gerrit-verifications/master-builds: WITH_MANUALS ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12045/2/jobs/master-builds.yml File jobs/master-builds.yml: https://gerrit.osmocom.org/#/c/12045/2/jobs/master-builds.yml at 206 PS2, Line 206: cmd: GTP="$GTP" ./contrib/jenkins.sh --publish > Quick recap of what we discussed in private chat about this, as I was about to leave on Friday: [?] patch: https://gerrit.osmocom.org/#/c/osmo-ci/+/12084/ -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 03 Dec 2018 16:11:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 16:11:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 16:11:57 +0000 Subject: Change in libosmocore[master]: Update msgb Lx helpers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12079 ) Change subject: Update msgb Lx helpers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d6dd1b1ff3aa98a452711c692ca7dee0449203b Gerrit-Change-Number: 12079 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 16:11:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 16:11:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 16:11:59 +0000 Subject: Change in libosmocore[master]: Update msgb Lx helpers In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12079 ) Change subject: Update msgb Lx helpers ...................................................................... Update msgb Lx helpers * add missing L1 and L4 hexdump * add msgb_l4() for consistency and convert msgb_sms() into simple alias Those will be used in follow-up patches for msgb debug/test helpers. Change-Id: I8d6dd1b1ff3aa98a452711c692ca7dee0449203b --- M include/osmocom/core/msgb.h 1 file changed, 17 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index 2449151..1bb5fe5 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -130,8 +130,10 @@ #define msgb_l2(m) ((void *)(m->l2h)) /*! obtain L3 header of msgb */ #define msgb_l3(m) ((void *)(m->l3h)) +/*! obtain L4 header of msgb */ +#define msgb_l4(m) ((void *)(m->l4h)) /*! obtain SMS header of msgb */ -#define msgb_sms(m) ((void *)(m->l4h)) +#define msgb_sms(m) msgb_l4(m) /*! determine length of L1 message * \param[in] msgb message buffer @@ -566,6 +568,13 @@ void msgb_set_talloc_ctx(void *ctx) OSMO_DEPRECATED("Use msgb_talloc_ctx_init() instead"); int msgb_printf(struct msgb *msgb, const char *format, ...); +static inline const char *msgb_hexdump_l1(const struct msgb *msg) +{ + if (!msgb_l1(msg) || !(msgb_l1len(msg))) + return "[]"; + return osmo_hexdump((const unsigned char *) msgb_l1(msg), msgb_l1len(msg)); +} + static inline const char *msgb_hexdump_l2(const struct msgb *msg) { if (!msgb_l2(msg) || !(msgb_l2len(msg))) @@ -580,4 +589,11 @@ return osmo_hexdump((const unsigned char*) msgb_l3(msg), msgb_l3len(msg)); } +static inline const char *msgb_hexdump_l4(const struct msgb *msg) +{ + if (!msgb_l4(msg) || !(msgb_l4len(msg))) + return "[]"; + return osmo_hexdump((const unsigned char*) msgb_l4(msg), msgb_l4len(msg)); +} + /*! @} */ -- To view, visit https://gerrit.osmocom.org/12079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8d6dd1b1ff3aa98a452711c692ca7dee0449203b Gerrit-Change-Number: 12079 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 16:13:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 16:13:18 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Patch Set 5: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12017/5/src/msgb.c File src/msgb.c: https://gerrit.osmocom.org/#/c/12017/5/src/msgb.c at 176 PS5, Line 176: ghb what is ghb? https://gerrit.osmocom.org/#/c/12017/5/src/msgb.c at 198 PS5, Line 198: printf > I think we should avoid using printf() in libosmocore. [?] ACK -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 16:13:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 3 16:14:51 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 3 Dec 2018 16:14:51 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-iuh_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2578?= In-Reply-To: <1251207335.984.1543846066295.JavaMail.jenkins@jenkins.osmocom.org> References: <1251207335.984.1543846066295.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1166964313.988.1543853691849.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Dec 3 16:16:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 16:16:41 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Patch Set 14: (3 comments) https://gerrit.osmocom.org/#/c/11827/14/include/osmocom/gsm/gsm29205.h File include/osmocom/gsm/gsm29205.h: https://gerrit.osmocom.org/#/c/11827/14/include/osmocom/gsm/gsm29205.h at 33 PS14, Line 33: struct gsm29205_gcr { the name doesn't really indicate whether it's a structure as used in the spec (encoded data) or some parsed representation. using _parsed as suffix would make it clear. Also, if things are osmo_ prefixed and not gsmXXXX prefixed, there's less likelihood somebody thinks this represents encoded "on the wire" data. https://gerrit.osmocom.org/#/c/11827/14/include/osmocom/gsm/gsm29205.h at 40 PS14, Line 40: uint8_t gsm29205_enc_gcr(struct msgb *msg, const struct gsm29205_gcr *g); use osmo_ prefix for all new symbols introduced in osmocom libraries. the struct above should also be prefixed. https://gerrit.osmocom.org/#/c/11827/14/tests/gsm29205/gsm29205_test.c File tests/gsm29205/gsm29205_test.c: https://gerrit.osmocom.org/#/c/11827/14/tests/gsm29205/gsm29205_test.c at 2 PS14, Line 2: S sysmocom, not Sysmocom -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 14 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 16:16:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 16:17:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 16:17:44 +0000 Subject: Change in libosmocore[master]: LCLS: update osmo_lcls struct In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12019 ) Change subject: LCLS: update osmo_lcls struct ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 Gerrit-Change-Number: 12019 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 16:17:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 16:18:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 3 Dec 2018 16:18:33 +0000 Subject: Change in libosmocore[master]: Add msgb_tl_put() helper In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12080 ) Change subject: Add msgb_tl_put() helper ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8dc1e4880352833a0a49c1dd0d7cb4148ac43aff Gerrit-Change-Number: 12080 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 03 Dec 2018 16:18:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 16:54:00 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 3 Dec 2018 16:54:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11897 to look at the new patch set (#5). Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... MSC_Test: Test what happens when Paging for SMS is unanswered Trigger sending of an SM, but ignore any paging requests from the MSC, make sure that the MSC is not paging infinitly Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Depends: osmo-msc I88a51568b43a1414e72ce74d7ba2e9406cf07f9f Related: OS#3704 --- M msc/MSC_Tests.ttcn 1 file changed, 67 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/11897/5 -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 16:59:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 3 Dec 2018 16:59:17 +0000 Subject: Change in osmo-msc[master]: sms_sueue: count GSM_PAGING_BUSY and GSM_PAGING_EXPIRED In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/11899 ) Change subject: sms_sueue: count GSM_PAGING_BUSY and GSM_PAGING_EXPIRED ...................................................................... Abandoned The current master now shows the correct behavior, presumably I4a07ece80d8dd40b23da6bb1ffc9d3d745b54092 fixed the problem. -- To view, visit https://gerrit.osmocom.org/11899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I88a51568b43a1414e72ce74d7ba2e9406cf07f9f Gerrit-Change-Number: 11899 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-CC: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 17:03:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 17:03:51 +0000 Subject: Change in osmo-trx[master]: SigProcLib: Improve Vector buffer allocation mess Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12085 Change subject: SigProcLib: Improve Vector buffer allocation mess ...................................................................... SigProcLib: Improve Vector buffer allocation mess Original issue: In order to use SSE instructions, 16-byte aligned memory chunk are needed, and C++ version < C++11 doesn't provide for a native native new/delete store. For that reason, memalign() must be used in the implementation of convolve_h_alloc() for some buffers. On the other side, The C++ code relies on C++ "new T[]" operator to allocate a chunk of memory containing an array of class instances. As classes are complex types, they cannot be allocated through C structures (calling malloc). Experimentally can be seen too that it's unreliable and the process will crash during startup if malloc() is used and then a Complex<> deferred from it. Previous implementation allowed for use of convolve_h_alloc or new[] based on how the (signal)Vector is called, because then the buffer is not going to be managed internally. But that's unreliable since resize() calling resize() on it could use "delete" operator on a malloc'ed buffer, and end up having a new new[] allocated buffer. It was also found that some of the callers were actually leaking memory through ASan (because the buffer is not managed by the Vector instance). IMHO best option would be to rewrite all this code using C structures and malloc/free exclusively, since it would make all this cod eeasier to maintain. But for now, let's extend the Vector class to allow specifying an external alloc/free function and let the Vector instance take care of the ownership of the buffer in all scenarios. Change-Id: Ie484a4762a7f77fe1b105188ea03a6f025730b82 --- M CommonLibs/Vector.h M Transceiver52M/arch/common/convolve.h M Transceiver52M/arch/common/convolve_base.c M Transceiver52M/sigProcLib.cpp M Transceiver52M/signalVector.cpp M Transceiver52M/signalVector.h 6 files changed, 52 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/85/12085/1 diff --git a/CommonLibs/Vector.h b/CommonLibs/Vector.h index 9119683..b14887a 100644 --- a/CommonLibs/Vector.h +++ b/CommonLibs/Vector.h @@ -32,11 +32,14 @@ #include #include #include +#include + // We cant use Logger.h in this file... extern int gVectorDebug; #define BVDEBUG(msg) if (gVectorDebug) {std::cout << msg;} - +typedef void (*vector_free_func)(void* wData); +typedef void *(*vector_alloc_func)(size_t newSize); /** A simplified Vector template with aliases. @@ -60,6 +63,8 @@ T* mData; ///< allocated data block, if any T* mStart; ///< start of useful data T* mEnd; ///< end of useful data + 1 + vector_alloc_func mAllocFunc; ///< function used to alloc new mData during resize. + vector_free_func mFreeFunc; ///< function used to free mData. public: @@ -85,9 +90,19 @@ /** Change the size of the Vector, discarding content. */ void resize(size_t newSize) { - if (mData!=NULL) delete[] mData; + if (mData!=NULL) { + if (mFreeFunc) + mFreeFunc(mData); + else + delete[] mData; + } if (newSize==0) mData=NULL; - else mData = new T[newSize]; + else { + if (mAllocFunc) + mData = (T*) mAllocFunc(newSize); + else + mData = new T[newSize]; + } mStart = mData; mEnd = mStart + newSize; } @@ -116,29 +131,31 @@ //@{ /** Build an empty Vector of a given size. */ - Vector(size_t wSize=0):mData(NULL) { resize(wSize); } + Vector(size_t wSize=0, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL) + :mData(NULL), mAllocFunc(wAllocFunc), mFreeFunc(wFreeFunc) + { resize(wSize); } /** Build a Vector by moving another. */ Vector(Vector&& other) - :mData(other.mData),mStart(other.mStart),mEnd(other.mEnd) + :mData(other.mData),mStart(other.mStart),mEnd(other.mEnd), mAllocFunc(other.mAllocFunc), mFreeFunc(other.mFreeFunc) { other.mData=NULL; } /** Build a Vector by copying another. */ - Vector(const Vector& other):mData(NULL) { clone(other); } + Vector(const Vector& other):mData(NULL), mAllocFunc(other.mAllocFunc), mFreeFunc(other.mFreeFunc) { clone(other); } /** Build a Vector with explicit values. */ - Vector(T* wData, T* wStart, T* wEnd) - :mData(wData),mStart(wStart),mEnd(wEnd) + Vector(T* wData, T* wStart, T* wEnd, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL) + :mData(wData),mStart(wStart),mEnd(wEnd), mAllocFunc(wAllocFunc), mFreeFunc(wFreeFunc) { } /** Build a vector from an existing block, NOT to be deleted upon destruction. */ - Vector(T* wStart, size_t span) - :mData(NULL),mStart(wStart),mEnd(wStart+span) + Vector(T* wStart, size_t span, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL) + :mData(NULL),mStart(wStart),mEnd(wStart+span),mAllocFunc(wAllocFunc), mFreeFunc(wFreeFunc) { } /** Build a Vector by concatenation. */ - Vector(const Vector& other1, const Vector& other2) - :mData(NULL) + Vector(const Vector& other1, const Vector& other2, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL) + :mData(NULL), mAllocFunc(wAllocFunc), mFreeFunc(wFreeFunc) { resize(other1.size()+other2.size()); memcpy(mStart, other1.mStart, other1.bytes()); @@ -162,6 +179,8 @@ mData=other.mData; mStart=other.mStart; mEnd=other.mEnd; + mAllocFunc =other.mAllocFunc; + mFreeFunc =other.mFreeFunc; other.mData=NULL; } diff --git a/Transceiver52M/arch/common/convolve.h b/Transceiver52M/arch/common/convolve.h index 43db577..095b04c 100644 --- a/Transceiver52M/arch/common/convolve.h +++ b/Transceiver52M/arch/common/convolve.h @@ -1,7 +1,7 @@ #ifndef _CONVOLVE_H_ #define _CONVOLVE_H_ -void *convolve_h_alloc(int num); +void *convolve_h_alloc(size_t num); int convolve_real(const float *x, int x_len, const float *h, int h_len, diff --git a/Transceiver52M/arch/common/convolve_base.c b/Transceiver52M/arch/common/convolve_base.c index 71453a1..2eb7124 100644 --- a/Transceiver52M/arch/common/convolve_base.c +++ b/Transceiver52M/arch/common/convolve_base.c @@ -146,7 +146,7 @@ } /* Aligned filter tap allocation */ -void *convolve_h_alloc(int len) +void *convolve_h_alloc(size_t len) { #ifdef HAVE_SSE3 return memalign(16, len * 2 * sizeof(float)); diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index 28c4ded..f720828 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -84,14 +84,13 @@ * perform 16-byte memory alignment required by many SSE instructions. */ struct CorrelationSequence { - CorrelationSequence() : sequence(NULL), buffer(NULL) + CorrelationSequence() : sequence(NULL) { } ~CorrelationSequence() { delete sequence; - free(buffer); } signalVector *sequence; @@ -106,8 +105,7 @@ * for SSE instructions. */ struct PulseSequence { - PulseSequence() : c0(NULL), c1(NULL), c0_inv(NULL), empty(NULL), - c0_buffer(NULL), c1_buffer(NULL), c0_inv_buffer(NULL) + PulseSequence() : c0(NULL), c1(NULL), c0_inv(NULL), empty(NULL) { } @@ -117,17 +115,12 @@ delete c1; delete c0_inv; delete empty; - free(c0_buffer); - free(c1_buffer); } signalVector *c0; signalVector *c1; signalVector *c0_inv; signalVector *empty; - void *c0_buffer; - void *c1_buffer; - void *c0_inv_buffer; }; static CorrelationSequence *gMidambles[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; @@ -340,7 +333,7 @@ if (y && (len > y->size())) return NULL; if (!y) { - y = new signalVector(len); + y = new signalVector(len, convolve_h_alloc, free); alloc = true; } @@ -403,8 +396,7 @@ if (!pulse) return false; - pulse->c0_inv_buffer = convolve_h_alloc(5); - pulse->c0_inv = new signalVector((complex *) pulse->c0_inv_buffer, 0, 5); + pulse->c0_inv = new signalVector((complex *) convolve_h_alloc(5), 0, 5, convolve_h_alloc, free); pulse->c0_inv->isReal(true); pulse->c0_inv->setAligned(false); @@ -433,9 +425,7 @@ return false; } - pulse->c1_buffer = convolve_h_alloc(len); - pulse->c1 = new signalVector((complex *) - pulse->c1_buffer, 0, len); + pulse->c1 = new signalVector((complex *) convolve_h_alloc(len), 0, len, convolve_h_alloc, free); pulse->c1->isReal(true); /* Enable alignment for SSE usage */ @@ -489,8 +479,7 @@ len = 4; } - pulse->c0_buffer = convolve_h_alloc(len); - pulse->c0 = new signalVector((complex *) pulse->c0_buffer, 0, len); + pulse->c0 = new signalVector((complex *) convolve_h_alloc(len), 0, len, convolve_h_alloc, free); pulse->c0->isReal(true); /* Enable alingnment for SSE usage */ @@ -1019,7 +1008,7 @@ for (int i = 0; i < DELAYFILTS; i++) { data = (complex *) convolve_h_alloc(h_len); - h = new signalVector(data, 0, h_len); + h = new signalVector(data, 0, h_len, convolve_h_alloc, free); h->setAligned(true); h->isReal(true); @@ -1263,7 +1252,7 @@ /* For SSE alignment, reallocate the midamble sequence on 16-byte boundary */ data = (complex *) convolve_h_alloc(midMidamble->size()); - _midMidamble = new signalVector(data, 0, midMidamble->size()); + _midMidamble = new signalVector(data, 0, midMidamble->size(), convolve_h_alloc, free); _midMidamble->setAligned(true); midMidamble->copyTo(*_midMidamble); @@ -1274,7 +1263,6 @@ } gMidambles[tsc] = new CorrelationSequence; - gMidambles[tsc]->buffer = data; gMidambles[tsc]->sequence = _midMidamble; gMidambles[tsc]->gain = peakDetect(*autocorr, &toa, NULL); @@ -1319,13 +1307,12 @@ conjugateVector(*midamble); data = (complex *) convolve_h_alloc(midamble->size()); - _midamble = new signalVector(data, 0, midamble->size()); + _midamble = new signalVector(data, 0, midamble->size(), convolve_h_alloc, free); _midamble->setAligned(true); midamble->copyTo(*_midamble); /* Channel gain is an empirically measured value */ seq = new CorrelationSequence; - seq->buffer = data; seq->sequence = _midamble; seq->gain = Complex(-19.6432, 19.5006) / 1.18; seq->toa = 0; @@ -1360,7 +1347,7 @@ /* For SSE alignment, reallocate the midamble sequence on 16-byte boundary */ data = (complex *) convolve_h_alloc(seq1->size()); - _seq1 = new signalVector(data, 0, seq1->size()); + _seq1 = new signalVector(data, 0, seq1->size(), convolve_h_alloc, free); _seq1->setAligned(true); seq1->copyTo(*_seq1); @@ -1372,7 +1359,6 @@ *seq = new CorrelationSequence; (*seq)->sequence = _seq1; - (*seq)->buffer = data; (*seq)->gain = peakDetect(*autocorr, &toa, NULL); /* For 1 sps only diff --git a/Transceiver52M/signalVector.cpp b/Transceiver52M/signalVector.cpp index fc8157e..710eda5 100644 --- a/Transceiver52M/signalVector.cpp +++ b/Transceiver52M/signalVector.cpp @@ -1,20 +1,20 @@ #include "signalVector.h" -signalVector::signalVector(size_t size) - : Vector(size), +signalVector::signalVector(size_t size, vector_alloc_func wAllocFunc, vector_free_func wFreeFunc) + : Vector(size, wAllocFunc, wFreeFunc), real(false), aligned(false), symmetry(NONE) { } -signalVector::signalVector(size_t size, size_t start) - : Vector(size + start), +signalVector::signalVector(size_t size, size_t start, vector_alloc_func wAllocFunc, vector_free_func wFreeFunc) + : Vector(size + start, wAllocFunc, wFreeFunc), real(false), aligned(false), symmetry(NONE) { mStart = mData + start; } -signalVector::signalVector(complex *data, size_t start, size_t span) - : Vector(NULL, data + start, data + start + span), +signalVector::signalVector(complex *data, size_t start, size_t span, vector_alloc_func wAllocFunc, vector_free_func wFreeFunc) + : Vector(data, data + start, data + start + span, wAllocFunc, wFreeFunc), real(false), aligned(false), symmetry(NONE) { } diff --git a/Transceiver52M/signalVector.h b/Transceiver52M/signalVector.h index 83f141e..fc969e2 100644 --- a/Transceiver52M/signalVector.h +++ b/Transceiver52M/signalVector.h @@ -13,13 +13,13 @@ class signalVector: public Vector { public: /** Default constructor */ - signalVector(size_t size = 0); + signalVector(size_t size = 0, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL); /** Construct with head room */ - signalVector(size_t size, size_t start); + signalVector(size_t size, size_t start, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL); /** Construct from existing buffer data (buffer not managed) */ - signalVector(complex *data, size_t start, size_t span); + signalVector(complex *data, size_t start, size_t span, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL); /** Construct by from existing vector */ signalVector(const signalVector &vector); -- To view, visit https://gerrit.osmocom.org/12085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie484a4762a7f77fe1b105188ea03a6f025730b82 Gerrit-Change-Number: 12085 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 17:10:08 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 3 Dec 2018 17:10:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: First SGs testcases In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#9) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: First SGs testcases ...................................................................... WIP: MSC_Tests: First SGs testcases This extens MSC_Tests.ttcn with the first couple of SGs interface test cases for RESET, LU, DETACH, PAGING and SMS procedures In particular the following testcases are added: - TC_sgsap_reset: isolated reset procedure test - TC_sgsap_lu: isolated location update with TMSI realloc - TC_sgsap_lu_imsi_reject: location update, reject case - TC_sgsap_lu_and_nothing: location update with failed TMSI realloc - TC_sgsap_expl_imsi_det_eps: detach from EPS serveces - TC_sgsap_expl_imsi_det_noneps: detach from non-EPS services - TC_sgsap_paging_rej: isolated paging, reject case - TC_sgsap_paging_subscr_rej, isolated paging, subscr rejects call - TC_sgsap_paging_ue_unr, isolated paging, ue is unreachable - WIP: TC_sgsap_mt_sms, send SMS via VTY through SGs iface Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Related: OS#3645 --- M library/SGsAP_Emulation.ttcn M library/SGsAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.default M msc/MSC_Tests.ttcn M msc/gen_links.sh M msc/regen_makefile.sh 7 files changed, 755 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11488/9 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 9 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 17:26:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Dec 2018 17:26:03 +0000 Subject: Change in libosmocore[master]: Add msgb_tl_put() helper In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12080 ) Change subject: Add msgb_tl_put() helper ...................................................................... Patch Set 1: Code-Review+2 (2 comments) https://gerrit.osmocom.org/#/c/12080/1/include/osmocom/gsm/tlv.h File include/osmocom/gsm/tlv.h: https://gerrit.osmocom.org/#/c/12080/1/include/osmocom/gsm/tlv.h at 329 PS1, Line 329: static inline uint8_t *msgb_tl_put(struct msgb *msg, uint8_t tag) nice! https://gerrit.osmocom.org/#/c/12080/1/include/osmocom/gsm/tlv.h at 334 PS1, Line 334: msgb_v_put(msg, 0); still using 'msgb_v_put' for T and L, I guess more appropriate would be 'msgb_put_u8'. But whatever. -- To view, visit https://gerrit.osmocom.org/12080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8dc1e4880352833a0a49c1dd0d7cb4148ac43aff Gerrit-Change-Number: 12080 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 03 Dec 2018 17:26:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 17:29:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Dec 2018 17:29:34 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass2() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass2() ...................................................................... Patch Set 19: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 19 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 17:29:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 17:38:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 17:38:58 +0000 Subject: Change in osmo-trx[master]: lms: Make sure LMS_Close is called when Device is torn down Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12086 Change subject: lms: Make sure LMS_Close is called when Device is torn down ...................................................................... lms: Make sure LMS_Close is called when Device is torn down This change fixes lots of memory leaks inside libLimeSuite as announced by ASan after exiting the osmo-trx process (throgh CTRL+C for instance). This way also we make sure libLimeSuite can communicate with the HW and close whatever subsystems were enabled during LMS_Open time. Change-Id: I56ffb87079e34aa2d0322fd2ca6429742f9f7640 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/86/12086/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 2ceca0d..144f75d 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -57,6 +57,15 @@ m_last_tx_overruns.resize(chans, 0); } +LMSDevice::~LMSDevice() +{ + LOGC(DDEV, INFO) << "Closing LMS device"; + if (m_lms_dev) { + LMS_Close(m_lms_dev); + m_lms_dev = NULL; + } +} + static void lms_log_callback(int lvl, const char *msg) { /* map lime specific log levels */ @@ -204,6 +213,7 @@ out_close: LOGC(DDEV, ALERT) << "Error in LMS open, closing: " << LMS_GetLastErrorMessage(); LMS_Close(m_lms_dev); + m_lms_dev = NULL; return -1; } diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 6635c13..d1a8813 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -74,6 +74,7 @@ LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths); + ~LMSDevice(); /** Instantiate the LMS */ int open(const std::string &args, int ref, bool swap_channels); -- To view, visit https://gerrit.osmocom.org/12086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I56ffb87079e34aa2d0322fd2ca6429742f9f7640 Gerrit-Change-Number: 12086 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 17:38:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 17:38:59 +0000 Subject: Change in osmo-trx[master]: osmo-trx: Change some lines to use libosmocore logging instead of cout Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12087 Change subject: osmo-trx: Change some lines to use libosmocore logging instead of cout ...................................................................... osmo-trx: Change some lines to use libosmocore logging instead of cout Change-Id: I66e3c37014ba12cd002e5b678bc0a6026f5dfc7e --- M Transceiver52M/osmo-trx.cpp 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/87/12087/1 diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index b6b676e..2b69da4 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -398,7 +398,7 @@ int rc; memset(¶m, 0, sizeof(param)); param.sched_priority = prio; - printf("Setting SCHED_RR priority(%d)\n", param.sched_priority); + LOG(INFO) << "Setting SCHED_RR priority " << param.sched_priority; rc = sched_setscheduler(getpid(), SCHED_RR, ¶m); if (rc != 0) { LOG(ERROR) << "Config: Setting SCHED_RR failed"; @@ -441,12 +441,12 @@ } ost << std::endl; - std::cout << ost << std::endl; + LOG(INFO) << ost << std::endl; } static void trx_stop() { - std::cout << "Shutting down transceiver..." << std::endl; + LOG(NOTICE) << "Shutting down transceiver..." << std::endl; delete transceiver; delete radio; @@ -489,7 +489,7 @@ goto shutdown; chans = transceiver->numChans(); - std::cout << "-- Transceiver active with " + LOG(NOTICE) << "-- Transceiver active with " << chans << " channel(s)" << std::endl; return 0; @@ -564,7 +564,7 @@ g_ctrlh = ctrl_interface_setup(NULL, OSMO_CTRL_PORT_TRX, NULL); if (!g_ctrlh) { - fprintf(stderr, "Failed to create CTRL interface.\n"); + LOG(ERROR) << "Failed to create CTRL interface.\n"; exit(1); } -- To view, visit https://gerrit.osmocom.org/12087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I66e3c37014ba12cd002e5b678bc0a6026f5dfc7e Gerrit-Change-Number: 12087 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 17:48:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Dec 2018 17:48:15 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Patch Set 5: Code-Review+1 (1 comment) nice idea to add general tests helpers. Things that complicate the idea: - tests often have different output scenarios: {printf,LOG}x{stdout,stderr}x{checked,unchecked} so I usually end up tailoring the debug output to the specific test. fprintf(stdout) is ok in test.c but not in libosmocore API. - when an error occurs, I sometimes needed the position of the difference indicated (usually only during development cycles) - usually when I write tests, I use hex strings instead of buffers, because they are easily editable and imply the length. It's not so easy to accomodate all current test styles, but we could with this API define how tests should be written from now on. Could add hex string API (in a later patch?) and could add difference position indicator (in a later patch?). Might be interesting to take a look through other msgb/buffer printing routines flying around in various tests today? Maybe figure out a smaller set of API satisfying all cases? https://gerrit.osmocom.org/#/c/12017/5/src/msgb.c File src/msgb.c: https://gerrit.osmocom.org/#/c/12017/5/src/msgb.c at 198 PS5, Line 198: printf > ACK one slight problem with LOGP could be that in regression tests, we often only check stdout. -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 03 Dec 2018 17:48:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 17:50:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Dec 2018 17:50:48 +0000 Subject: Change in libosmocore[master]: ctrl: use #define for TRAP id In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11926 ) Change subject: ctrl: use #define for TRAP id ...................................................................... Patch Set 1: Code-Review+2 curious that the ID is a string... -- To view, visit https://gerrit.osmocom.org/11926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I33d7d4c6a1885a75a85d6f2f017430e0860b4126 Gerrit-Change-Number: 11926 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 17:50:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 18:10:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 3 Dec 2018 18:10:47 +0000 Subject: Change in libosmocore[master]: IPA: move duplicated error handling into function In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11911 ) Change subject: IPA: move duplicated error handling into function ...................................................................... Patch Set 4: Code-Review-1 (3 comments) I find the choice of name and return value a bit confusing: - recv_discard_msg() reads like it actually calls msgb_free() implicitly, but we still 'goto discard_msg', looks like we discard twice? - the return value of 'true' would to me intuitively mean "reading was successful". Trying to come up with a nicer API it seems to me that it's not worth cracking our head on for those mere two cases below, especially since there is still more return value checking in 657: 'if (ret < needed)' -- it makes it harder to read what is actually going on. So I appreciate the code dup removal, but I believe in this instance it comes at a cost, which is too high (both readability wise and time spent wise). (some more comments follow from before I reached that conclusion) https://gerrit.osmocom.org/#/c/11911/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11911/4//COMMIT_MSG at 10 PS4, Line 10: we do it in oter places. 'h' key stuck? :) https://gerrit.osmocom.org/#/c/11911/4/src/gsm/ipa.c File src/gsm/ipa.c: https://gerrit.osmocom.org/#/c/11911/4/src/gsm/ipa.c at 548 PS4, Line 548: * \param[in] needed Home many bytes we have to read. 'How'? Actually, please rather just use the recv() arg name and refer there, as it is passed transparently: size_t len len parameter passed to recv() https://gerrit.osmocom.org/#/c/11911/4/src/gsm/ipa.c at 553 PS4, Line 553: *ret = recv(fd, msg->tail, needed, 0); This looks like it lacks some bounds checking: make sure that msgb has enough room for 'needed' at its tail? (Or do all callers cover that already?) Would it make sense to derive the 'needed' (len) parameter from the msgb? (I guess not) -- To view, visit https://gerrit.osmocom.org/11911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f Gerrit-Change-Number: 11911 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 18:10:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 18:17:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 18:17:18 +0000 Subject: Change in osmo-trx[master]: configure.ac: check boost only if USRP1 support is enabled Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12088 Change subject: configure.ac: check boost only if USRP1 support is enabled ...................................................................... configure.ac: check boost only if USRP1 support is enabled boost is only used in USRPDevice class. It looks like it can be removed entirely quite easily, since only boost::shared_ptr is used for 2 variables. That's left for somebody with the device and willingness to test the changes. Change-Id: I4c3fa3ff58fd552d0cb4c4cf2033615d84c07c96 --- M configure.ac 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/88/12088/1 diff --git a/configure.ac b/configure.ac index 2e036ba..bd421aa 100644 --- a/configure.ac +++ b/configure.ac @@ -155,6 +155,8 @@ ]) AS_IF([test "x$with_usrp1" = "xyes"], [ + AC_CHECK_HEADER([boost/config.hpp],[], + [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])]) PKG_CHECK_MODULES(USRP, usrp >= 3.3) ]) @@ -220,9 +222,6 @@ PKG_CHECK_MODULES(LIBUSB, libusb-1.0) PKG_CHECK_MODULES(FFTWF, fftw3f) -AC_CHECK_HEADER([boost/config.hpp],[], - [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])]) - # Generate manuals AC_ARG_ENABLE(manuals, [AS_HELP_STRING( -- To view, visit https://gerrit.osmocom.org/12088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4c3fa3ff58fd552d0cb4c4cf2033615d84c07c96 Gerrit-Change-Number: 12088 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 18:21:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 18:21:28 +0000 Subject: Change in libosmocore[master]: IPA: move duplicated error handling into function In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11911 ) Change subject: IPA: move duplicated error handling into function ...................................................................... Patch Set 4: > So I appreciate the code dup removal, but I believe in this > instance it comes at a cost, which is too high (both readability > wise and time spent wise). I'm not against merging it, but tbh I agree with Neels here, specially after 2nd patch following this one, it makes no much sense or I see no real gain in doing this. -- To view, visit https://gerrit.osmocom.org/11911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f Gerrit-Change-Number: 11911 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 18:21:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 18:29:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 18:29:37 +0000 Subject: Change in osmo-ci[master]: master-builds/gerrit: remove redundant GTP="$GTP" In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12084 ) Change subject: master-builds/gerrit: remove redundant GTP="$GTP" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9238da3dd3c4461f82dc7c792f886177399be3dc Gerrit-Change-Number: 12084 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 03 Dec 2018 18:29:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 18:33:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 18:33:22 +0000 Subject: Change in osmo-ci[master]: osmo-mgw: don't try to build with transcoding In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12083 ) Change subject: osmo-mgw: don't try to build with transcoding ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I080cd331caec31c53a43090e6c19d23e31abdec6 Gerrit-Change-Number: 12083 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 18:33:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 18:34:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 18:34:02 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: WITH_MANUALS In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12045 ) Change subject: gerrit-verifications/master-builds: WITH_MANUALS ...................................................................... Patch Set 5: Code-Review+1 (+2 waiting until I figure out how publish is applied only to master and not to gerrit). -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 03 Dec 2018 18:34:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 18:34:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 18:34:39 +0000 Subject: Change in osmo-mgw[master]: jenkins.sh: remove leftover MGCP env variable In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12082 ) Change subject: jenkins.sh: remove leftover MGCP env variable ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6223afef0f34d90170a691d7d5b1d9542c34c6b0 Gerrit-Change-Number: 12082 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 18:34:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 19:00:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 19:00:52 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12046 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 3: I'm sorry to say I also dislike this --publish parameter, and I'd prefer having a PUBLISH_MANUALS="1" envar (other values mean don't publish). No need to use a parameter and care of later problems where we can use envvars and be done with it. And this way we don't use different methods to pass same kind of information. It's even possible that we can pass this envvar PUBLISH_MANUALS=1 as a job configuration option in osmo-ci instead of writing it in the cmd line of each job in master-builds.yml in osmo-ci. -- To view, visit https://gerrit.osmocom.org/12046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id460a932431b46b88937d96637edd209ca56db97 Gerrit-Change-Number: 12046 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Holger Freyther Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 03 Dec 2018 19:00:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 19:02:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 3 Dec 2018 19:02:15 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: WITH_MANUALS In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12045 ) Change subject: gerrit-verifications/master-builds: WITH_MANUALS ...................................................................... Patch Set 5: Code-Review-1 See my comment in https://gerrit.osmocom.org/#/c/osmo-pcu/+/12046/ -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 03 Dec 2018 19:02:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 3 21:42:51 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 3 Dec 2018 21:42:51 +0000 Subject: Change in libosmocore[master]: ctrl: use #define for TRAP id In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11926 ) Change subject: ctrl: use #define for TRAP id ...................................................................... ctrl: use #define for TRAP id We always use id = 0 when sending TRAP messages. Let's make this more obvious by introducing appropriate define. Change-Id: I33d7d4c6a1885a75a85d6f2f017430e0860b4126 --- M include/osmocom/ctrl/control_cmd.h M src/ctrl/control_if.c 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/ctrl/control_cmd.h b/include/osmocom/ctrl/control_cmd.h index 93055c7..276a7de 100644 --- a/include/osmocom/ctrl/control_cmd.h +++ b/include/osmocom/ctrl/control_cmd.h @@ -12,6 +12,7 @@ #define CTRL_CMD_ERROR -1 #define CTRL_CMD_HANDLED 0 #define CTRL_CMD_REPLY 1 +#define CTRL_CMD_TRAP_ID "0" struct ctrl_handle; diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index 1121d07..0209f3b 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -156,7 +156,7 @@ if (!cmd) return -ENOMEM; - cmd->id = "0"; /* It's a TRAP! */ + cmd->id = CTRL_CMD_TRAP_ID; /* It's a TRAP! */ cmd->variable = (char *) name; cmd->reply = value; r = ctrl_cmd_send_to_all(ctrl, cmd); -- To view, visit https://gerrit.osmocom.org/11926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I33d7d4c6a1885a75a85d6f2f017430e0860b4126 Gerrit-Change-Number: 11926 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 01:28:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 01:28:05 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12046 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 3: Code-Review-1 +1 for only env vars and no cmdline args -- To view, visit https://gerrit.osmocom.org/12046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id460a932431b46b88937d96637edd209ca56db97 Gerrit-Change-Number: 12046 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Holger Freyther Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 01:28:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Dec 4 06:17:33 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 06:17:33 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7225?= Message-ID: <1318038266.1000.1543904253502.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-msc" build number 7225 originally caused by: Started by upstream project "master-libosmo-sccp" build number 1879 originally caused by: Started by timer Building remotely on build2-deb9build-ansible (ttcn3 osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-msc > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-msc +refs/heads/*:refs/remotes/origin/* Checking out Revision 1263bc801749af648cf4fae790ddbdd348d87e69 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 1263bc801749af648cf4fae790ddbdd348d87e69 Commit message: "move gsm_cbfn to gsm_subscriber.h, the only user" > git rev-list --no-walk 1263bc801749af648cf4fae790ddbdd348d87e69 # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins2351767291868729888.sh + ARTIFACT_STORE=/home/osmocom-build/jenkins_build_artifact_store + mkdir -p /home/osmocom-build/jenkins_build_artifact_store + docker run --rm=true -i -e HOME=/build -e ARTIFACT_STORE=/artifact_store -e JOB_NAME=master-osmo-msc/IU=--disable-iu,a2=default,a3=default,label=osmocom-master-debian9 -e MAKE=make -e PARALLEL_MAKE=-j 8 -e IU=--disable-iu -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -w /build -u build -v :/build -v /home/osmocom-build/bin:/build_bin -v /home/osmocom-build/jenkins_build_artifact_store:/artifact_store -v /home/osmocom-build/.ssh:/home/build/.ssh:ro osmocom:amd64 /build/contrib/jenkins.sh --publish + base=/build + deps=/build/deps + inst=/build/deps/install + export deps inst + osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD error: unable to write file .gitignore error: unable to write file .gitreview error: unable to write file .mailmap error: unable to write file AUTHORS error: unable to write file COPYING error: unable to write file Makefile.am error: unable to write file README error: unable to write file README.vty-tests error: unable to write file configure.ac error: unable to write file contrib/Makefile.am error: unable to write file contrib/jenkins.sh error: unable to write file contrib/systemd/Makefile.am error: unable to write file contrib/systemd/osmo-msc.service error: unable to write file debian/changelog error: unable to write file debian/compat error: unable to write file debian/control error: unable to write file debian/copyright error: unable to write file debian/osmo-msc.install error: unable to write file debian/rules error: unable to write file debian/source/format error: unable to write file doc/Makefile.am error: unable to write file doc/examples/Makefile.am error: unable to write file doc/examples/osmo-msc/osmo-msc.cfg error: unable to write file doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg error: unable to write file doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg error: unable to write file doc/manuals/Makefile.am error: unable to write file doc/manuals/chapters/control.adoc error: unable to write file doc/manuals/chapters/counters.adoc error: unable to write file doc/manuals/chapters/counters_generated.adoc error: unable to write file doc/manuals/chapters/net.adoc error: unable to write file doc/manuals/chapters/overview.adoc error: unable to write file doc/manuals/chapters/running.adoc error: unable to write file doc/manuals/images/sgs-imsi_attach_lu.msc error: unable to write file doc/manuals/images/sgs-mo_call_no_ps_ho.msc error: unable to write file doc/manuals/images/sgs-mo_sms_idle.msc error: unable to write file doc/manuals/images/sgs-mt_call_idle.msc error: unable to write file doc/manuals/images/sgs-mt_sms_idle.msc error: unable to write file doc/manuals/osmomsc-usermanual-docinfo.xml error: unable to write file doc/manuals/osmomsc-usermanual.adoc error: unable to write file doc/manuals/osmomsc-vty-reference.xml error: unable to write file doc/manuals/vty/msc_vty_additions.xml error: unable to write file doc/manuals/vty/msc_vty_reference.xml error: unable to write file git-version-gen error: unable to write file include/Makefile.am error: unable to write file include/osmocom/Makefile.am error: unable to write file include/osmocom/msc/Makefile.am error: unable to write file include/osmocom/msc/a_iface.h error: unable to write file include/osmocom/msc/a_iface_bssap.h error: unable to write file include/osmocom/msc/a_reset.h error: unable to write file include/osmocom/msc/db.h error: unable to write file include/osmocom/msc/debug.h error: unable to write file include/osmocom/msc/gsm_04_08.h error: unable to write file include/osmocom/msc/gsm_04_11.h error: unable to write file include/osmocom/msc/gsm_04_14.h error: unable to write file include/osmocom/msc/gsm_04_80.h error: unable to write file include/osmocom/msc/gsm_09_11.h error: unable to write file include/osmocom/msc/gsm_data.h error: unable to write file include/osmocom/msc/gsm_data_shared.h error: unable to write file include/osmocom/msc/gsm_subscriber.h error: unable to write file include/osmocom/msc/iu_dummy.h error: unable to write file include/osmocom/msc/iucs.h error: unable to write file include/osmocom/msc/iucs_ranap.h error: unable to write file include/osmocom/msc/mncc.h error: unable to write file include/osmocom/msc/mncc_int.h error: unable to write file include/osmocom/msc/msc_common.h error: unable to write file include/osmocom/msc/msc_ifaces.h error: unable to write file include/osmocom/msc/msc_mgcp.h error: unable to write file include/osmocom/msc/ran_conn.h error: unable to write file include/osmocom/msc/rrlp.h error: unable to write file include/osmocom/msc/signal.h error: unable to write file include/osmocom/msc/silent_call.h error: unable to write file include/osmocom/msc/smpp.h error: unable to write file include/osmocom/msc/sms_queue.h error: unable to write file include/osmocom/msc/transaction.h error: unable to write file include/osmocom/msc/vlr.h error: unable to write file include/osmocom/msc/vty.h error: unable to write file m4/README error: unable to write file m4/ax_check_compile_flag.m4 error: unable to write file osmoappdesc.py error: unable to write file src/Makefile.am error: unable to write file src/libmsc/Makefile.am error: unable to write file src/libmsc/a_iface.c error: unable to write file src/libmsc/a_iface_bssap.c error: unable to write file src/libmsc/a_reset.c error: unable to write file src/libmsc/ctrl_commands.c error: unable to write file src/libmsc/db.c error: unable to write file src/libmsc/gsm_04_08.c error: unable to write file src/libmsc/gsm_04_08_cc.c error: unable to write file src/libmsc/gsm_04_11.c error: unable to write file src/libmsc/gsm_04_14.c error: unable to write file src/libmsc/gsm_04_80.c error: unable to write file src/libmsc/gsm_09_11.c error: unable to write file src/libmsc/gsm_subscriber.c error: unable to write file src/libmsc/iu_dummy.c error: unable to write file src/libmsc/iucs.c error: unable to write file src/libmsc/iucs_ranap.c error: unable to write file src/libmsc/mncc.c error: unable to write file src/libmsc/mncc_builtin.c error: unable to write file src/libmsc/mncc_sock.c error: unable to write file src/libmsc/msc_ifaces.c error: unable to write file src/libmsc/msc_mgcp.c error: unable to write file src/libmsc/msc_vty.c error: unable to write file src/libmsc/osmo_msc.c error: unable to write file src/libmsc/ran_conn.c error: unable to write file src/libmsc/rrlp.c error: unable to write file src/libmsc/silent_call.c error: unable to write file src/libmsc/smpp_openbsc.c error: unable to write file src/libmsc/smpp_smsc.c error: unable to write file src/libmsc/smpp_smsc.h error: unable to write file src/libmsc/smpp_utils.c error: unable to write file src/libmsc/smpp_vty.c error: unable to write file src/libmsc/sms_queue.c error: unable to write file src/libmsc/transaction.c error: unable to write file src/libvlr/Makefile.am error: unable to write file src/libvlr/vlr.c error: unable to write file src/libvlr/vlr_access_req_fsm.c error: unable to write file src/libvlr/vlr_access_req_fsm.h error: unable to write file src/libvlr/vlr_auth_fsm.c error: unable to write file src/libvlr/vlr_auth_fsm.h error: unable to write file src/libvlr/vlr_core.h error: unable to write file src/libvlr/vlr_lu_fsm.c error: unable to write file src/libvlr/vlr_lu_fsm.h error: unable to write file src/osmo-msc/Makefile.am error: unable to write file src/osmo-msc/msc_main.c error: unable to write file src/utils/Makefile.am error: unable to write file src/utils/smpp_mirror.c error: unable to write file tests/Makefile.am error: unable to write file tests/atlocal.in error: unable to write file tests/ctrl_test_runner.py error: unable to write file tests/msc_vlr/Makefile.am error: unable to write file tests/msc_vlr/msc_vlr_test_authen_reuse.c error: unable to write file tests/msc_vlr/msc_vlr_test_authen_reuse.err error: unable to write file tests/msc_vlr/msc_vlr_test_authen_reuse.ok error: unable to write file tests/msc_vlr/msc_vlr_test_call.c error: unable to write file tests/msc_vlr/msc_vlr_test_call.err error: unable to write file tests/msc_vlr/msc_vlr_test_call.ok error: unable to write file tests/msc_vlr/msc_vlr_test_gsm_authen.c error: unable to write file tests/msc_vlr/msc_vlr_test_gsm_authen.err error: unable to write file tests/msc_vlr/msc_vlr_test_gsm_authen.ok error: unable to write file tests/msc_vlr/msc_vlr_test_gsm_ciph.c error: unable to write file tests/msc_vlr/msc_vlr_test_gsm_ciph.err error: unable to write file tests/msc_vlr/msc_vlr_test_gsm_ciph.ok error: unable to write file tests/msc_vlr/msc_vlr_test_hlr_reject.c error: unable to write file tests/msc_vlr/msc_vlr_test_hlr_reject.err error: unable to write file tests/msc_vlr/msc_vlr_test_hlr_reject.ok error: unable to write file tests/msc_vlr/msc_vlr_test_hlr_timeout.c error: unable to write file tests/msc_vlr/msc_vlr_test_hlr_timeout.err error: unable to write file tests/msc_vlr/msc_vlr_test_hlr_timeout.ok error: unable to write file tests/msc_vlr/msc_vlr_test_ms_timeout.c error: unable to write file tests/msc_vlr/msc_vlr_test_ms_timeout.err error: unable to write file tests/msc_vlr/msc_vlr_test_ms_timeout.ok error: unable to write file tests/msc_vlr/msc_vlr_test_no_authen.c error: unable to write file tests/msc_vlr/msc_vlr_test_no_authen.err error: unable to write file tests/msc_vlr/msc_vlr_test_no_authen.ok error: unable to write file tests/msc_vlr/msc_vlr_test_reject_concurrency.c error: unable to write file tests/msc_vlr/msc_vlr_test_reject_concurrency.err error: unable to write file tests/msc_vlr/msc_vlr_test_reject_concurrency.ok error: unable to write file tests/msc_vlr/msc_vlr_test_rest.c error: unable to write file tests/msc_vlr/msc_vlr_test_rest.err error: unable to write file tests/msc_vlr/msc_vlr_test_rest.ok error: unable to write file tests/msc_vlr/msc_vlr_test_ss.c error: unable to write file tests/msc_vlr/msc_vlr_test_ss.err error: unable to write file tests/msc_vlr/msc_vlr_test_ss.ok error: unable to write file tests/msc_vlr/msc_vlr_test_umts_authen.c error: unable to write file tests/msc_vlr/msc_vlr_test_umts_authen.err error: unable to write file tests/msc_vlr/msc_vlr_test_umts_authen.ok error: unable to write file tests/msc_vlr/msc_vlr_tests.c error: unable to write file tests/msc_vlr/msc_vlr_tests.h error: unable to write file tests/smpp/Makefile.am error: unable to write file tests/smpp/smpp_test.c error: unable to write file tests/smpp/smpp_test.err error: unable to write file tests/smpp/smpp_test.ok error: unable to write file tests/smpp_test_runner.py error: unable to write file tests/sms_queue/Makefile.am error: unable to write file tests/sms_queue/sms_queue_test.c error: unable to write file tests/sms_queue/sms_queue_test.ok error: unable to write file tests/testsuite.at error: unable to write file tests/vty_test_runner.py fatal: unable to write new index file Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Dec 4 06:17:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 06:17:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3328?= Message-ID: <2120203249.1001.1543904255330.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 13.02 KB...] error: unable to write file openbsc/include/openbsc/ipaccess.h error: unable to write file openbsc/include/openbsc/iu.h error: unable to write file openbsc/include/openbsc/meas_feed.h error: unable to write file openbsc/include/openbsc/meas_rep.h error: unable to write file openbsc/include/openbsc/mgcp.h error: unable to write file openbsc/include/openbsc/mgcp_internal.h error: unable to write file openbsc/include/openbsc/mgcp_transcode.h error: unable to write file openbsc/include/openbsc/misdn.h error: unable to write file openbsc/include/openbsc/mncc.h error: unable to write file openbsc/include/openbsc/mncc_int.h error: unable to write file openbsc/include/openbsc/nat_rewrite_trie.h error: unable to write file openbsc/include/openbsc/network_listen.h error: unable to write file openbsc/include/openbsc/oap_client.h error: unable to write file openbsc/include/openbsc/openbscdefines.h error: unable to write file openbsc/include/openbsc/osmo_bsc.h error: unable to write file openbsc/include/openbsc/osmo_bsc_grace.h error: unable to write file openbsc/include/openbsc/osmo_bsc_rf.h error: unable to write file openbsc/include/openbsc/osmo_msc.h error: unable to write file openbsc/include/openbsc/osmux.h error: unable to write file openbsc/include/openbsc/paging.h error: unable to write file openbsc/include/openbsc/pcu_if.h error: unable to write file openbsc/include/openbsc/pcuif_proto.h error: unable to write file openbsc/include/openbsc/rest_octets.h error: unable to write file openbsc/include/openbsc/rrlp.h error: unable to write file openbsc/include/openbsc/rs232.h error: unable to write file openbsc/include/openbsc/rtp_proxy.h error: unable to write file openbsc/include/openbsc/signal.h error: unable to write file openbsc/include/openbsc/silent_call.h error: unable to write file openbsc/include/openbsc/smpp.h error: unable to write file openbsc/include/openbsc/sms_queue.h error: unable to write file openbsc/include/openbsc/socket.h error: unable to write file openbsc/include/openbsc/system_information.h error: unable to write file openbsc/include/openbsc/token_auth.h error: unable to write file openbsc/include/openbsc/transaction.h error: unable to write file openbsc/include/openbsc/trau_mux.h error: unable to write file openbsc/include/openbsc/trau_upqueue.h error: unable to write file openbsc/include/openbsc/ussd.h error: unable to write file openbsc/include/openbsc/vty.h error: unable to write file openbsc/m4/README error: unable to write file openbsc/m4/ax_check_compile_flag.m4 error: unable to write file openbsc/openbsc.pc.in error: unable to write file openbsc/osmoappdesc.py error: unable to write file openbsc/src/Makefile.am error: unable to write file openbsc/src/ipaccess/Makefile.am error: unable to write file openbsc/src/ipaccess/abisip-find.c error: unable to write file openbsc/src/ipaccess/ipaccess-config.c error: unable to write file openbsc/src/ipaccess/ipaccess-firmware.c error: unable to write file openbsc/src/ipaccess/ipaccess-proxy.c error: unable to write file openbsc/src/ipaccess/network_listen.c error: unable to write file openbsc/src/libbsc/Makefile.am error: unable to write file openbsc/src/libbsc/abis_nm.c error: unable to write file openbsc/src/libbsc/abis_nm_ipaccess.c error: unable to write file openbsc/src/libbsc/abis_nm_vty.c error: unable to write file openbsc/src/libbsc/abis_om2000.c error: unable to write file openbsc/src/libbsc/abis_om2000_vty.c error: unable to write file openbsc/src/libbsc/abis_rsl.c error: unable to write file openbsc/src/libbsc/acc_ramp.c error: unable to write file openbsc/src/libbsc/arfcn_range_encode.c error: unable to write file openbsc/src/libbsc/bsc_api.c error: unable to write file openbsc/src/libbsc/bsc_ctrl_commands.c error: unable to write file openbsc/src/libbsc/bsc_ctrl_lookup.c error: unable to write file openbsc/src/libbsc/bsc_dyn_ts.c error: unable to write file openbsc/src/libbsc/bsc_init.c error: unable to write file openbsc/src/libbsc/bsc_msc.c error: unable to write file openbsc/src/libbsc/bsc_rf_ctrl.c error: unable to write file openbsc/src/libbsc/bsc_rll.c error: unable to write file openbsc/src/libbsc/bsc_subscriber.c error: unable to write file openbsc/src/libbsc/bsc_vty.c error: unable to write file openbsc/src/libbsc/bts_ericsson_rbs2000.c error: unable to write file openbsc/src/libbsc/bts_init.c error: unable to write file openbsc/src/libbsc/bts_ipaccess_nanobts.c error: unable to write file openbsc/src/libbsc/bts_ipaccess_nanobts_omlattr.c error: unable to write file openbsc/src/libbsc/bts_nokia_site.c error: unable to write file openbsc/src/libbsc/bts_siemens_bs11.c error: unable to write file openbsc/src/libbsc/bts_sysmobts.c error: unable to write file openbsc/src/libbsc/bts_unknown.c error: unable to write file openbsc/src/libbsc/chan_alloc.c error: unable to write file openbsc/src/libbsc/e1_config.c error: unable to write file openbsc/src/libbsc/gsm_04_08_utils.c error: unable to write file openbsc/src/libbsc/gsm_04_80_utils.c error: unable to write file openbsc/src/libbsc/handover_decision.c error: unable to write file openbsc/src/libbsc/handover_logic.c error: unable to write file openbsc/src/libbsc/meas_proc.c error: unable to write file openbsc/src/libbsc/meas_rep.c error: unable to write file openbsc/src/libbsc/net_init.c error: unable to write file openbsc/src/libbsc/paging.c error: unable to write file openbsc/src/libbsc/pcu_sock.c error: unable to write file openbsc/src/libbsc/rest_octets.c error: unable to write file openbsc/src/libbsc/system_information.c error: unable to write file openbsc/src/libcommon-cs/Makefile.am error: unable to write file openbsc/src/libcommon-cs/common_cs.c error: unable to write file openbsc/src/libcommon-cs/common_cs_vty.c error: unable to write file openbsc/src/libcommon/Makefile.am error: unable to write file openbsc/src/libcommon/bsc_version.c error: unable to write file openbsc/src/libcommon/common_vty.c error: unable to write file openbsc/src/libcommon/debug.c error: unable to write file openbsc/src/libcommon/gsm_data.c error: unable to write file openbsc/src/libcommon/gsm_data_shared.c error: unable to write file openbsc/src/libcommon/gsm_subscriber_base.c error: unable to write file openbsc/src/libcommon/gsup_client.c error: unable to write file openbsc/src/libcommon/gsup_test_client.c error: unable to write file openbsc/src/libcommon/oap_client.c error: unable to write file openbsc/src/libcommon/socket.c error: unable to write file openbsc/src/libcommon/talloc_ctx.c error: unable to write file openbsc/src/libfilter/Makefile.am error: unable to write file openbsc/src/libfilter/bsc_msg_acc.c error: unable to write file openbsc/src/libfilter/bsc_msg_filter.c error: unable to write file openbsc/src/libfilter/bsc_msg_vty.c error: unable to write file openbsc/src/libiu/Makefile.am error: unable to write file openbsc/src/libiu/iu.c error: unable to write file openbsc/src/libiu/iu_vty.c error: unable to write file openbsc/src/libmgcp/Makefile.am error: unable to write file openbsc/src/libmgcp/g711common.h error: unable to write file openbsc/src/libmgcp/mgcp_network.c error: unable to write file openbsc/src/libmgcp/mgcp_osmux.c error: unable to write file openbsc/src/libmgcp/mgcp_protocol.c error: unable to write file openbsc/src/libmgcp/mgcp_sdp.c error: unable to write file openbsc/src/libmgcp/mgcp_transcode.c error: unable to write file openbsc/src/libmgcp/mgcp_vty.c error: unable to write file openbsc/src/libmsc/Makefile.am error: unable to write file openbsc/src/libmsc/auth.c error: unable to write file openbsc/src/libmsc/ctrl_commands.c error: unable to write file openbsc/src/libmsc/db.c error: unable to write file openbsc/src/libmsc/gsm_04_08.c error: unable to write file openbsc/src/libmsc/gsm_04_11.c error: unable to write file openbsc/src/libmsc/gsm_04_14.c error: unable to write file openbsc/src/libmsc/gsm_04_80.c error: unable to write file openbsc/src/libmsc/gsm_subscriber.c error: unable to write file openbsc/src/libmsc/meas_feed.c error: unable to write file openbsc/src/libmsc/meas_feed.h error: unable to write file openbsc/src/libmsc/mncc.c error: unable to write file openbsc/src/libmsc/mncc_builtin.c error: unable to write file openbsc/src/libmsc/mncc_sock.c error: unable to write file openbsc/src/libmsc/osmo_msc.c error: unable to write file openbsc/src/libmsc/rrlp.c error: unable to write file openbsc/src/libmsc/silent_call.c error: unable to write file openbsc/src/libmsc/smpp_openbsc.c error: unable to write file openbsc/src/libmsc/smpp_smsc.c error: unable to write file openbsc/src/libmsc/smpp_smsc.h error: unable to write file openbsc/src/libmsc/smpp_utils.c error: unable to write file openbsc/src/libmsc/smpp_vty.c error: unable to write file openbsc/src/libmsc/sms_queue.c error: unable to write file openbsc/src/libmsc/token_auth.c error: unable to write file openbsc/src/libmsc/transaction.c error: unable to write file openbsc/src/libmsc/ussd.c error: unable to write file openbsc/src/libmsc/vty_interface_layer3.c error: unable to write file openbsc/src/libtrau/Makefile.am error: unable to write file openbsc/src/libtrau/rtp_proxy.c error: unable to write file openbsc/src/libtrau/trau_mux.c error: unable to write file openbsc/src/libtrau/trau_upqueue.c error: unable to write file openbsc/src/osmo-bsc/Makefile.am error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_api.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_audio.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_bssap.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_ctrl.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_filter.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_grace.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_main.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_msc.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_sccp.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_vty.c error: unable to write file openbsc/src/osmo-bsc_mgcp/Makefile.am error: unable to write file openbsc/src/osmo-bsc_mgcp/mgcp_main.c error: unable to write file openbsc/src/osmo-bsc_nat/Makefile.am error: unable to write file openbsc/src/osmo-bsc_nat/bsc_filter.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_filter.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_utils.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_vty.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_sccp.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_ussd.c error: unable to write file openbsc/src/osmo-nitb/Makefile.am error: unable to write file openbsc/src/osmo-nitb/bsc_hack.c error: unable to write file openbsc/src/utils/Makefile.am error: unable to write file openbsc/src/utils/bs11_config.c error: unable to write file openbsc/src/utils/isdnsync.c error: unable to write file openbsc/src/utils/meas_db.c error: unable to write file openbsc/src/utils/meas_db.h error: unable to write file openbsc/src/utils/meas_json.c error: unable to write file openbsc/src/utils/meas_pcap2db.c error: unable to write file openbsc/src/utils/meas_udp2db.c error: unable to write file openbsc/src/utils/meas_vis.c error: unable to write file openbsc/src/utils/smpp_mirror.c error: unable to write file openbsc/tests/Makefile.am error: unable to write file openbsc/tests/abis/Makefile.am error: unable to write file openbsc/tests/abis/abis_test.c error: unable to write file openbsc/tests/abis/abis_test.ok error: unable to write file openbsc/tests/atlocal.in error: unable to write file openbsc/tests/bsc-nat-trie/Makefile.am error: unable to write file openbsc/tests/bsc-nat-trie/bsc_nat_trie_test.c error: unable to write file openbsc/tests/bsc-nat-trie/bsc_nat_trie_test.ok error: unable to write file openbsc/tests/bsc-nat-trie/prefixes.csv error: unable to write file openbsc/tests/bsc-nat/Makefile.am error: unable to write file openbsc/tests/bsc-nat/barr.cfg error: unable to write file openbsc/tests/bsc-nat/barr_dup.cfg error: unable to write file openbsc/tests/bsc-nat/bsc_data.c error: unable to write file openbsc/tests/bsc-nat/bsc_nat_test.c error: unable to write file openbsc/tests/bsc-nat/bsc_nat_test.ok error: unable to write file openbsc/tests/bsc-nat/prefixes.csv error: unable to write file openbsc/tests/bsc/Makefile.am error: unable to write file openbsc/tests/bsc/bsc_test.c error: unable to write file openbsc/tests/bsc/bsc_test.ok error: unable to write file openbsc/tests/channel/Makefile.am error: unable to write file openbsc/tests/channel/channel_test.c error: unable to write file openbsc/tests/channel/channel_test.ok error: unable to write file openbsc/tests/ctrl_test_runner.py error: unable to write file openbsc/tests/db/Makefile.am error: unable to write file openbsc/tests/db/db_test.c error: unable to write file openbsc/tests/db/db_test.err error: unable to write file openbsc/tests/db/db_test.ok error: unable to write file openbsc/tests/db/hlr.sqlite3 error: unable to write file openbsc/tests/gsm0408/Makefile.am error: unable to write file openbsc/tests/gsm0408/gsm0408_test.c error: unable to write file openbsc/tests/gsm0408/gsm0408_test.ok error: unable to write file openbsc/tests/mgcp/Makefile.am error: unable to write file openbsc/tests/mgcp/mgcp_test.c error: unable to write file openbsc/tests/mgcp/mgcp_test.ok error: unable to write file openbsc/tests/mgcp/mgcp_transcoding_test.c error: unable to write file openbsc/tests/mgcp/mgcp_transcoding_test.ok error: unable to write file openbsc/tests/mm_auth/Makefile.am error: unable to write file openbsc/tests/mm_auth/mm_auth_test.c error: unable to write file openbsc/tests/mm_auth/mm_auth_test.ok error: unable to write file openbsc/tests/nanobts_omlattr/Makefile.am error: unable to write file openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.c error: unable to write file openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.ok error: unable to write file openbsc/tests/smpp/Makefile.am error: unable to write file openbsc/tests/smpp/smpp_test.c error: unable to write file openbsc/tests/smpp/smpp_test.err error: unable to write file openbsc/tests/smpp/smpp_test.ok error: unable to write file openbsc/tests/smpp_test_runner.py error: unable to write file openbsc/tests/subscr/Makefile.am error: unable to write file openbsc/tests/subscr/bsc_subscr_test.c error: unable to write file openbsc/tests/subscr/bsc_subscr_test.err error: unable to write file openbsc/tests/subscr/bsc_subscr_test.ok error: unable to write file openbsc/tests/subscr/subscr_test.c error: unable to write file openbsc/tests/subscr/subscr_test.ok error: unable to write file openbsc/tests/testsuite.at error: unable to write file openbsc/tests/trau/Makefile.am error: unable to write file openbsc/tests/trau/trau_test.c error: unable to write file openbsc/tests/trau/trau_test.ok error: unable to write file openbsc/tests/vty_test_runner.py error: unable to write file openbsc/tools/hlrstat.pl fatal: unable to write new index file Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Dec 4 06:17:37 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 06:17:37 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3328?= Message-ID: <473628274.1002.1543904257568.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 13.03 KB...] error: unable to write file openbsc/include/openbsc/ipaccess.h error: unable to write file openbsc/include/openbsc/iu.h error: unable to write file openbsc/include/openbsc/meas_feed.h error: unable to write file openbsc/include/openbsc/meas_rep.h error: unable to write file openbsc/include/openbsc/mgcp.h error: unable to write file openbsc/include/openbsc/mgcp_internal.h error: unable to write file openbsc/include/openbsc/mgcp_transcode.h error: unable to write file openbsc/include/openbsc/misdn.h error: unable to write file openbsc/include/openbsc/mncc.h error: unable to write file openbsc/include/openbsc/mncc_int.h error: unable to write file openbsc/include/openbsc/nat_rewrite_trie.h error: unable to write file openbsc/include/openbsc/network_listen.h error: unable to write file openbsc/include/openbsc/oap_client.h error: unable to write file openbsc/include/openbsc/openbscdefines.h error: unable to write file openbsc/include/openbsc/osmo_bsc.h error: unable to write file openbsc/include/openbsc/osmo_bsc_grace.h error: unable to write file openbsc/include/openbsc/osmo_bsc_rf.h error: unable to write file openbsc/include/openbsc/osmo_msc.h error: unable to write file openbsc/include/openbsc/osmux.h error: unable to write file openbsc/include/openbsc/paging.h error: unable to write file openbsc/include/openbsc/pcu_if.h error: unable to write file openbsc/include/openbsc/pcuif_proto.h error: unable to write file openbsc/include/openbsc/rest_octets.h error: unable to write file openbsc/include/openbsc/rrlp.h error: unable to write file openbsc/include/openbsc/rs232.h error: unable to write file openbsc/include/openbsc/rtp_proxy.h error: unable to write file openbsc/include/openbsc/signal.h error: unable to write file openbsc/include/openbsc/silent_call.h error: unable to write file openbsc/include/openbsc/smpp.h error: unable to write file openbsc/include/openbsc/sms_queue.h error: unable to write file openbsc/include/openbsc/socket.h error: unable to write file openbsc/include/openbsc/system_information.h error: unable to write file openbsc/include/openbsc/token_auth.h error: unable to write file openbsc/include/openbsc/transaction.h error: unable to write file openbsc/include/openbsc/trau_mux.h error: unable to write file openbsc/include/openbsc/trau_upqueue.h error: unable to write file openbsc/include/openbsc/ussd.h error: unable to write file openbsc/include/openbsc/vty.h error: unable to write file openbsc/m4/README error: unable to write file openbsc/m4/ax_check_compile_flag.m4 error: unable to write file openbsc/openbsc.pc.in error: unable to write file openbsc/osmoappdesc.py error: unable to write file openbsc/src/Makefile.am error: unable to write file openbsc/src/ipaccess/Makefile.am error: unable to write file openbsc/src/ipaccess/abisip-find.c error: unable to write file openbsc/src/ipaccess/ipaccess-config.c error: unable to write file openbsc/src/ipaccess/ipaccess-firmware.c error: unable to write file openbsc/src/ipaccess/ipaccess-proxy.c error: unable to write file openbsc/src/ipaccess/network_listen.c error: unable to write file openbsc/src/libbsc/Makefile.am error: unable to write file openbsc/src/libbsc/abis_nm.c error: unable to write file openbsc/src/libbsc/abis_nm_ipaccess.c error: unable to write file openbsc/src/libbsc/abis_nm_vty.c error: unable to write file openbsc/src/libbsc/abis_om2000.c error: unable to write file openbsc/src/libbsc/abis_om2000_vty.c error: unable to write file openbsc/src/libbsc/abis_rsl.c error: unable to write file openbsc/src/libbsc/acc_ramp.c error: unable to write file openbsc/src/libbsc/arfcn_range_encode.c error: unable to write file openbsc/src/libbsc/bsc_api.c error: unable to write file openbsc/src/libbsc/bsc_ctrl_commands.c error: unable to write file openbsc/src/libbsc/bsc_ctrl_lookup.c error: unable to write file openbsc/src/libbsc/bsc_dyn_ts.c error: unable to write file openbsc/src/libbsc/bsc_init.c error: unable to write file openbsc/src/libbsc/bsc_msc.c error: unable to write file openbsc/src/libbsc/bsc_rf_ctrl.c error: unable to write file openbsc/src/libbsc/bsc_rll.c error: unable to write file openbsc/src/libbsc/bsc_subscriber.c error: unable to write file openbsc/src/libbsc/bsc_vty.c error: unable to write file openbsc/src/libbsc/bts_ericsson_rbs2000.c error: unable to write file openbsc/src/libbsc/bts_init.c error: unable to write file openbsc/src/libbsc/bts_ipaccess_nanobts.c error: unable to write file openbsc/src/libbsc/bts_ipaccess_nanobts_omlattr.c error: unable to write file openbsc/src/libbsc/bts_nokia_site.c error: unable to write file openbsc/src/libbsc/bts_siemens_bs11.c error: unable to write file openbsc/src/libbsc/bts_sysmobts.c error: unable to write file openbsc/src/libbsc/bts_unknown.c error: unable to write file openbsc/src/libbsc/chan_alloc.c error: unable to write file openbsc/src/libbsc/e1_config.c error: unable to write file openbsc/src/libbsc/gsm_04_08_utils.c error: unable to write file openbsc/src/libbsc/gsm_04_80_utils.c error: unable to write file openbsc/src/libbsc/handover_decision.c error: unable to write file openbsc/src/libbsc/handover_logic.c error: unable to write file openbsc/src/libbsc/meas_proc.c error: unable to write file openbsc/src/libbsc/meas_rep.c error: unable to write file openbsc/src/libbsc/net_init.c error: unable to write file openbsc/src/libbsc/paging.c error: unable to write file openbsc/src/libbsc/pcu_sock.c error: unable to write file openbsc/src/libbsc/rest_octets.c error: unable to write file openbsc/src/libbsc/system_information.c error: unable to write file openbsc/src/libcommon-cs/Makefile.am error: unable to write file openbsc/src/libcommon-cs/common_cs.c error: unable to write file openbsc/src/libcommon-cs/common_cs_vty.c error: unable to write file openbsc/src/libcommon/Makefile.am error: unable to write file openbsc/src/libcommon/bsc_version.c error: unable to write file openbsc/src/libcommon/common_vty.c error: unable to write file openbsc/src/libcommon/debug.c error: unable to write file openbsc/src/libcommon/gsm_data.c error: unable to write file openbsc/src/libcommon/gsm_data_shared.c error: unable to write file openbsc/src/libcommon/gsm_subscriber_base.c error: unable to write file openbsc/src/libcommon/gsup_client.c error: unable to write file openbsc/src/libcommon/gsup_test_client.c error: unable to write file openbsc/src/libcommon/oap_client.c error: unable to write file openbsc/src/libcommon/socket.c error: unable to write file openbsc/src/libcommon/talloc_ctx.c error: unable to write file openbsc/src/libfilter/Makefile.am error: unable to write file openbsc/src/libfilter/bsc_msg_acc.c error: unable to write file openbsc/src/libfilter/bsc_msg_filter.c error: unable to write file openbsc/src/libfilter/bsc_msg_vty.c error: unable to write file openbsc/src/libiu/Makefile.am error: unable to write file openbsc/src/libiu/iu.c error: unable to write file openbsc/src/libiu/iu_vty.c error: unable to write file openbsc/src/libmgcp/Makefile.am error: unable to write file openbsc/src/libmgcp/g711common.h error: unable to write file openbsc/src/libmgcp/mgcp_network.c error: unable to write file openbsc/src/libmgcp/mgcp_osmux.c error: unable to write file openbsc/src/libmgcp/mgcp_protocol.c error: unable to write file openbsc/src/libmgcp/mgcp_sdp.c error: unable to write file openbsc/src/libmgcp/mgcp_transcode.c error: unable to write file openbsc/src/libmgcp/mgcp_vty.c error: unable to write file openbsc/src/libmsc/Makefile.am error: unable to write file openbsc/src/libmsc/auth.c error: unable to write file openbsc/src/libmsc/ctrl_commands.c error: unable to write file openbsc/src/libmsc/db.c error: unable to write file openbsc/src/libmsc/gsm_04_08.c error: unable to write file openbsc/src/libmsc/gsm_04_11.c error: unable to write file openbsc/src/libmsc/gsm_04_14.c error: unable to write file openbsc/src/libmsc/gsm_04_80.c error: unable to write file openbsc/src/libmsc/gsm_subscriber.c error: unable to write file openbsc/src/libmsc/meas_feed.c error: unable to write file openbsc/src/libmsc/meas_feed.h error: unable to write file openbsc/src/libmsc/mncc.c error: unable to write file openbsc/src/libmsc/mncc_builtin.c error: unable to write file openbsc/src/libmsc/mncc_sock.c error: unable to write file openbsc/src/libmsc/osmo_msc.c error: unable to write file openbsc/src/libmsc/rrlp.c error: unable to write file openbsc/src/libmsc/silent_call.c error: unable to write file openbsc/src/libmsc/smpp_openbsc.c error: unable to write file openbsc/src/libmsc/smpp_smsc.c error: unable to write file openbsc/src/libmsc/smpp_smsc.h error: unable to write file openbsc/src/libmsc/smpp_utils.c error: unable to write file openbsc/src/libmsc/smpp_vty.c error: unable to write file openbsc/src/libmsc/sms_queue.c error: unable to write file openbsc/src/libmsc/token_auth.c error: unable to write file openbsc/src/libmsc/transaction.c error: unable to write file openbsc/src/libmsc/ussd.c error: unable to write file openbsc/src/libmsc/vty_interface_layer3.c error: unable to write file openbsc/src/libtrau/Makefile.am error: unable to write file openbsc/src/libtrau/rtp_proxy.c error: unable to write file openbsc/src/libtrau/trau_mux.c error: unable to write file openbsc/src/libtrau/trau_upqueue.c error: unable to write file openbsc/src/osmo-bsc/Makefile.am error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_api.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_audio.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_bssap.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_ctrl.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_filter.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_grace.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_main.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_msc.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_sccp.c error: unable to write file openbsc/src/osmo-bsc/osmo_bsc_vty.c error: unable to write file openbsc/src/osmo-bsc_mgcp/Makefile.am error: unable to write file openbsc/src/osmo-bsc_mgcp/mgcp_main.c error: unable to write file openbsc/src/osmo-bsc_nat/Makefile.am error: unable to write file openbsc/src/osmo-bsc_nat/bsc_filter.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_filter.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_utils.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_nat_vty.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_sccp.c error: unable to write file openbsc/src/osmo-bsc_nat/bsc_ussd.c error: unable to write file openbsc/src/osmo-nitb/Makefile.am error: unable to write file openbsc/src/osmo-nitb/bsc_hack.c error: unable to write file openbsc/src/utils/Makefile.am error: unable to write file openbsc/src/utils/bs11_config.c error: unable to write file openbsc/src/utils/isdnsync.c error: unable to write file openbsc/src/utils/meas_db.c error: unable to write file openbsc/src/utils/meas_db.h error: unable to write file openbsc/src/utils/meas_json.c error: unable to write file openbsc/src/utils/meas_pcap2db.c error: unable to write file openbsc/src/utils/meas_udp2db.c error: unable to write file openbsc/src/utils/meas_vis.c error: unable to write file openbsc/src/utils/smpp_mirror.c error: unable to write file openbsc/tests/Makefile.am error: unable to write file openbsc/tests/abis/Makefile.am error: unable to write file openbsc/tests/abis/abis_test.c error: unable to write file openbsc/tests/abis/abis_test.ok error: unable to write file openbsc/tests/atlocal.in error: unable to write file openbsc/tests/bsc-nat-trie/Makefile.am error: unable to write file openbsc/tests/bsc-nat-trie/bsc_nat_trie_test.c error: unable to write file openbsc/tests/bsc-nat-trie/bsc_nat_trie_test.ok error: unable to write file openbsc/tests/bsc-nat-trie/prefixes.csv error: unable to write file openbsc/tests/bsc-nat/Makefile.am error: unable to write file openbsc/tests/bsc-nat/barr.cfg error: unable to write file openbsc/tests/bsc-nat/barr_dup.cfg error: unable to write file openbsc/tests/bsc-nat/bsc_data.c error: unable to write file openbsc/tests/bsc-nat/bsc_nat_test.c error: unable to write file openbsc/tests/bsc-nat/bsc_nat_test.ok error: unable to write file openbsc/tests/bsc-nat/prefixes.csv error: unable to write file openbsc/tests/bsc/Makefile.am error: unable to write file openbsc/tests/bsc/bsc_test.c error: unable to write file openbsc/tests/bsc/bsc_test.ok error: unable to write file openbsc/tests/channel/Makefile.am error: unable to write file openbsc/tests/channel/channel_test.c error: unable to write file openbsc/tests/channel/channel_test.ok error: unable to write file openbsc/tests/ctrl_test_runner.py error: unable to write file openbsc/tests/db/Makefile.am error: unable to write file openbsc/tests/db/db_test.c error: unable to write file openbsc/tests/db/db_test.err error: unable to write file openbsc/tests/db/db_test.ok error: unable to write file openbsc/tests/db/hlr.sqlite3 error: unable to write file openbsc/tests/gsm0408/Makefile.am error: unable to write file openbsc/tests/gsm0408/gsm0408_test.c error: unable to write file openbsc/tests/gsm0408/gsm0408_test.ok error: unable to write file openbsc/tests/mgcp/Makefile.am error: unable to write file openbsc/tests/mgcp/mgcp_test.c error: unable to write file openbsc/tests/mgcp/mgcp_test.ok error: unable to write file openbsc/tests/mgcp/mgcp_transcoding_test.c error: unable to write file openbsc/tests/mgcp/mgcp_transcoding_test.ok error: unable to write file openbsc/tests/mm_auth/Makefile.am error: unable to write file openbsc/tests/mm_auth/mm_auth_test.c error: unable to write file openbsc/tests/mm_auth/mm_auth_test.ok error: unable to write file openbsc/tests/nanobts_omlattr/Makefile.am error: unable to write file openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.c error: unable to write file openbsc/tests/nanobts_omlattr/nanobts_omlattr_test.ok error: unable to write file openbsc/tests/smpp/Makefile.am error: unable to write file openbsc/tests/smpp/smpp_test.c error: unable to write file openbsc/tests/smpp/smpp_test.err error: unable to write file openbsc/tests/smpp/smpp_test.ok error: unable to write file openbsc/tests/smpp_test_runner.py error: unable to write file openbsc/tests/subscr/Makefile.am error: unable to write file openbsc/tests/subscr/bsc_subscr_test.c error: unable to write file openbsc/tests/subscr/bsc_subscr_test.err error: unable to write file openbsc/tests/subscr/bsc_subscr_test.ok error: unable to write file openbsc/tests/subscr/subscr_test.c error: unable to write file openbsc/tests/subscr/subscr_test.ok error: unable to write file openbsc/tests/testsuite.at error: unable to write file openbsc/tests/trau/Makefile.am error: unable to write file openbsc/tests/trau/trau_test.c error: unable to write file openbsc/tests/trau/trau_test.ok error: unable to write file openbsc/tests/vty_test_runner.py error: unable to write file openbsc/tools/hlrstat.pl fatal: unable to write new index file Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Dec 4 06:24:41 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 06:24:41 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7219?= Message-ID: <72057235.1005.1543904681910.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 277.66 KB...] LISTEN 0 10 127.0.0.1:4251 *:* LISTEN 0 10 127.0.0.1:4245 *:* > ps xua | grep osmo build 30098 0.0 0.0 21475098428 33712 ? S 06:24 0:00 ./src/gprs/osmo-sgsn -c /build/tests/../doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg build 30105 0.0 0.0 4336 724 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 30107 0.0 0.0 11128 1004 ? S 06:24 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Socket: closing 127.0.0.1:4245 (0 sockets open) Terminating took 0.897s ok ---------------------------------------------------------------------- Ran 10 tests in 14.472s OK ./ctrl_test_runner.py -w /build -v testListSubscribers (__main__.TestCtrlSGSN) ... ok ---------------------------------------------------------------------- Ran 1 test in 3.423s OK confpath /build/tests/.., workdir /build Running tests for specific control commands Opening /dev/null Launching: PWD=/build './src/gprs/osmo-sgsn' '-c' '/build/tests/../doc/examples/osmo-sgsn/osmo-sgsn.cfg' Connecting to host 127.0.0.1:4251 Sending "GET 1000 subscriber-list-active-v1" Got message: GET_REPLY 1000 subscriber-list-active-v1 Decoded replies: {1000: {'mtype': 'GET_REPLY', 'var': 'subscriber-list-active-v1', 'id': 1000, 'value': None}} Terminating took 0.897s rm -f ../sms.db ../gsn_restart ../gtphub_restart_count make[5]: Leaving directory '/build/tests' make[4]: Leaving directory '/build/tests' make[3]: Leaving directory '/build/tests' make[2]: Leaving directory '/build/tests' make[2]: Entering directory '/build' make[2]: Leaving directory '/build' make[1]: Leaving directory '/build' + LD_LIBRARY_PATH=/build/deps/install/lib + DISTCHECK_CONFIGURE_FLAGS='--enable-werror --disable-iu --enable-external-tests' + make distcheck make dist-bzip2 dist-gzip am__post_remove_distdir='@:' make[1]: Entering directory '/build' if test -d "osmo-sgsn-1.3.0.110-f164d"; then find "osmo-sgsn-1.3.0.110-f164d" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-sgsn-1.3.0.110-f164d" || { sleep 5 && rm -rf "osmo-sgsn-1.3.0.110-f164d"; }; else :; fi test -d "osmo-sgsn-1.3.0.110-f164d" || mkdir "osmo-sgsn-1.3.0.110-f164d" (cd doc && make top_distdir=../osmo-sgsn-1.3.0.110-f164d distdir=../osmo-sgsn-1.3.0.110-f164d/doc \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[2]: Entering directory '/build/doc' (cd examples && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/doc/examples \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/doc/examples' make \ top_distdir="../../osmo-sgsn-1.3.0.110-f164d" distdir="../../osmo-sgsn-1.3.0.110-f164d/doc/examples" \ dist-hook make[4]: Entering directory '/build/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="../../osmo-sgsn-1.3.0.110-f164d/doc/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[4]: Leaving directory '/build/doc/examples' make[3]: Leaving directory '/build/doc/examples' (cd manuals && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/doc/manuals \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/doc/manuals' make[3]: Leaving directory '/build/doc/manuals' make[2]: Leaving directory '/build/doc' (cd include && make top_distdir=../osmo-sgsn-1.3.0.110-f164d distdir=../osmo-sgsn-1.3.0.110-f164d/include \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[2]: Entering directory '/build/include' (cd osmocom && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/include/osmocom \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/include/osmocom' (cd sgsn && make top_distdir=../../../osmo-sgsn-1.3.0.110-f164d distdir=../../../osmo-sgsn-1.3.0.110-f164d/include/osmocom/sgsn \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory '/build/include/osmocom/sgsn' make[4]: Leaving directory '/build/include/osmocom/sgsn' make[3]: Leaving directory '/build/include/osmocom' make[2]: Leaving directory '/build/include' (cd src && make top_distdir=../osmo-sgsn-1.3.0.110-f164d distdir=../osmo-sgsn-1.3.0.110-f164d/src \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[2]: Entering directory '/build/src' (cd gprs && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/src/gprs \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/src/gprs' make[3]: Leaving directory '/build/src/gprs' make[2]: Leaving directory '/build/src' (cd contrib && make top_distdir=../osmo-sgsn-1.3.0.110-f164d distdir=../osmo-sgsn-1.3.0.110-f164d/contrib \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[2]: Entering directory '/build/contrib' (cd systemd && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/contrib/systemd \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/contrib/systemd' make[3]: Leaving directory '/build/contrib/systemd' make[2]: Leaving directory '/build/contrib' (cd tests && make top_distdir=../osmo-sgsn-1.3.0.110-f164d distdir=../osmo-sgsn-1.3.0.110-f164d/tests \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[2]: Entering directory '/build/tests' (cd gprs && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/tests/gprs \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/tests/gprs' make[3]: Leaving directory '/build/tests/gprs' (cd gbproxy && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/tests/gbproxy \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/tests/gbproxy' make[3]: Leaving directory '/build/tests/gbproxy' (cd gtphub && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/tests/gtphub \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/tests/gtphub' make[3]: Leaving directory '/build/tests/gtphub' (cd sgsn && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/tests/sgsn \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/tests/sgsn' make[3]: Leaving directory '/build/tests/sgsn' (cd xid && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/tests/xid \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/tests/xid' make[3]: Leaving directory '/build/tests/xid' (cd sndcp_xid && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/tests/sndcp_xid \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/tests/sndcp_xid' make[3]: Leaving directory '/build/tests/sndcp_xid' (cd slhc && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/tests/slhc \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/tests/slhc' make[3]: Leaving directory '/build/tests/slhc' (cd v42bis && make top_distdir=../../osmo-sgsn-1.3.0.110-f164d distdir=../../osmo-sgsn-1.3.0.110-f164d/tests/v42bis \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/tests/v42bis' make[3]: Leaving directory '/build/tests/v42bis' make[2]: Leaving directory '/build/tests' make \ top_distdir="osmo-sgsn-1.3.0.110-f164d" distdir="osmo-sgsn-1.3.0.110-f164d" \ dist-hook make[2]: Entering directory '/build' echo 1.3.0.110-f164d > osmo-sgsn-1.3.0.110-f164d/.tarball-version make[2]: Leaving directory '/build' test -n "" \ || find "osmo-sgsn-1.3.0.110-f164d" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec /bin/bash /build/install-sh -c -m a+r {} {} \; \ || chmod -R a+r "osmo-sgsn-1.3.0.110-f164d" tardir=osmo-sgsn-1.3.0.110-f164d && ${TAR-tar} chof - "$tardir" | BZIP2=${BZIP2--9} bzip2 -c >osmo-sgsn-1.3.0.110-f164d.tar.bz2 tardir=osmo-sgsn-1.3.0.110-f164d && ${TAR-tar} chof - "$tardir" | GZIP=--best gzip -c >osmo-sgsn-1.3.0.110-f164d.tar.gz make[1]: Leaving directory '/build' if test -d "osmo-sgsn-1.3.0.110-f164d"; then find "osmo-sgsn-1.3.0.110-f164d" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-sgsn-1.3.0.110-f164d" || { sleep 5 && rm -rf "osmo-sgsn-1.3.0.110-f164d"; }; else :; fi case 'osmo-sgsn-1.3.0.110-f164d.tar.gz osmo-sgsn-1.3.0.110-f164d.tar.bz2' in \ *.tar.gz*) \ GZIP=--best gzip -dc osmo-sgsn-1.3.0.110-f164d.tar.gz | ${TAR-tar} xf - ;;\ *.tar.bz2*) \ bzip2 -dc osmo-sgsn-1.3.0.110-f164d.tar.bz2 | ${TAR-tar} xf - ;;\ *.tar.lz*) \ lzip -dc osmo-sgsn-1.3.0.110-f164d.tar.lz | ${TAR-tar} xf - ;;\ *.tar.xz*) \ xz -dc osmo-sgsn-1.3.0.110-f164d.tar.xz | ${TAR-tar} xf - ;;\ *.tar.Z*) \ uncompress -c osmo-sgsn-1.3.0.110-f164d.tar.Z | ${TAR-tar} xf - ;;\ *.shar.gz*) \ GZIP=--best gzip -dc osmo-sgsn-1.3.0.110-f164d.shar.gz | unshar ;;\ *.zip*) \ unzip osmo-sgsn-1.3.0.110-f164d.zip ;;\ esac chmod -R a-w osmo-sgsn-1.3.0.110-f164d chmod u+w osmo-sgsn-1.3.0.110-f164d mkdir osmo-sgsn-1.3.0.110-f164d/_build osmo-sgsn-1.3.0.110-f164d/_inst chmod a-w osmo-sgsn-1.3.0.110-f164d test -d osmo-sgsn-1.3.0.110-f164d/_build || exit 0; \ dc_install_base=`CDPATH="${ZSH_VERSION+.}:" && cd osmo-sgsn-1.3.0.110-f164d/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="${TMPDIR-/tmp}/am-dc-$$/" \ && am__cwd=`pwd` \ && CDPATH="${ZSH_VERSION+.}:" && cd osmo-sgsn-1.3.0.110-f164d/_build \ && ../configure \ \ --with-systemdsystemunitdir=$dc_install_base//lib/systemd/system \ --srcdir=.. --prefix="$dc_install_base" \ && make \ && make dvi \ && make check \ && make install \ && make installcheck \ && make uninstall \ && make distuninstallcheck_dir="$dc_install_base" \ distuninstallcheck \ && chmod -R a-w "$dc_install_base" \ && ({ \ (cd ../.. && umask 077 && mkdir "$dc_destdir") \ && make DESTDIR="$dc_destdir" install \ && make DESTDIR="$dc_destdir" uninstall \ && make DESTDIR="$dc_destdir" \ distuninstallcheck_dir="$dc_destdir" distuninstallcheck; \ } || { rm -rf "$dc_destdir"; exit 1; }) \ && rm -rf "$dc_destdir" \ && make dist \ && rm -rf osmo-sgsn-1.3.0.110-f164d.tar.gz osmo-sgsn-1.3.0.110-f164d.tar.bz2 \ && make distcleancheck \ && cd "$am__cwd" \ || exit 1 ../configure: line 1918: cannot create temp file for here-document: No space left on device ../configure: line 1930: cannot create temp file for here-document: No space left on device ../configure: line 1959: printf: write error: No space left on device ../configure: line 1959: printf: write error: No space left on device ../configure: line 1959: printf: write error: No space left on device ../configure: line 1959: printf: write error: No space left on device ../configure: line 1959: printf: write error: No space left on device ../configure: line 1959: printf: write error: No space left on device ../configure: line 1965: cannot create temp file for here-document: No space left on device ../configure: line 2123: printf: write error: No space left on device cat: write error: No space left on device cat: write error: No space left on device ../configure: line 2135: cannot create temp file for here-document: No space left on device ../configure: line 2139: cannot create temp file for here-document: No space left on device ../configure: line 2143: cannot create temp file for here-document: No space left on device ../configure: line 2147: cannot create temp file for here-document: No space left on device ../configure: line 2317: printf: write error: No space left on device checking for a BSD-compatible install... ../configure: line 2351: echo: write error: No space left on device ../configure: line 2352: echo: write error: No space left on device mkdir: cannot create directory 'conftest.dir': No space left on device /usr/bin/install: target '/build/osmo-sgsn-1.3.0.110-f164d/_build/conftest.dir' is not a directory .././install-sh -c ../configure: line 2385: printf: write error: No space left on device ../configure: line 2396: printf: write error: No space left on device checking whether build environment is sane... ../configure: line 2419: echo: write error: No space left on device ../configure: line 2451: printf: write error: No space left on device yes checking for a thread-safe mkdir -p... ../configure: line 2602: printf: write error: No space left on device /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... no ../configure: line 2790: cannot create temp file for here-document: No space left on device ../configure: line 2795: cannot create temp file for here-document: No space left on device checking whether make supports nested variables... (cached) no checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... no configure: error: in `/build/osmo-sgsn-1.3.0.110-f164d/_build': configure: error: C compiler cannot create executables See `config.log' for more details Makefile:705: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Dec 4 06:24:40 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 06:24:40 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7219?= Message-ID: <533520825.1004.1543904680034.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 809.30 KB...] checking pkg-config is at least version 0.20... yes checking for OSMOCORE... yes checking for OSMOGSM... yes checking for OSMOVTY... yes checking for OSMOCTRL... yes checking for OSMONETIF... yes checking for OSMOSIGTRAN... yes checking for ASN1C... yes checking for ANSI C header files... (cached) yes CFLAGS="-g -O2 -Wall" CPPFLAGS=" -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-ranap.pc config.status: creating src/Makefile config.status: creating src/hnbap/Makefile config.status: creating src/ranap/Makefile config.status: creating src/rua/Makefile config.status: creating src/tests/Makefile config.status: creating Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/hnbap/Makefile config.status: creating include/osmocom/ranap/Makefile config.status: creating include/osmocom/rua/Makefile config.status: creating include/osmocom/iuh/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: executing libtool commands config.status: executing depfiles commands config.status: executing src/tests/atconfig commands + make -j 8 install echo 0.3.0.11-319c > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-iuh' Making install in src make[2]: Entering directory '/build/deps/osmo-iuh/src' ../asn1/utils/asn1tostruct.py -f ../asn1/hnbap/HNBAP-PDU-Contents.asn ../asn1/utils/asn1tostruct.py -p RUA_ -f ../asn1/rua/RUA-PDU-Contents.asn ../asn1/utils/asn1tostruct.py -p RANAP_ -f ../asn1/ranap/RANAP-PDU-Contents.asn Didn't find any information element for message: PrivateMessage-IEs sed -i 's,^#include "rua_ies_defs.h",#include ,' rua_encoder.c rua_decoder.c sed -i 's,^#include "rua_common.h",#include ,' rua_encoder.c rua_decoder.c rua_ies_defs.h mv rua_ies_defs.h ../include/osmocom/rua/ Didn't find any information element for message: PrivateMessage-IEs sed -i 's,^#include "hnbap_ies_defs.h",#include ,' hnbap_encoder.c hnbap_decoder.c touch ../src/gen_rua.stamp sed -i 's,^#include "hnbap_common.h",#include ,' hnbap_encoder.c hnbap_decoder.c hnbap_ies_defs.h mv hnbap_ies_defs.h ../include/osmocom/hnbap/ touch ../src/gen_hnbap.stamp Didn't find any information element for message: RelocationDetectIEs Didn't find any information element for message: RelocationCompleteIEs Didn't find any information element for message: RAB-SetupOrModifyItem-IEs Didn't find any information element for message: PrivateMessage-IEs Didn't find any information element for message: DirectTransferInformationItemIEs-RANAP-RelocInf Didn't find any information element for message: SRVCC-CSKeysRequestIEs Didn't find any information element for message: UeRadioCapabilityMatchRequestIEs sed -i 's,^#include "ranap_ies_defs.h",#include ,' ranap_encoder.c ranap_decoder.c sed -i 's,^#include "ranap_common.h",#include ,' ranap_encoder.c ranap_decoder.c ranap_ies_defs.h mv ranap_ies_defs.h ../include/osmocom/ranap/ touch ../src/gen_ranap.stamp make install-recursive make[3]: Entering directory '/build/deps/osmo-iuh/src' Making install in hnbap make[4]: Entering directory '/build/deps/osmo-iuh/src/hnbap' CC Criticality.o CC Presence.o CC ProcedureCode.o CC Access-stratum-release-indicator.o CC PrivateIE-ID.o CC ProtocolIE-ID.o CC TriggeringMessage.o CC IE-Extensions.o CC AccessResult.o CC BackoffTimer.o CC BindingID.o CC AltitudeAndDirection.o CC CauseRadioNetwork.o CC Cause.o CC CauseTransport.o CC CauseProtocol.o CC CauseMisc.o CC CELL-FACHMobilitySupport.o CC CellIdentity.o CC CriticalityDiagnostics.o CC Context-ID.o CC CriticalityDiagnostics-IE-List.o CC CSG-ID.o In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:15, from ../../include/osmocom/hnbap/CriticalityDiagnostics.h:52, from CriticalityDiagnostics.c:8: ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:35:10: warning: 'struct Member' declared inside parameter list struct IE_Extensions *iE_Extensions /* OPTIONAL */; ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:31:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:35:10: warning: its scope is only this definition or declaration, which is probably not what you want struct IE_Extensions *iE_Extensions /* OPTIONAL */; ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:31:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ CC CSG-Capability.o CC CSGMembershipStatus.o In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:15, from CriticalityDiagnostics-IE-List.c:8: ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:35:10: warning: 'struct Member' declared inside parameter list struct IE_Extensions *iE_Extensions /* OPTIONAL */; ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:31:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:35:10: warning: its scope is only this definition or declaration, which is probably not what you want struct IE_Extensions *iE_Extensions /* OPTIONAL */; ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:31:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ CC CGI.o CC CI.o CC CN-DomainIndicator.o CC ESN.o CC GeographicalLocation.o CC GeographicalCoordinates.o CC GTP-TEI.o CC HNBCapacity.o CC HNB-Cell-Access-Mode.o CC HNB-Cell-Identifier.o CC HNB-GWResponse.o CC HNB-RNL-Identity.o CC HNBConfigInfo.o CC ConfigurationInformation.o CC HNBConfigurationInformationProvided.o CC HNBConfigurationInformationMissing.o CC HNB-Identity-Info.o CC HNB-Location-Information.o CC HNB-Identity.o CC IMEI.o CC IMSI.o CC IMSIDS41.o CC IMSIESN.o CC IP-Address.o CC Ipv4Address.o CC Ipv6Address.o CC Iurh-Signalling-TNL-AddressList.o CC LAC.o CC LAI.o CC MacroCoverageInformation.o CC MacroCellID.o CC MuxPortNumber.o CC NeighbourCellIdentityList.o CC NeighbourIdentity.o CC NeighbourInfoList.o CC AdditionalNeighbourInfoList.o CC NeighbourInfoRequestItem.o CC NeighbourInfoRequestList.o CC PLMNidentity.o CC PSC.o CC PTMSI.o CC PTMSIRAI.o CC RAB-ID.o CC RABList.o CC RABListItem.o PLMNidentity.c:166:1: fatal error: error writing to /tmp/cc2uYiUV.s: No space left on device }; ^ compilation terminated. PTMSIRAI.c:71:1: fatal error: closing dependency file .deps/PTMSIRAI.Tpo: No space left on device }; ^ compilation terminated. RABList.c:59:1: fatal error: error writing to /tmp/ccmE9T00.s: No space left on device }; ^ compilation terminated. CC RAC.o PSC.c:171:1: fatal error: error writing to /tmp/cc8NHXlX.s: No space left on device }; ^ compilation terminated. RABListItem.c:103:1: fatal error: error writing to /tmp/ccPuXnz2.s: No space left on device }; ^ compilation terminated. PTMSI.c:171:1: fatal error: error writing to /tmp/ccJFX5yW.s: No space left on device }; ^ compilation terminated. RAB-ID.c:171:1: fatal error: error writing to /tmp/ccQj4PcX.s: No space left on device }; ^ compilation terminated. RAC.c:166:1: fatal error: error writing to /tmp/cc3SnNm5.s: No space left on device }; ^ compilation terminated. make[4]: *** [PTMSIRAI.o] Error 1 make[4]: *** Waiting for unfinished jobs.... Makefile:766: recipe for target 'PTMSIRAI.o' failed Makefile:766: recipe for target 'RABList.o' failed make[4]: *** [RABList.o] Error 1 Makefile:766: recipe for target 'RABListItem.o' failed make[4]: *** [RABListItem.o] Error 1 The bug is not reproducible, so it is likely a hardware or OS problem. make[4]: *** [PLMNidentity.o] Error 1 Makefile:766: recipe for target 'PLMNidentity.o' failed The bug is not reproducible, so it is likely a hardware or OS problem. make[4]: *** [PSC.o] Error 1 Makefile:766: recipe for target 'PSC.o' failed The bug is not reproducible, so it is likely a hardware or OS problem. Makefile:766: recipe for target 'RAB-ID.o' failed make[4]: *** [RAB-ID.o] Error 1 The bug is not reproducible, so it is likely a hardware or OS problem. make[4]: *** [PTMSI.o] Error 1 Makefile:766: recipe for target 'PTMSI.o' failed The bug is not reproducible, so it is likely a hardware or OS problem. Makefile:766: recipe for target 'RAC.o' failed make[4]: *** [RAC.o] Error 1 make[4]: Leaving directory '/build/deps/osmo-iuh/src/hnbap' Makefile:631: recipe for target 'install-recursive' failed make[3]: Leaving directory '/build/deps/osmo-iuh/src' Makefile:790: recipe for target 'install' failed make[2]: Leaving directory '/build/deps/osmo-iuh/src' make[3]: *** [install-recursive] Error 1 make[2]: *** [install] Error 2 make[1]: *** [install-recursive] Error 1 Makefile:446: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-iuh' Makefile:745: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Dec 4 06:24:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 06:24:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7226?= In-Reply-To: <1318038266.1000.1543904253502.JavaMail.jenkins@jenkins.osmocom.org> References: <1318038266.1000.1543904253502.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1840375027.1006.1543904687281.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 763.93 KB...] checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.120-1263b > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' Making all in manuals make[3]: Entering directory '/build/doc/manuals' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/manuals' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr_lu_fsm.o CC vlr.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_reset.o CC a_iface_bssap.o CC msc_vty.o CC gsm_04_08.o CC a_iface.o CC gsm_04_08_cc.o CC gsm_04_11.o CC db.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o CC gsm_subscriber.o CC mncc.o CC mncc_builtin.o CC mncc_sock.o CC msc_ifaces.o CC msc_mgcp.o CC ran_conn.o CC rrlp.o CC silent_call.o CC sms_queue.o CC transaction.o CC osmo_msc.o CC ctrl_commands.o CC iu_dummy.o CC smpp_smsc.o CC smpp_openbsc.o CC smpp_vty.o smpp_openbsc.c: In function 'submit_to_sms': smpp_openbsc.c:173:2: warning: #warning Implement reply path [-Wcpp] #warning Implement reply path ^ CC smpp_utils.o AR libmsc.a make[3]: Leaving directory '/build/src/libmsc' Making all in osmo-msc make[3]: Entering directory '/build/src/osmo-msc' CC msc_main.o CCLD osmo-msc make[3]: Leaving directory '/build/src/osmo-msc' Making all in utils make[3]: Entering directory '/build/src/utils' CC smpp_mirror-smpp_mirror.o CCLD smpp_mirror make[3]: Leaving directory '/build/src/utils' make[3]: Entering directory '/build/src' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/src' make[2]: Leaving directory '/build/src' Making all in contrib make[2]: Entering directory '/build/contrib' Making all in systemd make[3]: Entering directory '/build/contrib/systemd' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/contrib/systemd' make[3]: Entering directory '/build/contrib' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/contrib' make[2]: Leaving directory '/build/contrib' Making all in tests make[2]: Entering directory '/build/tests' Making all in sms_queue make[3]: Entering directory '/build/tests/sms_queue' CC sms_queue_test.o CCLD sms_queue_test make[3]: Leaving directory '/build/tests/sms_queue' Making all in msc_vlr make[3]: Entering directory '/build/tests/msc_vlr' CC msc_vlr_test_no_authen.o CC msc_vlr_tests.o CC msc_vlr_test_umts_authen.o CC msc_vlr_test_gsm_authen.o CC msc_vlr_test_gsm_ciph.o CC msc_vlr_test_hlr_reject.o CC msc_vlr_test_authen_reuse.o CC msc_vlr_test_hlr_timeout.o CC msc_vlr_test_ms_timeout.o CC msc_vlr_test_reject_concurrency.o CC msc_vlr_test_call.o CC msc_vlr_test_rest.o CC msc_vlr_test_ss.o CCLD msc_vlr_test_authen_reuse CCLD msc_vlr_test_hlr_reject CCLD msc_vlr_test_hlr_timeout CCLD msc_vlr_test_reject_concurrency CCLD msc_vlr_test_rest CCLD msc_vlr_test_ss CCLD msc_vlr_test_umts_authen CCLD msc_vlr_test_call CCLD msc_vlr_test_ms_timeout msc_vlr_test_gsm_authen.c:1005:1: fatal error: error writing to /tmp/ccIqCrLF.s: No space left on device }; ^ compilation terminated. msc_vlr_test_no_authen.c:985:1: fatal error: error writing to /tmp/ccrJKSUF.s: No space left on device }; ^ compilation terminated. msc_vlr_test_gsm_ciph.c:1514:1: fatal error: error writing to /tmp/ccROu7LF.s: No space left on device }; ^ compilation terminated. The bug is not reproducible, so it is likely a hardware or OS problem. Makefile:758: recipe for target 'msc_vlr_test_gsm_authen.o' failed make[3]: *** [msc_vlr_test_gsm_authen.o] Error 1 make[3]: *** Waiting for unfinished jobs.... The bug is not reproducible, so it is likely a hardware or OS problem. Makefile:758: recipe for target 'msc_vlr_test_gsm_ciph.o' failed make[3]: *** [msc_vlr_test_gsm_ciph.o] Error 1 The bug is not reproducible, so it is likely a hardware or OS problem. Makefile:758: recipe for target 'msc_vlr_test_no_authen.o' failed make[3]: Leaving directory '/build/tests/msc_vlr' make[3]: *** [msc_vlr_test_no_authen.o] Error 1 Makefile:410: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:452: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:383: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Dec 4 06:32:01 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 06:32:01 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7220?= In-Reply-To: <72057235.1005.1543904681910.JavaMail.jenkins@jenkins.osmocom.org> References: <72057235.1005.1543904681910.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2131660872.1007.1543905121622.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Dec 4 06:32:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 06:32:31 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7227?= In-Reply-To: <1840375027.1006.1543904687281.JavaMail.jenkins@jenkins.osmocom.org> References: <1840375027.1006.1543904687281.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <542250646.1008.1543905151388.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 812.37 KB...] l-wx------ 1 build build 64 Dec 4 06:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 6811 0.0 0.0 39464 14260 ? S 06:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 6812 0.0 0.0 21474968752 11504 ? R 06:31 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc.cfg build 6819 0.0 0.0 4336 732 ? S 06:31 0:00 /bin/sh -c ps xua | grep osmo build 6821 0.0 0.0 11128 976 ? S 06:31 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgwL7hzn, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfgwL7hzn' > ls -l /proc/6811/fd total 0 lr-x------ 1 build build 64 Dec 4 06:31 0 -> pipe:[1984927317] l-wx------ 1 build build 64 Dec 4 06:31 1 -> pipe:[1984927318] lr-x------ 1 build build 64 Dec 4 06:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 4 06:31 2 -> pipe:[1984927319] l-wx------ 1 build build 64 Dec 4 06:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 6811 1.2 0.0 39752 14808 ? S 06:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 6822 0.0 0.0 21474973692 15564 ? R 06:31 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgwL7hzn build 6829 0.0 0.0 4336 728 ? S 06:31 0:00 /bin/sh -c ps xua | grep osmo build 6831 0.0 0.0 11128 1036 ? S 06:31 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgwL7hzn, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfgwL7hzn' > ls -l /proc/6811/fd total 0 lr-x------ 1 build build 64 Dec 4 06:31 0 -> pipe:[1984927317] l-wx------ 1 build build 64 Dec 4 06:31 1 -> pipe:[1984927318] lr-x------ 1 build build 64 Dec 4 06:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 4 06:31 2 -> pipe:[1984927319] l-wx------ 1 build build 64 Dec 4 06:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 6811 0.1 0.0 39752 14808 ? S 06:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 6832 0.0 0.0 21474973692 15520 ? D 06:31 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgwL7hzn build 6839 0.0 0.0 4336 724 ? S 06:31 0:00 /bin/sh -c ps xua | grep osmo build 6841 0.0 0.0 11128 1032 ? S 06:31 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/6811/fd total 0 lr-x------ 1 build build 64 Dec 4 06:31 0 -> pipe:[1984927317] l-wx------ 1 build build 64 Dec 4 06:31 1 -> pipe:[1984927318] lr-x------ 1 build build 64 Dec 4 06:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 4 06:31 2 -> pipe:[1984927319] l-wx------ 1 build build 64 Dec 4 06:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 6811 0.1 0.0 39752 14808 ? S 06:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 6842 0.0 0.0 21474973692 15532 ? D 06:31 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 6849 0.0 0.0 4336 808 ? S 06:31 0:00 /bin/sh -c ps xua | grep osmo build 6851 0.0 0.0 11128 996 ? S 06:31 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgttF8U9, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgttF8U9' > ls -l /proc/6811/fd total 0 lr-x------ 1 build build 64 Dec 4 06:31 0 -> pipe:[1984927317] l-wx------ 1 build build 64 Dec 4 06:31 1 -> pipe:[1984927318] lr-x------ 1 build build 64 Dec 4 06:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 4 06:31 2 -> pipe:[1984927319] l-wx------ 1 build build 64 Dec 4 06:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 6811 0.1 0.0 39752 14824 ? S 06:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 6852 0.0 0.0 21474968752 14284 ? R 06:32 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgttF8U9 build 6859 0.0 0.0 4336 728 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 6861 0.0 0.0 11128 940 ? S 06:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgttF8U9, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgttF8U9' > ls -l /proc/6811/fd total 0 lr-x------ 1 build build 64 Dec 4 06:31 0 -> pipe:[1984927317] l-wx------ 1 build build 64 Dec 4 06:31 1 -> pipe:[1984927318] lr-x------ 1 build build 64 Dec 4 06:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 4 06:31 2 -> pipe:[1984927319] l-wx------ 1 build build 64 Dec 4 06:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 6811 0.1 0.0 39752 14824 ? S 06:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 6862 0.0 0.0 21474973692 15720 ? D 06:32 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgttF8U9 build 6869 0.0 0.0 4336 768 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 6871 0.0 0.0 11128 960 ? S 06:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/6811/fd total 0 lr-x------ 1 build build 64 Dec 4 06:31 0 -> pipe:[1984927317] l-wx------ 1 build build 64 Dec 4 06:31 1 -> pipe:[1984927318] lr-x------ 1 build build 64 Dec 4 06:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 4 06:31 2 -> pipe:[1984927319] l-wx------ 1 build build 64 Dec 4 06:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 6811 0.1 0.0 39752 14824 ? S 06:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 6872 0.0 0.0 21474973692 15648 ? D 06:32 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 6879 0.0 0.0 4336 764 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 6881 0.0 0.0 11128 996 ? S 06:32 0:00 grep osmo Failed to verify src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg Current directory: /build Error was [Errno 104] Connection reset by peer Config was ! ! OsmoMSC configuration saved from vty ! line vty no login ! network network country code 1 mobile network code 1 short name OsmoMSC long name OsmoMSC encryption a5 0 rrlp mode none mm info 1 cs7 instance 0 point-code 0.23.1 asp asp-clnt-OsmoMSC-A 2905 0 m3ua remote-ip 127.0.0.5 cs7 instance 1 point-code 0.23.2 asp asp-clnt-OsmoMSC-Iu 2905 0 m3ua remote-ip 127.0.0.6 msc cs7-instance-a 0 cs7-instance-iu 1 mgw remote-ip 10.23.24.1 mgw remote-port 2427 mgw local-port 2728 assign-tmsi ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Socket: closing 127.0.0.1:4254 (0 sockets open) make[5]: *** [python-tests] Error 1 Makefile:696: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:706: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:558: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:410: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:452: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Dec 4 06:33:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 06:33:16 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--en?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7220?= In-Reply-To: <533520825.1004.1543904680034.JavaMail.jenkins@jenkins.osmocom.org> References: <533520825.1004.1543904680034.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1625899230.1009.1543905196764.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Dec 4 06:52:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 06:52:03 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#209?= In-Reply-To: <1884317031.979.1543819922755.JavaMail.jenkins@jenkins.osmocom.org> References: <1884317031.979.1543819922755.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1848781954.1011.1543906323188.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 168.25 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Dec 4 08:36:48 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 08:36:48 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7228?= In-Reply-To: <542250646.1008.1543905151388.JavaMail.jenkins@jenkins.osmocom.org> References: <542250646.1008.1543905151388.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <399712753.1013.1543912608258.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Dec 4 09:21:30 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 09:21:30 +0000 Subject: Change in osmo-ci[master]: osmo-mgw: don't try to build with transcoding In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12083 ) Change subject: osmo-mgw: don't try to build with transcoding ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I080cd331caec31c53a43090e6c19d23e31abdec6 Gerrit-Change-Number: 12083 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 04 Dec 2018 09:21:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 09:21:32 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 09:21:32 +0000 Subject: Change in osmo-ci[master]: osmo-mgw: don't try to build with transcoding In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12083 ) Change subject: osmo-mgw: don't try to build with transcoding ...................................................................... osmo-mgw: don't try to build with transcoding Do not build osmo-mgw twice anymore (once with "--enable-mgcp-transcoding" and once with "--disable-mgcp-transcoding"). configure.ac does not know these options. Change-Id: I080cd331caec31c53a43090e6c19d23e31abdec6 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 0 insertions(+), 6 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved osmith: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index e70d28e..edfcf99 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -135,8 +135,6 @@ - osmo-iuh - osmo-mgw: - a1_name: MGCP - a1: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding] concurrent: true cmd: > # keep first line with less indent to preserve newlines @@ -144,7 +142,6 @@ -e HOME=/build \ -e MAKE=make \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e MGCP="$MGCP" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index d485a5f..7572a20 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -222,8 +222,6 @@ master-osmo-sgsn - osmo-mgw: - a1_name: MGCP - a1: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding] concurrent: true cmd: > # keep first line with less indent to preserve newlines @@ -231,7 +229,6 @@ -e HOME=/build \ -e MAKE=make \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e MGCP="$MGCP" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -- To view, visit https://gerrit.osmocom.org/12083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I080cd331caec31c53a43090e6c19d23e31abdec6 Gerrit-Change-Number: 12083 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 09:21:47 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 09:21:47 +0000 Subject: Change in osmo-ci[master]: master-builds/gerrit: remove redundant GTP="$GTP" In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12084 ) Change subject: master-builds/gerrit: remove redundant GTP="$GTP" ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9238da3dd3c4461f82dc7c792f886177399be3dc Gerrit-Change-Number: 12084 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 04 Dec 2018 09:21:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 09:21:50 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 09:21:50 +0000 Subject: Change in osmo-ci[master]: master-builds/gerrit: remove redundant GTP="$GTP" In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12084 ) Change subject: master-builds/gerrit: remove redundant GTP="$GTP" ...................................................................... master-builds/gerrit: remove redundant GTP="$GTP" Variables for axes are already exported as environment variables. Change 'GTP="$GTP" ./contrib/jenkins.sh' to './contrib/jenkins.sh' to avoid confusion when introducing other variables. Change-Id: I9238da3dd3c4461f82dc7c792f886177399be3dc --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved osmith: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index edfcf99..a4cceee 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -89,7 +89,7 @@ - openggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: GTP="$GTP" ./contrib/jenkins.sh + cmd: ./contrib/jenkins.sh - osmo-bsc: concurrent: true @@ -126,7 +126,7 @@ - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: GTP="$GTP" ./contrib/jenkins.sh + cmd: ./contrib/jenkins.sh - osmo-gsm-manuals diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 7572a20..d251ef0 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -197,7 +197,7 @@ - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: GTP="$GTP" ./contrib/jenkins.sh --publish + cmd: ./contrib/jenkins.sh --publish trigger: master-osmo-sgsn - osmo-gmr: -- To view, visit https://gerrit.osmocom.org/12084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9238da3dd3c4461f82dc7c792f886177399be3dc Gerrit-Change-Number: 12084 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 09:24:05 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 09:24:05 +0000 Subject: Change in osmo-mgw[master]: jenkins.sh: remove leftover MGCP env variable In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12082 ) Change subject: jenkins.sh: remove leftover MGCP env variable ...................................................................... jenkins.sh: remove leftover MGCP env variable Jenkins currently runs the build twice, once with MGCP="--enable-mgcp-transcoding" and once with MGCP="--disable-mgcp-transcoding". The configure.ac does not have this parameter, so let's remove the confusing variable. This is in preparation for describing all environment variables used in jenkins.sh (follow up commit). Change-Id: I6223afef0f34d90170a691d7d5b1d9542c34c6b0 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 222bd8f..b0ef7de 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -37,12 +37,12 @@ cd "$base" autoreconf --install --force -./configure $MGCP --enable-vty-tests --enable-external-tests --enable-werror +./configure --enable-vty-tests --enable-external-tests --enable-werror $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="$MGCP --enable-vty-tests --enable-external-tests" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests" \ $MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/12082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6223afef0f34d90170a691d7d5b1d9542c34c6b0 Gerrit-Change-Number: 12082 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 09:26:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 09:26:56 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11827 to look at the new patch set (#16). Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... LCLS, TS 29.205: add GCR routines Add functions to encode and decode Global Call Reference as per 3GPP TS 29.205 Table B 2.1.9.1 add corresponding tests. Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Related: OS#2487 --- M include/Makefile.am A include/osmocom/gsm/gsm29205.h M src/gsm/Makefile.am A src/gsm/gsm29205.c M src/gsm/libosmogsm.map M tests/Makefile.am A tests/gsm29205/gsm29205_test.c A tests/gsm29205/gsm29205_test.ok M tests/testsuite.at 9 files changed, 248 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/11827/16 -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 16 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 09:26:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 09:26:56 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12020 to look at the new patch set (#10). Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... LCLS, TS 48.008: add GCR IE encoding/decoding * add functions to encode Global Call. Ref. from TS 29.205 as 3GPP TS 48.008 ?3.2.2.115 information element * add corresponding tests Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 105 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/12020/10 -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 09:26:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 09:26:56 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass2() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11826 to look at the new patch set (#21). Change subject: LCLS: add gsm0808_create_ass2() ...................................................................... LCLS: add gsm0808_create_ass2() It allows setting additional assignment parameters explicitly. Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Related: OS#2487 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 133 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/11826/21 -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 21 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 09:41:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 09:41:46 +0000 Subject: Change in libosmocore[master]: Add msgb_tl_put() helper In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12080 ) Change subject: Add msgb_tl_put() helper ...................................................................... Add msgb_tl_put() helper When adding complex TLV structures where length of V is not known in advance it's handy to be able to simply add Tag and save the pointer to the Length field so it can be updated once entire Value is added and its length is known. Change-Id: I8dc1e4880352833a0a49c1dd0d7cb4148ac43aff --- M include/osmocom/gsm/tlv.h 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index 1ab964a..51bedd6 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -324,6 +324,18 @@ return v_put(buf, val); } +/*! put (append) a TL fields to a \ref msgb + * \returns pointer to the length field so it can be updated after adding new information under specified tag */ +static inline uint8_t *msgb_tl_put(struct msgb *msg, uint8_t tag) +{ + uint8_t *len = msgb_v_put(msg, tag); + + /* reserve space for length, len points to this reserved space already */ + msgb_v_put(msg, 0); + + return len; +} + /*! put (append) a TV16 field to a \ref msgb * \returns pointer to first byte after newly-put information */ static inline uint8_t *msgb_tv16_put(struct msgb *msg, uint8_t tag, uint16_t val) -- To view, visit https://gerrit.osmocom.org/12080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8dc1e4880352833a0a49c1dd0d7cb4148ac43aff Gerrit-Change-Number: 12080 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 09:41:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 09:41:46 +0000 Subject: Change in libosmocore[master]: LCLS: update osmo_lcls struct In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12019 ) Change subject: LCLS: update osmo_lcls struct ...................................................................... LCLS: update osmo_lcls struct * use pointer to proper struct type for GCR * update comments to be useful for doxygen Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 --- M include/osmocom/gsm/gsm0808_utils.h 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index c5bf280..097bd76 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -60,10 +60,10 @@ /*! LCLS-related parameters from 3GPP TS 48.008 */ struct osmo_lcls { - enum gsm0808_lcls_config config; /* ?3.2.2.116 Configuration */ - enum gsm0808_lcls_control control; /* ?3.2.2.117 Connection Status Control */ - struct gsm0808_gcr *gcr; /* ?3.2.2.115 Global Call Reference */ - bool corr_needed; /* ?3.2.2.118 Correlation-Not-Needed */ + enum gsm0808_lcls_config config; /**< ?3.2.2.116 Configuration */ + enum gsm0808_lcls_control control; /**< ?3.2.2.117 Connection Status Control */ + struct gsm29205_gcr *gcr; /**< ?3.2.2.115 Global Call Reference */ + bool corr_needed; /**< ?3.2.2.118 Correlation-Not-Needed */ }; extern const struct value_string gsm0808_cell_id_discr_names[]; -- To view, visit https://gerrit.osmocom.org/12019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 Gerrit-Change-Number: 12019 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 09:52:01 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 09:52:01 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: WITH_MANUALS In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12045 to look at the new patch set (#6). Change subject: gerrit-verifications/master-builds: WITH_MANUALS ...................................................................... gerrit-verifications/master-builds: WITH_MANUALS Add a new "WITH_MANUALS" axis to all jobs generated by gerrit-verifications.yml and master-builds.yml, which already have at least one axis. Adjust the combination filters, so the manuals are generated (and published) only once. The contrib/jenkins.sh scripts will be adjusted to append --enable-manuals to the configure options, when WITH_MANUALS is set. For all jobs that do not have any axes, we can always append this flag. Two different methods of passing through the configure flags are used in both yml files already. One is creating a "WITH_VAR" variable with True and False as arguments. The other is creating a "VAR" variable with "--enable-foo" and "--disable-foo" as values. I decided to use the "WITH_VAR" approach, so we could use it to activate multiple configure options at once: --enable-manuals and --enable-man when the UNIX man pages feature gets implemented (OS#3386). Related: OS#3385 Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 80 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/12045/6 -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 09:52:01 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 09:52:01 +0000 Subject: Change in osmo-ci[master]: master-builds: use PUBLISH=1 instead of --publish Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12089 Change subject: master-builds: use PUBLISH=1 instead of --publish ...................................................................... master-builds: use PUBLISH=1 instead of --publish Pass all inputs to contrib/jenkins.sh as environment variables instead of mixing with commandline arguments. We decided on this method instead of I3cc01dbc57213b6d6cdc9b394a516510d045f1ae ("use jenkins.sh --publish"), to make the contrib/jenkins.sh scripts less confusing. Related: OS#3385 Change-Id: Ifc88af086368ce8eea1ea3a375ba7d5603a5d7e5 --- M jobs/master-builds.yml 1 file changed, 16 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/89/12089/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index d251ef0..cb6220b 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -16,7 +16,7 @@ a3: !!python/tuple [default] combination_filter: '' sequential: false - # most common build invocation (--publish is added to publish manual PDFs) + # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs) cmd: ./contrib/jenkins.sh wrappers: [] trigger: @@ -82,7 +82,7 @@ master-osmo-iuh, master-osmo-msc, master-osmo-sgsn - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - libosmocore: a1_name: arch @@ -173,10 +173,11 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - osmocom:amd64 /build/contrib/jenkins.sh --publish + osmocom:amd64 /build/contrib/jenkins.sh - osmo-bts: a1_name: FIRMWARE_VERSION @@ -192,12 +193,12 @@ (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") - cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL" --publish' + cmd: 'PUBLISH=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh trigger: master-osmo-sgsn - osmo-gmr: @@ -210,7 +211,7 @@ ./contrib/jenkins.sh - osmo-hlr: - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - osmo-iuh: # Full triggers would be: @@ -231,10 +232,11 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - osmocom:amd64 /build/contrib/jenkins.sh --publish + osmocom:amd64 /build/contrib/jenkins.sh trigger: master-osmo-msc, master-osmo-bsc - osmo-msc: @@ -254,11 +256,12 @@ -e IU="$IU" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e PUBLISH="1" \ -w /build -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - osmocom:amd64 /build/contrib/jenkins.sh --publish + osmocom:amd64 /build/contrib/jenkins.sh - osmo-pcap @@ -281,7 +284,7 @@ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") || (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master") - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - osmo-sgsn: a1_name: IU @@ -296,14 +299,15 @@ -e IU="$IU" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - osmocom:amd64 /build/contrib/jenkins.sh --publish + osmocom:amd64 /build/contrib/jenkins.sh - osmo-sip-connector: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org holger at freyther.de - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - osmo-tetra: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org 246tnt at gmail.com @@ -314,7 +318,7 @@ # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] concurrent: true - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - osmocom-bb - osmo-sysmon -- To view, visit https://gerrit.osmocom.org/12089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc88af086368ce8eea1ea3a375ba7d5603a5d7e5 Gerrit-Change-Number: 12089 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Dec 4 10:04:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 10:04:49 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?disable-mgcp-transcoding,--enable?= =?UTF-8?Q?-smpp,osmocom-master-debian9_#3329?= In-Reply-To: <473628274.1002.1543904257568.JavaMail.jenkins@jenkins.osmocom.org> References: <473628274.1002.1543904257568.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1153775751.1015.1543917889002.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Dec 4 10:06:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 10:06:23 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?enable-mgcp-transcoding,--enable-?= =?UTF-8?Q?smpp,osmocom-master-debian9_#3329?= In-Reply-To: <2120203249.1001.1543904255330.JavaMail.jenkins@jenkins.osmocom.org> References: <2120203249.1001.1543904255330.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1770001509.1016.1543917983971.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Dec 4 10:15:03 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 10:15:03 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12090 Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add a PUBLISH environment variable, which will be set by the master-builds Jenkins job. When it is set, upload the generated PDFs. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters on top of jenkins.sh. Related: OS#3385 Change-Id: Ia5b112fc1663b78800d3c2c4ff2a0771cf5af11b --- M contrib/jenkins.sh 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/90/12090/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5f81978..f065910 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,12 @@ #!/bin/sh # jenkins build helper script for osmo-pcu. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * with_dsp: the DSP to configure ("sysmo", "lc15" or "none") +# * with_vty: enable VTY tests if set to "True" +# * WITH_MANUALS: build manual PDFs if set to "True" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "True") +# if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -65,6 +72,12 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +if [ "$WITH_MANUALS" = "True" ]; then + osmo-build-dep.sh osmo-gsm-manuals + PCU_CONFIG="$PCU_CONFIG --enable-manuals" +fi set +x echo @@ -81,4 +94,8 @@ $MAKE distcheck \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "True" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5b112fc1663b78800d3c2c4ff2a0771cf5af11b Gerrit-Change-Number: 12090 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 10:16:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 10:16:40 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11976 to look at the new patch set (#6). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add a PUBLISH environment variable, which will be set by the master-builds Jenkins job. When it is set, upload the generated PDFs. Related: OS#3385 Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 --- M contrib/jenkins.sh 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/76/11976/6 -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 10:17:24 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 10:17:24 +0000 Subject: Change in osmo-ggsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12063 to look at the new patch set (#3). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add a PUBLISH environment variable, which will be set by the master-builds Jenkins job. When it is set, upload the generated PDFs. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters on top of jenkins.sh. Related: OS#3385 Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/63/12063/3 -- To view, visit https://gerrit.osmocom.org/12063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b Gerrit-Change-Number: 12063 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 10:18:02 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 10:18:02 +0000 Subject: Change in libosmo-sccp[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12064 to look at the new patch set (#3). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add a PUBLISH environment variable, which will be set by the master-builds Jenkins job. When it is set, upload the generated PDFs. Related: OS#3385 Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 --- M contrib/jenkins.sh 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/12064/3 -- To view, visit https://gerrit.osmocom.org/12064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 Gerrit-Change-Number: 12064 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 10:18:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 10:18:40 +0000 Subject: Change in osmo-bsc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11972 to look at the new patch set (#4). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add a PUBLISH environment variable, which will be set by the master-builds Jenkins job. When it is set, upload the generated PDFs. Related: OS#3385 Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 --- M contrib/jenkins.sh 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/72/11972/4 -- To view, visit https://gerrit.osmocom.org/11972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 Gerrit-Change-Number: 11972 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 10:19:13 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 10:19:13 +0000 Subject: Change in osmo-msc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12081 to look at the new patch set (#4). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add a PUBLISH environment variable, which will be set by the master-builds Jenkins job. When it is set, upload the generated PDFs. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters on top of jenkins.sh. Related: OS#3385 Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/81/12081/4 -- To view, visit https://gerrit.osmocom.org/12081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 Gerrit-Change-Number: 12081 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 10:20:08 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 10:20:08 +0000 Subject: Change in osmo-sgsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12066 to look at the new patch set (#3). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add a PUBLISH environment variable, which will be set by the master-builds Jenkins job. When it is set, upload the generated PDFs. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters on top of jenkins.sh. Related: OS#3385 Change-Id: Ic45322c809f9f65d0fd24b828dab0cd929fa6267 --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/66/12066/3 -- To view, visit https://gerrit.osmocom.org/12066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic45322c809f9f65d0fd24b828dab0cd929fa6267 Gerrit-Change-Number: 12066 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 10:20:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 10:20:39 +0000 Subject: Change in osmo-trx[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12075 to look at the new patch set (#3). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add a PUBLISH environment variable, which will be set by the master-builds Jenkins job. When it is set, upload the generated PDFs. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters on top of jenkins.sh. Related: OS#3385 Change-Id: I54fdd18e405b2c84762ea06d91359867ceec8184 --- M contrib/jenkins.sh 1 file changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/75/12075/3 -- To view, visit https://gerrit.osmocom.org/12075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I54fdd18e405b2c84762ea06d91359867ceec8184 Gerrit-Change-Number: 12075 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 10:21:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 10:21:26 +0000 Subject: Change in osmo-sip-connector[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12074 to look at the new patch set (#4). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add a PUBLISH environment variable, which will be set by the master-builds Jenkins job. When it is set, upload the generated PDFs. Related: OS#3385 Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 --- M contrib/jenkins.sh 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/74/12074/4 -- To view, visit https://gerrit.osmocom.org/12074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 Gerrit-Change-Number: 12074 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 10:23:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 10:23:53 +0000 Subject: Change in osmo-bts[master]: contrib/jenkins_*.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12076 to look at the new patch set (#3). Change subject: contrib/jenkins_*.sh: build and publish manuals ...................................................................... contrib/jenkins_*.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add a PUBLISH environment variable, which will be set by the master-builds Jenkins job. When it is set, upload the generated PDFs. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters on top of jenkins_bts_model.sh. Change the top description line to look like all the other contrib/jenkins.sh files (from other repositories), so it is clear that this is the entry point of Jenkins (and not the other contrib/jenkins*.sh scripts). Related: OS#3385 Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860 --- M contrib/jenkins_bts_model.sh M contrib/jenkins_common.sh 2 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/76/12076/3 -- To view, visit https://gerrit.osmocom.org/12076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860 Gerrit-Change-Number: 12076 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 10:24:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 10:24:26 +0000 Subject: Change in osmo-mgw[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12065 to look at the new patch set (#5). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add a PUBLISH environment variable, which will be set by the master-builds Jenkins job. When it is set, upload the generated PDFs. Related: OS#3385 Change-Id: I24179b21ce4ff182649243e286c87c824b889454 --- M contrib/jenkins.sh 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/12065/5 -- To view, visit https://gerrit.osmocom.org/12065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I24179b21ce4ff182649243e286c87c824b889454 Gerrit-Change-Number: 12065 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 10:32:47 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 10:32:47 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12046 to look at the new patch set (#4). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add a PUBLISH environment variable, which will be set by the master-builds Jenkins job. When it is set, upload the generated PDFs. This project is usually built in various configurations. Add WITH_MANUALS to only build the manuals in one of these configurations, and describe all input parameters on top of jenkins.sh. Related: OS#3385 Change-Id: Id460a932431b46b88937d96637edd209ca56db97 --- M contrib/jenkins.sh 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/12046/4 -- To view, visit https://gerrit.osmocom.org/12046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id460a932431b46b88937d96637edd209ca56db97 Gerrit-Change-Number: 12046 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Holger Freyther Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:12:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 11:12:51 +0000 Subject: Change in osmo-ci[master]: master-builds: use PUBLISH=1 instead of --publish In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12089 ) Change subject: master-builds: use PUBLISH=1 instead of --publish ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc88af086368ce8eea1ea3a375ba7d5603a5d7e5 Gerrit-Change-Number: 12089 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 11:12:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:15:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 11:15:02 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12090 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5b112fc1663b78800d3c2c4ff2a0771cf5af11b Gerrit-Change-Number: 12090 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 11:15:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:15:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 11:15:28 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11976 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 04 Dec 2018 11:15:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:16:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 11:16:56 +0000 Subject: Change in osmo-ggsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12063 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b Gerrit-Change-Number: 12063 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 11:16:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:17:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 11:17:34 +0000 Subject: Change in libosmo-sccp[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12064 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 Gerrit-Change-Number: 12064 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 11:17:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:18:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 11:18:28 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11976 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/11976/6/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/11976/6/contrib/jenkins.sh at 33 PS6, Line 33: osmo-build-dep.sh osmo-gsm-manuals For projectes where we don't have a build matrix (so we always build manuals), I think it would make more sense to still have the WITH_MANUALS check here, and pass the env var in all cases. -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 04 Dec 2018 11:18:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:19:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 11:19:24 +0000 Subject: Change in osmo-bsc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11972 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11972/4/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/11972/4/contrib/jenkins.sh at 54 PS4, Line 54: DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror" \ enable manuals is missing here? or we don't care about building manuals through distcheck? -- To view, visit https://gerrit.osmocom.org/11972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 Gerrit-Change-Number: 11972 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 11:19:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:43:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 11:43:53 +0000 Subject: Change in osmo-trx[master]: lms: Close device on LMS_Init failure Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12091 Change subject: lms: Close device on LMS_Init failure ...................................................................... lms: Close device on LMS_Init failure Change-Id: I0b307452a9e122a0ea39a46f096423c9a5293d30 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/91/12091/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 144f75d..712652a 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -135,7 +135,7 @@ LOGC(DDEV, INFO) << "Init LMS device"; if (LMS_Init(m_lms_dev) != 0) { LOGC(DDEV, ERROR) << "LMS_Init() failed"; - return -1; + goto out_close; } if (LMS_GetSampleRateRange(m_lms_dev, LMS_CH_RX, &range_sr)) -- To view, visit https://gerrit.osmocom.org/12091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0b307452a9e122a0ea39a46f096423c9a5293d30 Gerrit-Change-Number: 12091 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:46:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 11:46:14 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11827 to look at the new patch set (#17). Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... LCLS, TS 29.205: add GCR routines Add functions to encode and decode Global Call Reference as per 3GPP TS 29.205 Table B 2.1.9.1 add corresponding tests. Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Related: OS#2487 --- M include/Makefile.am A include/osmocom/gsm/gsm29205.h M src/gsm/Makefile.am A src/gsm/gsm29205.c M src/gsm/libosmogsm.map M tests/Makefile.am A tests/gsm29205/gsm29205_test.c A tests/gsm29205/gsm29205_test.ok M tests/testsuite.at 9 files changed, 250 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/11827/17 -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 17 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:46:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 11:46:14 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12020 to look at the new patch set (#11). Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... LCLS, TS 48.008: add GCR IE encoding/decoding * add functions to encode Global Call. Ref. from TS 29.205 as 3GPP TS 48.008 ?3.2.2.115 information element * add corresponding tests Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 107 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/12020/11 -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 11 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:46:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 11:46:14 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass2() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11826 to look at the new patch set (#22). Change subject: LCLS: add gsm0808_create_ass2() ...................................................................... LCLS: add gsm0808_create_ass2() It allows setting additional assignment parameters explicitly. Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Related: OS#2487 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 135 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/11826/22 -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 22 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:46:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 11:46:15 +0000 Subject: Change in libosmocore[master]: Allow log_init() with NULL log_info Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12092 Change subject: Allow log_init() with NULL log_info ...................................................................... Allow log_init() with NULL log_info Since we have library-internal categories we don't have to force application to supply its own categories. This is especially useful for testing code inside libosmocore which only use internal categories anyway. Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 --- M src/logging.c 1 file changed, 13 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/92/12092/1 diff --git a/src/logging.c b/src/logging.c index e7cc472..908ba54 100644 --- a/src/logging.c +++ b/src/logging.c @@ -964,10 +964,14 @@ if (!osmo_log_info) return -ENOMEM; - osmo_log_info->filter_fn = inf->filter_fn; - osmo_log_info->num_cat_user = inf->num_cat; - /* total number = number of user cat + library cat */ - osmo_log_info->num_cat = inf->num_cat + ARRAY_SIZE(internal_cat); + osmo_log_info->num_cat = ARRAY_SIZE(internal_cat); + + if (inf) { + osmo_log_info->filter_fn = inf->filter_fn; + osmo_log_info->num_cat_user = inf->num_cat; + /* total number = number of user cat + library cat */ + osmo_log_info->num_cat += inf->num_cat; + } osmo_log_info->cat = talloc_zero_array(osmo_log_info, struct log_info_cat, @@ -978,12 +982,11 @@ return -ENOMEM; } - /* copy over the user part */ - for (i = 0; i < inf->num_cat; i++) { - memcpy((struct log_info_cat *) &osmo_log_info->cat[i], - &inf->cat[i], - sizeof(struct log_info_cat)); - } + if (inf) /* copy over the user part */ + for (i = 0; i < inf->num_cat; i++) { + memcpy((struct log_info_cat *) &osmo_log_info->cat[i], + &inf->cat[i], sizeof(struct log_info_cat)); + } /* copy over the library part */ for (i = 0; i < ARRAY_SIZE(internal_cat); i++) { -- To view, visit https://gerrit.osmocom.org/12092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 Gerrit-Change-Number: 12092 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:46:16 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 11:46:16 +0000 Subject: Change in libosmocore[master]: Log: add stdout target Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12093 Change subject: Log: add stdout target ...................................................................... Log: add stdout target This is useful for code testing internal library functions which allows to automatically fail tests due to output mismatch. As a side-effect this also simplifies #if-#else logic due to both _stdout() and _stderr() now being simple wrappers around static function. No user-visible changes are introduced because stdout is ignored by vty code to avoid messing up vty output. Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 --- M include/osmocom/core/logging.h M src/logging.c M src/vty/logging_vty.c 3 files changed, 37 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/93/12093/1 diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 295e5a8..4a835ff 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -218,6 +218,7 @@ LOG_TGT_TYPE_SYSLOG, /*!< syslog based logging */ LOG_TGT_TYPE_FILE, /*!< text file logging */ LOG_TGT_TYPE_STDERR, /*!< stderr logging */ + LOG_TGT_TYPE_STDOUT, /*!< stdout logging */ LOG_TGT_TYPE_STRRB, /*!< osmo_strrb-backed logging */ LOG_TGT_TYPE_GSMTAP, /*!< GSMTAP network logging */ }; @@ -361,6 +362,7 @@ struct log_target *log_target_create(void); void log_target_destroy(struct log_target *target); struct log_target *log_target_create_stderr(void); +struct log_target *log_target_create_stdout(void); struct log_target *log_target_create_file(const char *fname); struct log_target *log_target_create_syslog(const char *ident, int option, int facility); diff --git a/src/logging.c b/src/logging.c index 908ba54..31345d1 100644 --- a/src/logging.c +++ b/src/logging.c @@ -810,24 +810,45 @@ return target; } -/*! Create the STDERR log target - * \returns dynamically-allocated \ref log_target for STDERR */ -struct log_target *log_target_create_stderr(void) +static struct log_target *_log_target_create_std(FILE *out, enum log_target_type lt) { -/* since C89/C99 says stderr is a macro, we can safely do this! */ -#if !EMBEDDED && defined(stderr) +#if !EMBEDDED struct log_target *target; target = log_target_create(); if (!target) return NULL; - target->type = LOG_TGT_TYPE_STDERR; - target->tgt_file.out = stderr; + target->type = lt; + target->tgt_file.out = out; target->output = _file_output; return target; #else return NULL; +#endif +} + +/*! Create the STDOUT log target + * \returns dynamically-allocated \ref log_target for STDOUT */ +struct log_target *log_target_create_stdout(void) +{ +/* since C89/C99 says stdout is a macro, we can safely do this! */ +#if defined(stdout) + return _log_target_create_std(stdout, LOG_TGT_TYPE_STDOUT); +#else + return NULL; +#endif /* stdout */ +} + +/*! Create the STDERR log target + * \returns dynamically-allocated \ref log_target for STDERR */ +struct log_target *log_target_create_stderr(void) +{ +/* since C89/C99 says stderr is a macro, we can safely do this! */ +#if defined(stderr) + return _log_target_create_std(stderr, LOG_TGT_TYPE_STDERR); +#else + return NULL; #endif /* stderr */ } @@ -900,6 +921,10 @@ /* don't close stderr */ if (target->tgt_file.out != stderr) #endif +#ifdef stdout + /* don't close stdout */ + if (target->tgt_file.out != stdout) +#endif { fclose(target->tgt_file.out); target->tgt_file.out = NULL; diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index f3e1419..e2d2b57 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -877,6 +877,9 @@ case LOG_TGT_TYPE_STDERR: vty_out(vty, "log stderr%s", VTY_NEWLINE); break; + case LOG_TGT_TYPE_STDOUT: + /* we don't support vty logging to stdout to avoid messing up vty prompt and user input */ + break; case LOG_TGT_TYPE_SYSLOG: #ifdef HAVE_SYSLOG_H vty_out(vty, "log syslog %s%s", -- To view, visit https://gerrit.osmocom.org/12093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 Gerrit-Change-Number: 12093 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:46:16 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 11:46:16 +0000 Subject: Change in libosmocore[master]: Add osmo_init_logging_std*() Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12094 Change subject: Add osmo_init_logging_std*() ...................................................................... Add osmo_init_logging_std*() The osmo_init_logging_stdout() function is similar to osmo_init_logging2() but uses stdout as a default log target instead of stderr. It's expected to used by applications without vty (test code for example). The osmo_init_logging_stderr() is equivalent of osmo_init_logging2() implemented on top of the same primitives as osmo_init_logging_stdout(). Logging test expanded to make sure that we only initialize logging once. Change-Id: I0fe8dc4a41aba4e4509540266e229700e8ec083c --- M include/osmocom/core/application.h M src/application.c M tests/logging/logging_vty_test.c 3 files changed, 51 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/12094/1 diff --git a/include/osmocom/core/application.h b/include/osmocom/core/application.h index edf59ed..c1e5b09 100644 --- a/include/osmocom/core/application.h +++ b/include/osmocom/core/application.h @@ -13,12 +13,15 @@ /*! one instance of a logging target (file, stderr, ...) */ struct log_target; -/*! the default logging target, logging to stderr */ +/*! the default logging targets, logging to stderr or stdout */ extern struct log_target *osmo_stderr_target; +extern struct log_target *osmo_stdout_target; void osmo_init_ignore_signals(void); int osmo_init_logging(const struct log_info *) OSMO_DEPRECATED("use osmo_init_logging2() instead to avoid a NULL talloc ctx"); int osmo_init_logging2(void *ctx, const struct log_info *log_info); +int osmo_init_logging_stdout(void *ctx, const struct log_info *log_info); +int osmo_init_logging_stderr(void *ctx, const struct log_info *log_info); int osmo_daemonize(void); diff --git a/src/application.c b/src/application.c index d912eb7..19e089b 100644 --- a/src/application.c +++ b/src/application.c @@ -83,6 +83,7 @@ #include struct log_target *osmo_stderr_target; +struct log_target *osmo_stdout_target; static void sighup_hdlr(int signal) { @@ -117,7 +118,7 @@ return osmo_init_logging2(NULL, log_info); } -int osmo_init_logging2(void *ctx, const struct log_info *log_info) +static int _init_logging_std(void *ctx, const struct log_info *log_info) { static int logging_initialized = 0; @@ -126,15 +127,52 @@ logging_initialized = 1; log_init(log_info, ctx); - osmo_stderr_target = log_target_create_stderr(); + + return 0; +} + +static struct log_target *_add_logging_std(struct log_target *std) +{ + if (!std) + return NULL; + + log_add_target(std); + log_set_all_filter(std, 1); + + return std; +} + +int osmo_init_logging_stdout(void *ctx, const struct log_info *log_info) +{ + int rc = _init_logging_std(ctx, log_info); + if (rc < 0) + return rc; + + osmo_stdout_target = _add_logging_std(log_target_create_stdout()); + if (!osmo_stdout_target) + return -1; + + return 0; +} + +int osmo_init_logging_stderr(void *ctx, const struct log_info *log_info) +{ + int rc = _init_logging_std(ctx, log_info); + if (rc < 0) + return rc; + + osmo_stderr_target = _add_logging_std(log_target_create_stderr()); if (!osmo_stderr_target) return -1; - log_add_target(osmo_stderr_target); - log_set_all_filter(osmo_stderr_target, 1); return 0; } +int osmo_init_logging2(void *ctx, const struct log_info *log_info) +{ + return osmo_init_logging_stderr(ctx, log_info); +} + /*! Turn the current process into a background daemon * * This function will fork the process, exit the parent and set umask, diff --git a/tests/logging/logging_vty_test.c b/tests/logging/logging_vty_test.c index 806a460..0bdb11d 100644 --- a/tests/logging/logging_vty_test.c +++ b/tests/logging/logging_vty_test.c @@ -242,6 +242,11 @@ osmo_init_logging2(root_ctx, &log_info); + if (osmo_init_logging_stderr(root_ctx, &log_info) == 0) { + LOGP(DLGLOBAL, LOGL_FATAL, "Subsequent logging init has not failed!\n"); + return 3; + } + vty_commands_init(); handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/12094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0fe8dc4a41aba4e4509540266e229700e8ec083c Gerrit-Change-Number: 12094 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:46:16 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 11:46:16 +0000 Subject: Change in libosmocore[master]: Logging: don't print hex category by default Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12095 Change subject: Logging: don't print hex category by default ...................................................................... Logging: don't print hex category by default This information is of little use and unnecessarily confuse users. We also unset it while testing internally. Let's not set this option by default and let applications enable it explicitly if necessary. Change-Id: I6dc3898958cf60147ad73c52cf0b3990bd26359e --- M src/application.c M tests/logging/logging_vty_test.c 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/12095/1 diff --git a/src/application.c b/src/application.c index 19e089b..01fda6f 100644 --- a/src/application.c +++ b/src/application.c @@ -138,6 +138,7 @@ log_add_target(std); log_set_all_filter(std, 1); + log_set_print_category_hex(std, 0); return std; } diff --git a/tests/logging/logging_vty_test.c b/tests/logging/logging_vty_test.c index 0bdb11d..b177e31 100644 --- a/tests/logging/logging_vty_test.c +++ b/tests/logging/logging_vty_test.c @@ -255,7 +255,6 @@ osmo_talloc_vty_add_cmds(); log_set_print_category(osmo_stderr_target, 1); - log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_level(osmo_stderr_target, 1); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); -- To view, visit https://gerrit.osmocom.org/12095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6dc3898958cf60147ad73c52cf0b3990bd26359e Gerrit-Change-Number: 12095 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:46:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 11:46:30 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 11:46:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:48:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 11:48:44 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12017 to look at the new patch set (#9). Change subject: msgb: add test helpers ...................................................................... msgb: add test helpers It's often handy to compare certain msgb layer to a given array and print the position where they differ. Add simple pretty-printer and corresponding L* wrappers. Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 --- M include/osmocom/core/msgb.h M src/msgb.c 2 files changed, 231 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/12017/9 -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:50:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 11:50:19 +0000 Subject: Change in libosmocore[master]: Allow log_init() with NULL log_info In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12092 ) Change subject: Allow log_init() with NULL log_info ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/12092/1/src/logging.c File src/logging.c: https://gerrit.osmocom.org/#/c/12092/1/src/logging.c at 951 PS1, Line 951: * \param[in] inf Information regarding logging categories Document new behavior. https://gerrit.osmocom.org/#/c/12092/1/src/logging.c at 972 PS1, Line 972: /* total number = number of user cat + library cat */ Commment IMHO not needed. https://gerrit.osmocom.org/#/c/12092/1/src/logging.c at 985 PS1, Line 985: if (inf) /* copy over the user part */ multiline condition, please better add {} -- To view, visit https://gerrit.osmocom.org/12092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 Gerrit-Change-Number: 12092 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 11:50:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 11:58:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 11:58:51 +0000 Subject: Change in libosmocore[master]: Log: add stdout target In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12093 ) Change subject: Log: add stdout target ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/12093/1/src/logging.c File src/logging.c: https://gerrit.osmocom.org/#/c/12093/1/src/logging.c at 813 PS1, Line 813: static struct log_target *_log_target_create_std(FILE *out, enum log_target_type lt) _log_target_create_fp would be more descriptive. https://gerrit.osmocom.org/#/c/12093/1/src/logging.c at 926 PS1, Line 926: if (target->tgt_file.out != stdout) This looks wrong or at least really messy. https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c File src/vty/logging_vty.c: https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c at 881 PS1, Line 881: /* we don't support vty logging to stdout to avoid messing up vty prompt and user input */ I don't get what's the issue here. -- To view, visit https://gerrit.osmocom.org/12093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 Gerrit-Change-Number: 12093 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 11:58:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:00:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:00:31 +0000 Subject: Change in libosmocore[master]: Logging: don't print hex category by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12095 ) Change subject: Logging: don't print hex category by default ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12095/2/src/application.c File src/application.c: https://gerrit.osmocom.org/#/c/12095/2/src/application.c at 141 PS2, Line 141: log_set_print_category_hex(std, 0); Should we then add log_set_print_category(std, 1) here? -- To view, visit https://gerrit.osmocom.org/12095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6dc3898958cf60147ad73c52cf0b3990bd26359e Gerrit-Change-Number: 12095 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Dec 2018 12:00:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:01:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 12:01:28 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Patch Set 5: (1 comment) > I usually end up tailoring the debug output to the specific test. You can continue doing that. I use those helpers in tests in 2 different patches in this series and it seem to work quite fine. I don't intend to accommodate to every imaginable use-case. > when an error occurs, I sometimes needed the position of the difference indicated (usually only during development cycles) That was main motivation for me as well. > Could add hex string API (in a later patch?) I'm not really sure how this should look like so I think it's better to be expanded by the person who'd use it that way. It's simply more efficient than me trying to guess someone else's use-case and devise API for it. > and could add difference position indicator (in a later patch?). It's already there - the position is indicated by !! sign when printing msgb and data arrays side-by-side. > Might be interesting to take a look through other msgb/buffer printing routines flying around in various tests today? Maybe figure out a smaller set of API satisfying all cases? I'd rather not spend too much time on this. This patch emerged as a simple way to aid in testing LCLS-related encoders/decoders where I've got to compare rather long arrays and wanted to be able to easily see where they differ. It would be nice to digg through msgb API but I'm afraid there're more pressing tasks ATM. https://gerrit.osmocom.org/#/c/12017/5/src/msgb.c File src/msgb.c: https://gerrit.osmocom.org/#/c/12017/5/src/msgb.c at 198 PS5, Line 198: printf > one slight problem with LOGP could be that in regression tests, we often only check stdout. That should be fixed by additional patches before this one in latest revision. -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 12:01:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:03:08 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 12:03:08 +0000 Subject: Change in osmo-ci[master]: master-builds: use PUBLISH=1 instead of --publish In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12089 ) Change subject: master-builds: use PUBLISH=1 instead of --publish ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc88af086368ce8eea1ea3a375ba7d5603a5d7e5 Gerrit-Change-Number: 12089 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 04 Dec 2018 12:03:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:03:15 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 12:03:15 +0000 Subject: Change in osmo-ci[master]: master-builds: use PUBLISH=1 instead of --publish In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12089 ) Change subject: master-builds: use PUBLISH=1 instead of --publish ...................................................................... master-builds: use PUBLISH=1 instead of --publish Pass all inputs to contrib/jenkins.sh as environment variables instead of mixing with commandline arguments. We decided on this method instead of I3cc01dbc57213b6d6cdc9b394a516510d045f1ae ("use jenkins.sh --publish"), to make the contrib/jenkins.sh scripts less confusing. Related: OS#3385 Change-Id: Ifc88af086368ce8eea1ea3a375ba7d5603a5d7e5 --- M jobs/master-builds.yml 1 file changed, 16 insertions(+), 12 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved osmith: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index d251ef0..cb6220b 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -16,7 +16,7 @@ a3: !!python/tuple [default] combination_filter: '' sequential: false - # most common build invocation (--publish is added to publish manual PDFs) + # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs) cmd: ./contrib/jenkins.sh wrappers: [] trigger: @@ -82,7 +82,7 @@ master-osmo-iuh, master-osmo-msc, master-osmo-sgsn - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - libosmocore: a1_name: arch @@ -173,10 +173,11 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - osmocom:amd64 /build/contrib/jenkins.sh --publish + osmocom:amd64 /build/contrib/jenkins.sh - osmo-bts: a1_name: FIRMWARE_VERSION @@ -192,12 +193,12 @@ (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") - cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL" --publish' + cmd: 'PUBLISH=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh trigger: master-osmo-sgsn - osmo-gmr: @@ -210,7 +211,7 @@ ./contrib/jenkins.sh - osmo-hlr: - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - osmo-iuh: # Full triggers would be: @@ -231,10 +232,11 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - osmocom:amd64 /build/contrib/jenkins.sh --publish + osmocom:amd64 /build/contrib/jenkins.sh trigger: master-osmo-msc, master-osmo-bsc - osmo-msc: @@ -254,11 +256,12 @@ -e IU="$IU" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e PUBLISH="1" \ -w /build -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - osmocom:amd64 /build/contrib/jenkins.sh --publish + osmocom:amd64 /build/contrib/jenkins.sh - osmo-pcap @@ -281,7 +284,7 @@ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") || (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master") - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - osmo-sgsn: a1_name: IU @@ -296,14 +299,15 @@ -e IU="$IU" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ - osmocom:amd64 /build/contrib/jenkins.sh --publish + osmocom:amd64 /build/contrib/jenkins.sh - osmo-sip-connector: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org holger at freyther.de - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - osmo-tetra: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org 246tnt at gmail.com @@ -314,7 +318,7 @@ # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] concurrent: true - cmd: ./contrib/jenkins.sh --publish + cmd: PUBLISH=1 ./contrib/jenkins.sh - osmocom-bb - osmo-sysmon -- To view, visit https://gerrit.osmocom.org/12089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifc88af086368ce8eea1ea3a375ba7d5603a5d7e5 Gerrit-Change-Number: 12089 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:06:05 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 12:06:05 +0000 Subject: Change in libosmocore[master]: Log: add stdout target In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12093 ) Change subject: Log: add stdout target ...................................................................... Patch Set 1: (2 comments) As for rename - I can change it in the next revision. https://gerrit.osmocom.org/#/c/12093/1/src/logging.c File src/logging.c: https://gerrit.osmocom.org/#/c/12093/1/src/logging.c at 926 PS1, Line 926: if (target->tgt_file.out != stdout) > This looks wrong or at least really messy. Could you elaborate? How else should it look like? And why you think it's wrong? https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c File src/vty/logging_vty.c: https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c at 881 PS1, Line 881: /* we don't support vty logging to stdout to avoid messing up vty prompt and user input */ > I don't get what's the issue here. Vty code prints to stdout. If we log to stdout as well, than user will see vty prompts interspersed with log output which looks really messy. That's why I'm reluctant to add stdout target to vty. -- To view, visit https://gerrit.osmocom.org/12093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 Gerrit-Change-Number: 12093 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:06:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:06:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:06:14 +0000 Subject: Change in libosmocore[master]: Add osmo_init_logging_std*() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12094 ) Change subject: Add osmo_init_logging_std*() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12094/1/tests/logging/logging_vty_test.c File tests/logging/logging_vty_test.c: https://gerrit.osmocom.org/#/c/12094/1/tests/logging/logging_vty_test.c at 245 PS1, Line 245: if (osmo_init_logging_stderr(root_ctx, &log_info) == 0) { AFAIU from application.c, this log_info is not applied, since logging_initialized is already 1 because osmo_init_logging2 was called before. So unless there's something I'm missing, there's something not really working here. -- To view, visit https://gerrit.osmocom.org/12094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0fe8dc4a41aba4e4509540266e229700e8ec083c Gerrit-Change-Number: 12094 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:06:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:07:51 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 12:07:51 +0000 Subject: Change in libosmocore[master]: Add osmo_init_logging_std*() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12094 ) Change subject: Add osmo_init_logging_std*() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12094/1/tests/logging/logging_vty_test.c File tests/logging/logging_vty_test.c: https://gerrit.osmocom.org/#/c/12094/1/tests/logging/logging_vty_test.c at 245 PS1, Line 245: if (osmo_init_logging_stderr(root_ctx, &log_info) == 0) { > AFAIU from application. [?] That's exactly what we test in here: we fail this test if osmo_init_logging_stderr() is not failing as it should. -- To view, visit https://gerrit.osmocom.org/12094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0fe8dc4a41aba4e4509540266e229700e8ec083c Gerrit-Change-Number: 12094 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:07:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:08:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:08:54 +0000 Subject: Change in libosmocore[master]: Log: add stdout target In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12093 ) Change subject: Log: add stdout target ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c File src/vty/logging_vty.c: https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c at 881 PS1, Line 881: /* we don't support vty logging to stdout to avoid messing up vty prompt and user input */ > Vty code prints to stdout. [?] I don't get that. Isn't VTY printing to a TCP soket? the one used by telnet. -- To view, visit https://gerrit.osmocom.org/12093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 Gerrit-Change-Number: 12093 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:08:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:09:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 12:09:49 +0000 Subject: Change in libosmocore[master]: Logging: don't print hex category by default In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12095 ) Change subject: Logging: don't print hex category by default ...................................................................... Patch Set 2: (1 comment) I'd rather avoid changing several defaults in one patch. https://gerrit.osmocom.org/#/c/12095/2/src/application.c File src/application.c: https://gerrit.osmocom.org/#/c/12095/2/src/application.c at 141 PS2, Line 141: log_set_print_category_hex(std, 0); > Should we then add log_set_print_category(std, 1) here? Why? -- To view, visit https://gerrit.osmocom.org/12095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6dc3898958cf60147ad73c52cf0b3990bd26359e Gerrit-Change-Number: 12095 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:09:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:14:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 12:14:56 +0000 Subject: Change in osmocom-bb[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11998 ) Change subject: doc/manuals: integrate into this repository ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 Gerrit-Change-Number: 11998 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 04 Dec 2018 12:14:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:14:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 12:14:59 +0000 Subject: Change in osmocom-bb[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11998 ) Change subject: doc/manuals: integrate into this repository ...................................................................... doc/manuals: integrate into this repository Update .gitignore and make the manuals build without a toplevel configure.ac file from autotools: $ cd doc/manuals $ make Related: OS#3385 Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 --- M .gitignore R doc/manuals/Makefile A doc/manuals/osmo-gsm-manuals-dir.sh 3 files changed, 38 insertions(+), 4 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 1a01c26..2232749 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,13 @@ /.project /.settings/ +# manuals +doc/manuals/*.html +doc/manuals/*.svg +doc/manuals/*.pdf +doc/manuals/*__*.png +doc/manuals/*.check +doc/manuals/generated/ +doc/manuals/osmocombb-usermanual.xml +doc/manuals/common +doc/manuals/build diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile similarity index 61% rename from doc/manuals/Makefile.am rename to doc/manuals/Makefile index 61ccafa..603f4ba 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile @@ -1,7 +1,5 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmocombb-usermanual.adoc \ - osmocombb-usermanual-docinfo.xml \ - chapters +OSMO_GSM_MANUALS_DIR := $(shell ./osmo-gsm-manuals-dir.sh) +srcdir=$(CURDIR) ASCIIDOC = osmocombb-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/doc/manuals/osmo-gsm-manuals-dir.sh b/doc/manuals/osmo-gsm-manuals-dir.sh new file mode 100755 index 0000000..f132eaa --- /dev/null +++ b/doc/manuals/osmo-gsm-manuals-dir.sh @@ -0,0 +1,26 @@ +#!/bin/sh -e +# Find OSMO_GSM_MANUALS_DIR and print it to stdout. Print where it was taken from to stderr. + +# Find it in env, pkg-conf and ../../../osmo-gsm-manuals +RET="$OSMO_GSM_MANUALS_DIR" +if [ -n "$RET" ]; then + RET="$(realpath $RET)" + echo "OSMO_GSM_MANUALS_DIR: $RET (from env)" >&2 +else + RET="$(pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null || true)" + if [ -n "$RET" ]; then + echo "OSMO_GSM_MANUALS_DIR: $RET (from pkg-conf)" >&2 + else + RET="$(realpath $(realpath $(dirname $0))/../../../osmo-gsm-manuals)" + echo "OSMO_GSM_MANUALS_DIR: $RET (fallback)" >&2 + fi +fi + +# Print the result or error message +if [ -d "$RET" ]; then + echo "$RET" +else + echo "ERROR: OSMO_GSM_MANUALS_DIR does not exist!" >&2 + echo "Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR." >&2 + exit 1 +fi -- To view, visit https://gerrit.osmocom.org/11998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 Gerrit-Change-Number: 11998 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:18:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:18:02 +0000 Subject: Change in libosmocore[master]: Log: add stdout target In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12093 ) Change subject: Log: add stdout target ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12093/1/src/logging.c File src/logging.c: https://gerrit.osmocom.org/#/c/12093/1/src/logging.c at 926 PS1, Line 926: if (target->tgt_file.out != stdout) > Could you elaborate? How else should it look like? And why you think it's wrong? This looks messy: if (target->tgt_file.out != stderr) if (target->tgt_file.out != stdout) { fclose(target->tgt_file.out); target->tgt_file.out = NULL; } I'd welcome perhaps something like: #if stderr if (target->tgt_file.out == stderr) {/* don't close */} else #endif #if stdout if (target->tgt_file.out == stdout) {/* don't close */} else #endif { fclose(target->tgt_file.out); target->tgt_file.out = NULL; } -- To view, visit https://gerrit.osmocom.org/12093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 Gerrit-Change-Number: 12093 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:18:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:20:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:20:33 +0000 Subject: Change in libosmocore[master]: Add osmo_init_logging_std*() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12094 ) Change subject: Add osmo_init_logging_std*() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12094/1/tests/logging/logging_vty_test.c File tests/logging/logging_vty_test.c: https://gerrit.osmocom.org/#/c/12094/1/tests/logging/logging_vty_test.c at 245 PS1, Line 245: if (osmo_init_logging_stderr(root_ctx, &log_info) == 0) { > That's exactly what we test in here: we fail this test if osmo_init_logging_stderr() is not failing [?] Yes, but it would fail to if you used osmo_init_logging_stdout here. So that means you cannot configure stderr and stdout at the same time, and as a result I don't really understand the value of these series of patches. Please provide me with information if I'm not understanding it. -- To view, visit https://gerrit.osmocom.org/12094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0fe8dc4a41aba4e4509540266e229700e8ec083c Gerrit-Change-Number: 12094 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:20:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:21:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:21:26 +0000 Subject: Change in libosmocore[master]: Logging: don't print hex category by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12095 ) Change subject: Logging: don't print hex category by default ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12095/2/src/application.c File src/application.c: https://gerrit.osmocom.org/#/c/12095/2/src/application.c at 141 PS2, Line 141: log_set_print_category_hex(std, 0); > Why? Because if we drop category hex information, I'd like to at least keep having category string if that's not the case already. -- To view, visit https://gerrit.osmocom.org/12095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6dc3898958cf60147ad73c52cf0b3990bd26359e Gerrit-Change-Number: 12095 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:21:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:24:51 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 12:24:51 +0000 Subject: Change in libosmocore[master]: Log: add stdout target In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12093 ) Change subject: Log: add stdout target ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c File src/vty/logging_vty.c: https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c at 881 PS1, Line 881: /* we don't support vty logging to stdout to avoid messing up vty prompt and user input */ > I don't get that. Isn't VTY printing to a TCP soket? the one used by telnet. Right, it'll only mess up if you run telnet in the same console where you've started the app. I'll update comment. -- To view, visit https://gerrit.osmocom.org/12093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 Gerrit-Change-Number: 12093 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:24:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:28:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:28:34 +0000 Subject: Change in libosmocore[master]: Log: add stdout target In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12093 ) Change subject: Log: add stdout target ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c File src/vty/logging_vty.c: https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c at 881 PS1, Line 881: /* we don't support vty logging to stdout to avoid messing up vty prompt and user input */ > Right, it'll only mess up if you run telnet in the same console where you've started the app. [?] how are you supposed to run telnet on the same terminal if the terminal is being used by the process? -- To view, visit https://gerrit.osmocom.org/12093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 Gerrit-Change-Number: 12093 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:28:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:30:26 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 12:30:26 +0000 Subject: Change in libosmocore[master]: Log: add stdout target In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12093 ) Change subject: Log: add stdout target ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c File src/vty/logging_vty.c: https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c at 881 PS1, Line 881: /* we don't support vty logging to stdout to avoid messing up vty prompt and user input */ > how are you supposed to run telnet on the same terminal if the terminal is being used by the process [?] Send it to background with &. -- To view, visit https://gerrit.osmocom.org/12093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 Gerrit-Change-Number: 12093 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:30:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:33:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:33:52 +0000 Subject: Change in libosmocore[master]: Log: add stdout target In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12093 ) Change subject: Log: add stdout target ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c File src/vty/logging_vty.c: https://gerrit.osmocom.org/#/c/12093/1/src/vty/logging_vty.c at 881 PS1, Line 881: /* we don't support vty logging to stdout to avoid messing up vty prompt and user input */ > Send it to background with &. I think if you do that, it's your problem and you expect this kind of behavior, no need to handle this kind of situations in code. -- To view, visit https://gerrit.osmocom.org/12093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 Gerrit-Change-Number: 12093 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:33:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:34:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 12:34:44 +0000 Subject: Change in libosmocore[master]: Add osmo_init_logging_std*() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12094 ) Change subject: Add osmo_init_logging_std*() ...................................................................... Patch Set 1: > Yes, but it would fail to if you used osmo_init_logging_stdout here. Sure, right now those are mutually exclusive. > So that means you cannot configure stderr and stdout at the same time That's correct. > Please provide me with information if I'm not understanding it. It's intended for tests which do not use vty and do not need to log to stderr and stdout at the same time - see commit message of this and previous patch. -- To view, visit https://gerrit.osmocom.org/12094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0fe8dc4a41aba4e4509540266e229700e8ec083c Gerrit-Change-Number: 12094 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:34:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:36:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 12:36:15 +0000 Subject: Change in libosmocore[master]: Logging: don't print hex category by default In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12095 ) Change subject: Logging: don't print hex category by default ...................................................................... Patch Set 2: That's only the default behavior for library code. What applications used as a default setting is defined by the application code. -- To view, visit https://gerrit.osmocom.org/12095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6dc3898958cf60147ad73c52cf0b3990bd26359e Gerrit-Change-Number: 12095 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:36:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:36:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 12:36:34 +0000 Subject: Change in libosmocore[master]: Allow log_init() with NULL log_info In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12092 to look at the new patch set (#2). Change subject: Allow log_init() with NULL log_info ...................................................................... Allow log_init() with NULL log_info Since we have library-internal categories we don't have to force application to supply its own categories. This is especially useful for testing code inside libosmocore which only use internal categories anyway. Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 --- M src/logging.c 1 file changed, 15 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/92/12092/2 -- To view, visit https://gerrit.osmocom.org/12092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 Gerrit-Change-Number: 12092 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:36:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 12:36:34 +0000 Subject: Change in libosmocore[master]: Log: add stdout target In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12093 to look at the new patch set (#2). Change subject: Log: add stdout target ...................................................................... Log: add stdout target This is useful for code testing internal library functions which allows to automatically fail tests due to output mismatch. As a side-effect this also simplifies #if-#else logic due to both _stdout() and _stderr() now being simple wrappers around static function. No user-visible changes are introduced because stdout is ignored in vty for now. Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 --- M include/osmocom/core/logging.h M src/logging.c M src/vty/logging_vty.c 3 files changed, 37 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/93/12093/2 -- To view, visit https://gerrit.osmocom.org/12093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 Gerrit-Change-Number: 12093 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:37:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 12:37:08 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 9: Code-Review+1 (1 comment) very nice, except for the db_sql2c.sed rename: it is now an unrelated cosmetic https://gerrit.osmocom.org/#/c/11898/7/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/11898/7/src/hlr.c at 651 PS7, Line 651: } > Can't the unit test simply be a separate program from osmo-hlr? sure, didn't think of that. Now realized hlr-db-tool is perfect for that -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 9 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 12:37:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:37:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:37:32 +0000 Subject: Change in osmo-trx[master]: lms: Allow setting Tx/RxGain for chan!=0 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12096 Change subject: lms: Allow setting Tx/RxGain for chan!=0 ...................................................................... lms: Allow setting Tx/RxGain for chan!=0 Change-Id: I5fae92a7ed5e2d92be12b9dfd33fc56195030c0b --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/96/12096/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 712652a..21bcece 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -322,11 +322,6 @@ double LMSDevice::setTxGain(double dB, size_t chan) { - if (chan) { - LOGC(DDEV, ALERT) << "Invalid channel " << chan; - return 0.0; - } - if (dB > maxTxGain()) dB = maxTxGain(); if (dB < minTxGain()) @@ -342,11 +337,6 @@ double LMSDevice::setRxGain(double dB, size_t chan) { - if (chan) { - LOGC(DDEV, ALERT) << "Invalid channel " << chan; - return 0.0; - } - if (dB > maxRxGain()) dB = maxRxGain(); if (dB < minRxGain()) -- To view, visit https://gerrit.osmocom.org/12096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5fae92a7ed5e2d92be12b9dfd33fc56195030c0b Gerrit-Change-Number: 12096 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:45:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:45:19 +0000 Subject: Change in libosmocore[master]: Add osmo_init_logging_std*() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12094 ) Change subject: Add osmo_init_logging_std*() ...................................................................... Patch Set 2: > > Yes, but it would fail to if you used osmo_init_logging_stdout > here. > > Sure, right now those are mutually exclusive. > > > So that means you cannot configure stderr and stdout at the same > time > > That's correct. > > > Please provide me with information if I'm not understanding it. > > It's intended for tests which do not use vty and do not need to log > to stderr and stdout at the same time - see commit message of this > and previous patch. If you only care about libosmocore logging system output, why not simply checking output template file against stderr? or run test with 2>&1 I so far think this adds extra complexity to the logging system for no good reason, because anyway you cannot configure both stderr and stdout separately. -- To view, visit https://gerrit.osmocom.org/12094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0fe8dc4a41aba4e4509540266e229700e8ec083c Gerrit-Change-Number: 12094 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:45:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:46:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:46:26 +0000 Subject: Change in libosmocore[master]: Logging: don't print hex category by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12095 ) Change subject: Logging: don't print hex category by default ...................................................................... Patch Set 3: > That's only the default behavior for library code. What > applications used as a default setting is defined by the > application code. Sure, then I want the default behavior for library code to be "at least log category string given that now we don't log category hex". -- To view, visit https://gerrit.osmocom.org/12095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6dc3898958cf60147ad73c52cf0b3990bd26359e Gerrit-Change-Number: 12095 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:46:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:54:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:54:40 +0000 Subject: Change in osmo-trx[master]: lms: allow setting Tx/RxFreq for lchan!=0 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12097 Change subject: lms: allow setting Tx/RxFreq for lchan!=0 ...................................................................... lms: allow setting Tx/RxFreq for lchan!=0 Change-Id: I9dd0bb41d1863111d28947fc0d7c7e7ecfaf5fa8 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 0 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/97/12097/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 21bcece..8f3d8e1 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -601,12 +601,6 @@ bool LMSDevice::setTxFreq(double wFreq, size_t chan) { - - if (chan) { - LOGC(DDEV, ALERT) << "Invalid channel " << chan; - return false; - } - if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_TX, chan, wFreq) < 0) { LOGC(DDEV, ALERT) << "set Tx: " << wFreq << " failed!"; return false; @@ -617,11 +611,6 @@ bool LMSDevice::setRxFreq(double wFreq, size_t chan) { - if (chan) { - LOGC(DDEV, ALERT) << "Invalid channel " << chan; - return false; - } - if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_RX, chan, wFreq) < 0) { LOGC(DDEV, ALERT) << "set Rx: " << wFreq << " failed!"; return false; -- To view, visit https://gerrit.osmocom.org/12097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9dd0bb41d1863111d28947fc0d7c7e7ecfaf5fa8 Gerrit-Change-Number: 12097 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 12:57:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 12:57:24 +0000 Subject: Change in libosmocore[master]: Allow log_init() with NULL log_info In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12092 ) Change subject: Allow log_init() with NULL log_info ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12092/2/src/logging.c File src/logging.c: https://gerrit.osmocom.org/#/c/12092/2/src/logging.c at 955 PS2, Line 955: * If inf is NULL than only library-internal categories are initialized. typo: then -- To view, visit https://gerrit.osmocom.org/12092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 Gerrit-Change-Number: 12092 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 12:57:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:00:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Dec 2018 13:00:57 +0000 Subject: Change in osmo-hlr[master]: introduce osmo_gsup_client_create2() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12098 Change subject: introduce osmo_gsup_client_create2() ...................................................................... introduce osmo_gsup_client_create2() Add a new API which allows creating a GSUP client connection with more identification information than just a unit name. Instead of being selective about which idenfifiers callers may use, allow callers to pass a full-blown struct ipaccess_unit. This allows applications to use entirely custom identifiers on GSUP client connections. This change is a prerequisite for inter-MSC handover because MSCs will need to use unique identifiers towards the HLR, which isn't very easy to do with the old osmo_gsup_client_create() API. While it's always been possible to pass a unique unit_name, this is not as flexible as we would like. The old API remains for backwards compatibility. struct osmo_gsup_client grows in size but is allocated internally by the library; old calling code won't notice the difference. Change-Id: Ief09677e07d6e977247185b72c605f109aa091f5 Related: OS#3355 --- M include/osmocom/gsupclient/gsup_client.h M src/gsupclient/gsup_client.c 2 files changed, 48 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/98/12098/1 diff --git a/include/osmocom/gsupclient/gsup_client.h b/include/osmocom/gsupclient/gsup_client.h index 981751b..95163cd 100644 --- a/include/osmocom/gsupclient/gsup_client.h +++ b/include/osmocom/gsupclient/gsup_client.h @@ -23,6 +23,7 @@ #include #include +#include /* a loss of GSUP between MSC and HLR is considered quite serious, let's try to recover as quickly as * possible. Even one new connection attempt per second should be quite acceptable until the link is @@ -38,7 +39,7 @@ typedef int (*osmo_gsup_client_read_cb_t)(struct osmo_gsup_client *gsupc, struct msgb *msg); struct osmo_gsup_client { - const char *unit_name; + const char *unit_name; /* same as ipa_dev->unit_name, for backwards compat */ struct ipa_client_conn *link; osmo_gsup_client_read_cb_t read_cb; @@ -50,8 +51,16 @@ struct osmo_timer_list connect_timer; int is_connected; int got_ipa_pong; + + struct ipaccess_unit *ipa_dev; /* identification information sent to IPA server */ }; +struct osmo_gsup_client *osmo_gsup_client_create2(void *talloc_ctx, + struct ipaccess_unit *ipa_dev, + const char *ip_addr, + unsigned int tcp_port, + osmo_gsup_client_read_cb_t read_cb, + struct osmo_oap_client_config *oapc_config); struct osmo_gsup_client *osmo_gsup_client_create(void *talloc_ctx, const char *unit_name, const char *ip_addr, diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c index d34a22d..1cecdb9 100644 --- a/src/gsupclient/gsup_client.c +++ b/src/gsupclient/gsup_client.c @@ -170,16 +170,10 @@ struct ipaccess_head_ext *he = (struct ipaccess_head_ext *) msgb_l2(msg); struct osmo_gsup_client *gsupc = (struct osmo_gsup_client *)link->data; int rc; - struct ipaccess_unit ipa_dev = { - /* see gsup_client_create() on const vs non-const */ - .unit_name = (char*)gsupc->unit_name, - }; - - OSMO_ASSERT(ipa_dev.unit_name); msg->l2h = &hh->data[0]; - rc = ipaccess_bts_handle_ccm(link, &ipa_dev, msg); + rc = ipaccess_bts_handle_ccm(link, gsupc->ipa_dev, msg); if (rc < 0) { LOGP(DLGSUP, LOGL_NOTICE, @@ -262,24 +256,33 @@ gsup_client_send_ping(gsupc); } -struct osmo_gsup_client *osmo_gsup_client_create(void *talloc_ctx, - const char *unit_name, - const char *ip_addr, - unsigned int tcp_port, - osmo_gsup_client_read_cb_t read_cb, - struct osmo_oap_client_config *oapc_config) +/** + * Create a gsup client connecting to the specified IP address and TCP port + * Use the provided ipaccess unit as the client-side identifier; ipa_dev should + * be allocated in talloc_ctx talloc_ctx as well. + * \param[in] talloc_ctx talloc context + * \param[in] ipa_dev IP access unit which contains client identification information; must be allocated + * in talloc_ctx as well to ensure it lives throughout the lifetime of the connection + * \param[in] ip_addr GSUP server IP address + * \param[in] tcp_port GSUP server TCP port + * \param[in] read_cb callback for reading from the GSUP connection + * \param[in] oapc_config OPA client configuration + * \returns a GSUP client connection or NULL on failure + */ +struct osmo_gsup_client *osmo_gsup_client_create2(void *talloc_ctx, + struct ipaccess_unit *ipa_dev, + const char *ip_addr, + unsigned int tcp_port, + osmo_gsup_client_read_cb_t read_cb, + struct osmo_oap_client_config *oapc_config) { struct osmo_gsup_client *gsupc; int rc; gsupc = talloc_zero(talloc_ctx, struct osmo_gsup_client); OSMO_ASSERT(gsupc); - - /* struct ipaccess_unit has a non-const unit_name, so let's copy to be - * able to have a non-const unit_name here as well. To not taint the - * public gsup_client API, let's store it in a const char* anyway. */ - gsupc->unit_name = talloc_strdup(gsupc, unit_name); - OSMO_ASSERT(gsupc->unit_name); + gsupc->unit_name = (const char *)ipa_dev->unit_name; /* API backwards compat */ + gsupc->ipa_dev = ipa_dev; /* a NULL oapc_config will mark oap_state disabled. */ rc = osmo_oap_client_init(oapc_config, &gsupc->oap_state); @@ -313,6 +316,22 @@ return NULL; } +/** + * Like osmo_gsup_client_create2() except it expects a unit name instead + * of a full-blown ipacess_unit as the client-side identifier. + */ +struct osmo_gsup_client *osmo_gsup_client_create(void *talloc_ctx, + const char *unit_name, + const char *ip_addr, + unsigned int tcp_port, + osmo_gsup_client_read_cb_t read_cb, + struct osmo_oap_client_config *oapc_config) +{ + struct ipaccess_unit *ipa_dev = talloc_zero(talloc_ctx, struct ipaccess_unit); + ipa_dev->unit_name = talloc_strdup(ipa_dev, unit_name); + return osmo_gsup_client_create2(talloc_ctx, ipa_dev, ip_addr, tcp_port, read_cb, oapc_config); +} + void osmo_gsup_client_destroy(struct osmo_gsup_client *gsupc) { osmo_timer_del(&gsupc->connect_timer); -- To view, visit https://gerrit.osmocom.org/12098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ief09677e07d6e977247185b72c605f109aa091f5 Gerrit-Change-Number: 12098 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:04:00 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Dec 2018 13:04:00 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 9: > Patch Set 9: Code-Review+1 > > (1 comment) > > very nice, except for the db_sql2c.sed rename: it is now an unrelated cosmetic But does it hurt? -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 9 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 13:04:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:12:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 13:12:40 +0000 Subject: Change in osmo-trx[master]: lms: Improve Set{Rx, Tx}{Gain, Freq} logging Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12099 Change subject: lms: Improve Set{Rx,Tx}{Gain,Freq} logging ...................................................................... lms: Improve Set{Rx,Tx}{Gain,Freq} logging Change-Id: I6713a27c5f74beb7fcfdd712fcf695afccbc3d76 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/99/12099/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 8f3d8e1..9804bbd 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -327,10 +327,10 @@ if (dB < minTxGain()) dB = minTxGain(); - LOGC(DDEV, NOTICE) << "Setting TX gain to " << dB << " dB."; + LOGC(DDEV, NOTICE) << "chan " << chan <<": Setting TX gain to " << dB << " dB"; if (LMS_SetGaindB(m_lms_dev, LMS_CH_TX, chan, dB) < 0) - LOGC(DDEV, ERR) << "Error setting TX gain"; + LOGC(DDEV, ERR) << "chan " << chan <<": Error setting TX gain to " << dB << " dB"; return dB; } @@ -342,10 +342,10 @@ if (dB < minRxGain()) dB = minRxGain(); - LOGC(DDEV, NOTICE) << "Setting RX gain to " << dB << " dB."; + LOGC(DDEV, NOTICE) << "chan "<< chan << ": Setting RX gain to " << dB << " dB"; if (LMS_SetGaindB(m_lms_dev, LMS_CH_RX, chan, dB) < 0) - LOGC(DDEV, ERR) << "Error setting RX gain"; + LOGC(DDEV, ERR) << "chan "<< chan << ": Error setting RX gain to " << dB << " dB"; return dB; } @@ -601,8 +601,10 @@ bool LMSDevice::setTxFreq(double wFreq, size_t chan) { + LOGC(DDEV, NOTICE) << "chan "<< chan << ": Setting Tx Freq to " << wFreq << " Hz"; + if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_TX, chan, wFreq) < 0) { - LOGC(DDEV, ALERT) << "set Tx: " << wFreq << " failed!"; + LOGC(DDEV, ERROR) << "chan "<< chan << ": Error setting Tx Freq to " << wFreq << " Hz"; return false; } @@ -611,8 +613,10 @@ bool LMSDevice::setRxFreq(double wFreq, size_t chan) { + LOGC(DDEV, NOTICE) << "chan "<< chan << ": Setting Rx Freq to " << wFreq << " Hz"; + if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_RX, chan, wFreq) < 0) { - LOGC(DDEV, ALERT) << "set Rx: " << wFreq << " failed!"; + LOGC(DDEV, ERROR) << "chan "<< chan << ": Error setting Rx Freq to " << wFreq << " Hz"; return false; } -- To view, visit https://gerrit.osmocom.org/12099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6713a27c5f74beb7fcfdd712fcf695afccbc3d76 Gerrit-Change-Number: 12099 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:25:01 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Dec 2018 13:25:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... Patch Set 5: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11897/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11897/5//COMMIT_MSG at 10 PS5, Line 10: MSC, make sure that the MSC is not paging infinitly grammar: infinitly -> indefinitely -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 13:25:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:26:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 13:26:14 +0000 Subject: Change in osmo-trx[master]: transceiver: log chan on CTRL command received Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12100 Change subject: transceiver: log chan on CTRL command received ...................................................................... transceiver: log chan on CTRL command received Change-Id: Ia3b2a35e03a8aaddd6efebc8db2ccca872f51f20 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/00/12100/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index d6ddce8..8702fb6 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -721,7 +721,7 @@ /* Set command pointer */ command = buffer + 4; - LOG(INFO) << "command is " << command; + LOG(INFO) << "chan " << chan << ": command is " << command; if (match_cmd(command, "POWEROFF", NULL)) { stop(); -- To view, visit https://gerrit.osmocom.org/12100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3b2a35e03a8aaddd6efebc8db2ccca872f51f20 Gerrit-Change-Number: 12100 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:32:48 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Dec 2018 13:32:48 +0000 Subject: Change in osmo-trx[master]: transceiver: log chan on CTRL command received In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12100 ) Change subject: transceiver: log chan on CTRL command received ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3b2a35e03a8aaddd6efebc8db2ccca872f51f20 Gerrit-Change-Number: 12100 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 13:32:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:33:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 13:33:04 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#10) to the change originally created by Stefan Sperling. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... add database schema versioning to the HLR database Make use of pragma user_version to store our database schema version. The present schema is now identitifed as 'version 0', which is also the default value for databases on which we never ran the statement 'pragma user_version' before. Only bootstrap the database if it hasn't been bootstrapped yet. Previously, bootstrap SQL statements ran every time osmo-hlr opened the database, and any errors were being ignored in SQL. Instead, we now first run a query which checks whether tables already exist, and only create them if necessary. This change will allow future schema updates to work properly. Prepare for future schema upgrades by adding a new command-line option which enables upgrades. This option defaults to 'false' in order to avoid accidental upgrades. Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Related: OS#2838 --- M sql/hlr.sql M src/db.c M src/db.h M src/hlr.c M src/hlr_db_tool.c M tests/db/db_test.c 6 files changed, 128 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/98/11898/10 -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 10 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:33:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 13:33:05 +0000 Subject: Change in osmo-hlr[master]: Rename db_bootstrap.sed to db_sql2c.sed Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12101 Change subject: Rename db_bootstrap.sed to db_sql2c.sed ...................................................................... Rename db_bootstrap.sed to db_sql2c.sed Side effect of the db schema patch, now a mere cosmetic change. Change-Id: I47a101e3b76b2125d786f22bf100604cf5e8eb40 --- M src/Makefile.am R src/db_sql2c.sed 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/01/12101/1 diff --git a/src/Makefile.am b/src/Makefile.am index 4f167f0..7ee019f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ EXTRA_DIST = \ populate_hlr_db.pl \ - db_bootstrap.sed \ + db_sql2c.sed \ $(NULL) BUILT_SOURCES = \ @@ -114,11 +114,11 @@ BOOTSTRAP_SQL = $(top_srcdir)/sql/hlr.sql -db_bootstrap.h: $(BOOTSTRAP_SQL) $(srcdir)/db_bootstrap.sed - echo "/* DO NOT EDIT THIS FILE. It is generated from osmo-hlr.git/sql/hlr.sql */" > "$@" +db_bootstrap.h: $(BOOTSTRAP_SQL) $(srcdir)/db_sql2c.sed + echo "/* DO NOT EDIT THIS FILE. It is generated from files in osmo-hlr.git/sql/ */" > "$@" echo "#pragma once" >> "$@" echo "static const char *stmt_bootstrap_sql[] = {" >> "$@" cat "$(BOOTSTRAP_SQL)" \ - | sed -f "$(srcdir)/db_bootstrap.sed" \ + | sed -f "$(srcdir)/db_sql2c.sed" \ >> "$@" echo "};" >> "$@" diff --git a/src/db_bootstrap.sed b/src/db_sql2c.sed similarity index 93% rename from src/db_bootstrap.sed rename to src/db_sql2c.sed index 60b8243..1d301f8 100644 --- a/src/db_bootstrap.sed +++ b/src/db_sql2c.sed @@ -1,4 +1,4 @@ -# Input to this is sql/hlr.sql. +# Input to this are sql/*.sql files. # # We want each SQL statement line wrapped in "...\n", and each end (";") to # become a comma: -- To view, visit https://gerrit.osmocom.org/12101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I47a101e3b76b2125d786f22bf100604cf5e8eb40 Gerrit-Change-Number: 12101 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:33:59 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 4 Dec 2018 13:33:59 +0000 Subject: Change in osmo-gsm-tester[master]: Provide debug output before removing the evidence Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12102 Change subject: Provide debug output before removing the evidence ...................................................................... Provide debug output before removing the evidence For debugging it is important to have an idea if something was extracted into the inst/ directory or not. There is space concern about keeping the directory around. As a compromise print the content of the inst directory before removing it. Change-Id: I35c2fa17a1b57dfd0a3ca5485874b7f50765c897 --- M contrib/jenkins-run.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/02/12102/1 diff --git a/contrib/jenkins-run.sh b/contrib/jenkins-run.sh index 716899e..67fd87b 100755 --- a/contrib/jenkins-run.sh +++ b/contrib/jenkins-run.sh @@ -26,6 +26,7 @@ fi # no need to keep extracted binaries +find "$trial_dir/inst" || true rm -rf "$trial_dir/inst" || true # tar up all results for archiving (optional) -- To view, visit https://gerrit.osmocom.org/12102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I35c2fa17a1b57dfd0a3ca5485874b7f50765c897 Gerrit-Change-Number: 12102 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:33:59 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 4 Dec 2018 13:33:59 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Do the existance check with the path Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12103 Change subject: ms_driver: Do the existance check with the path ...................................................................... ms_driver: Do the existance check with the path Change the existance test to use the full path and not just the binary name. Change-Id: Ibe28514df03efb7c302ac30411761a8d1a6dcf5d --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/03/12103/1 diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index b29859b..bc1cce9 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -93,7 +93,7 @@ def check_and_return_binary(name): """Checks the binary exists and returns the path.""" binary = inst.child('bin', name) - if not os.path.isfile(name): + if not os.path.isfile(binary): raise RuntimeError('Binary missing: %r' % binary) return binary -- To view, visit https://gerrit.osmocom.org/12103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe28514df03efb7c302ac30411761a8d1a6dcf5d Gerrit-Change-Number: 12103 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:33:59 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 4 Dec 2018 13:33:59 +0000 Subject: Change in osmo-gsm-tester[master]: md_driver: Store the virtphy unix sockets in the temp directory Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12104 Change subject: md_driver: Store the virtphy unix sockets in the temp directory ...................................................................... md_driver: Store the virtphy unix sockets in the temp directory Storing them inside the testrun directory will most likely violate the file length limit of the AF_UNIX files. This has happened on the jenkins test run and can not be mitigated by picking shorter paths in the code. We are already storing the event server in a tmp directory and can add subdirs+files there. Change-Id: I9ba4cd5c3e220ec10fc7c3160d7211daa821358f --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/04/12104/1 diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index bc1cce9..e8e543c 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -113,7 +113,7 @@ options = self.build_binary_options() self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf, self._ev_server, - util.Dir(self._suite_run.get_test_run_dir()), + util.Dir(self.event_server_sk_tmp_dir), suite_run=self._suite_run) # TODO: We should pass subscribers down to the test and not get it from -- To view, visit https://gerrit.osmocom.org/12104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9ba4cd5c3e220ec10fc7c3160d7211daa821358f Gerrit-Change-Number: 12104 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:34:48 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Dec 2018 13:34:48 +0000 Subject: Change in osmo-trx[master]: lms: Improve Set{Rx, Tx}{Gain, Freq} logging In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12099 ) Change subject: lms: Improve Set{Rx,Tx}{Gain,Freq} logging ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6713a27c5f74beb7fcfdd712fcf695afccbc3d76 Gerrit-Change-Number: 12099 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 13:34:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:36:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 13:36:59 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 10 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 13:36:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:37:13 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 13:37:13 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass2() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass2() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 24 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 13:37:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:37:16 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 13:37:16 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 13 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 13:37:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:37:19 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 13:37:19 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 19 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 13:37:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:38:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 13:38:16 +0000 Subject: Change in osmo-hlr[master]: Rename db_bootstrap.sed to db_sql2c.sed In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12101 ) Change subject: Rename db_bootstrap.sed to db_sql2c.sed ...................................................................... Patch Set 1: Code-Review+2 I split this out of stsp's patch -- To view, visit https://gerrit.osmocom.org/12101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47a101e3b76b2125d786f22bf100604cf5e8eb40 Gerrit-Change-Number: 12101 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 04 Dec 2018 13:38:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:40:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 13:40:06 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 10: feel free to discuss our paradigm of atomic commits, but until then get on with it. I split it off now. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 10 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 13:40:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:40:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Dec 2018 13:40:27 +0000 Subject: Change in osmo-trx[master]: lms: allow setting Tx/RxFreq for lchan!=0 In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12097 ) Change subject: lms: allow setting Tx/RxFreq for lchan!=0 ...................................................................... Patch Set 1: Can you explain why this change is needed? It's not obvious to me what this is about. -- To view, visit https://gerrit.osmocom.org/12097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9dd0bb41d1863111d28947fc0d7c7e7ecfaf5fa8 Gerrit-Change-Number: 12097 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 13:40:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:42:34 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Dec 2018 13:42:34 +0000 Subject: Change in libosmocore[master]: Allow log_init() with NULL log_info In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12092 ) Change subject: Allow log_init() with NULL log_info ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 Gerrit-Change-Number: 12092 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 13:42:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:44:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 13:44:10 +0000 Subject: Change in osmo-trx[master]: lms: allow setting Tx/RxFreq for lchan!=0 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12097 ) Change subject: lms: allow setting Tx/RxFreq for lchan!=0 ...................................................................... Patch Set 1: > Can you explain why this change is needed? > It's not obvious to me what this is about. Well, because if you run a multiTRX setup (without multi-arfcn feature, only supported by some Ettus devices) you have 1 chan per TRX/ARFCN, and you want to set the ARFCN freq for each channel, not only for the first one. See https://osmocom.org/issues/3346#note-3 -- To view, visit https://gerrit.osmocom.org/12097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9dd0bb41d1863111d28947fc0d7c7e7ecfaf5fa8 Gerrit-Change-Number: 12097 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 13:44:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:47:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 13:47:09 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has removed a vote on this change. Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Removed Code-Review+2 by Pau Espin Pedrol -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:47:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 13:47:11 +0000 Subject: Change in libosmo-sccp[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has removed a vote on this change. Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Removed Code-Review+2 by Pau Espin Pedrol -- To view, visit https://gerrit.osmocom.org/12064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 Gerrit-Change-Number: 12064 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:47:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 13:47:13 +0000 Subject: Change in osmo-ggsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has removed a vote on this change. Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Removed Code-Review+2 by Pau Espin Pedrol -- To view, visit https://gerrit.osmocom.org/12063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b Gerrit-Change-Number: 12063 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:47:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 13:47:15 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has removed a vote on this change. Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Removed Code-Review+2 by Pau Espin Pedrol -- To view, visit https://gerrit.osmocom.org/12090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ia5b112fc1663b78800d3c2c4ff2a0771cf5af11b Gerrit-Change-Number: 12090 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:47:38 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Dec 2018 13:47:38 +0000 Subject: Change in libosmocore[master]: Logging: don't print hex category by default In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12095 ) Change subject: Logging: don't print hex category by default ...................................................................... Patch Set 3: Note that log_target_create() still contains this code: /* global settings */ target->use_color = 1; target->print_timestamp = 0; target->print_filename2 = LOG_FILENAME_PATH; target->print_category_hex = true; Wouldn't it be easier to change this hard-coded default to 'false' here? -- To view, visit https://gerrit.osmocom.org/12095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6dc3898958cf60147ad73c52cf0b3990bd26359e Gerrit-Change-Number: 12095 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 13:47:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:50:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 13:50:05 +0000 Subject: Change in osmo-gsm-tester[master]: Provide debug output before removing the evidence In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12102 ) Change subject: Provide debug output before removing the evidence ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I35c2fa17a1b57dfd0a3ca5485874b7f50765c897 Gerrit-Change-Number: 12102 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 13:50:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:51:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 13:51:00 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Do the existance check with the path In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12103 ) Change subject: ms_driver: Do the existance check with the path ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe28514df03efb7c302ac30411761a8d1a6dcf5d Gerrit-Change-Number: 12103 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 13:51:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 13:51:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 13:51:57 +0000 Subject: Change in osmo-gsm-tester[master]: md_driver: Store the virtphy unix sockets in the temp directory In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12104 ) Change subject: md_driver: Store the virtphy unix sockets in the temp directory ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9ba4cd5c3e220ec10fc7c3160d7211daa821358f Gerrit-Change-Number: 12104 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 13:51:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:00:34 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Dec 2018 14:00:34 +0000 Subject: Change in osmo-trx[master]: lms: Close device on LMS_Init failure In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12091 ) Change subject: lms: Close device on LMS_Init failure ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0b307452a9e122a0ea39a46f096423c9a5293d30 Gerrit-Change-Number: 12091 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 14:00:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:01:17 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Dec 2018 14:01:17 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... add database schema versioning to the HLR database Make use of pragma user_version to store our database schema version. The present schema is now identitifed as 'version 0', which is also the default value for databases on which we never ran the statement 'pragma user_version' before. Only bootstrap the database if it hasn't been bootstrapped yet. Previously, bootstrap SQL statements ran every time osmo-hlr opened the database, and any errors were being ignored in SQL. Instead, we now first run a query which checks whether tables already exist, and only create them if necessary. This change will allow future schema updates to work properly. Prepare for future schema upgrades by adding a new command-line option which enables upgrades. This option defaults to 'false' in order to avoid accidental upgrades. Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Related: OS#2838 --- M sql/hlr.sql M src/db.c M src/db.h M src/hlr.c M src/hlr_db_tool.c M tests/db/db_test.c 6 files changed, 128 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/sql/hlr.sql b/sql/hlr.sql index 80eb3e5..3499109 100644 --- a/sql/hlr.sql +++ b/sql/hlr.sql @@ -1,4 +1,4 @@ -CREATE TABLE IF NOT EXISTS subscriber ( +CREATE TABLE subscriber ( -- OsmoHLR's DB scheme is modelled roughly after TS 23.008 version 13.3.0 id INTEGER PRIMARY KEY, -- Chapter 2.1.1.1 @@ -39,24 +39,24 @@ ms_purged_ps BOOLEAN NOT NULL DEFAULT 0 ); -CREATE TABLE IF NOT EXISTS subscriber_apn ( +CREATE TABLE subscriber_apn ( subscriber_id INTEGER, -- subscriber.id apn VARCHAR(256) NOT NULL ); -CREATE TABLE IF NOT EXISTS subscriber_multi_msisdn ( +CREATE TABLE subscriber_multi_msisdn ( -- Chapter 2.1.3 subscriber_id INTEGER, -- subscriber.id msisdn VARCHAR(15) NOT NULL ); -CREATE TABLE IF NOT EXISTS auc_2g ( +CREATE TABLE auc_2g ( subscriber_id INTEGER PRIMARY KEY, -- subscriber.id algo_id_2g INTEGER NOT NULL, -- enum osmo_auth_algo value ki VARCHAR(32) NOT NULL -- hex string: subscriber's secret key (128bit) ); -CREATE TABLE IF NOT EXISTS auc_3g ( +CREATE TABLE auc_3g ( subscriber_id INTEGER PRIMARY KEY, -- subscriber.id algo_id_3g INTEGER NOT NULL, -- enum osmo_auth_algo value k VARCHAR(32) NOT NULL, -- hex string: subscriber's secret key (128bit) @@ -66,4 +66,7 @@ ind_bitlen INTEGER NOT NULL DEFAULT 5 -- nr of index bits at lower SQN end ); -CREATE UNIQUE INDEX IF NOT EXISTS idx_subscr_imsi ON subscriber (imsi); +CREATE UNIQUE INDEX idx_subscr_imsi ON subscriber (imsi); + +-- Set HLR database schema version number +PRAGMA user_version = 0; diff --git a/src/db.c b/src/db.c index bcf83c6..df52f9b 100644 --- a/src/db.c +++ b/src/db.c @@ -27,6 +27,8 @@ #include "db.h" #include "db_bootstrap.h" +#define CURRENT_SCHEMA_VERSION 0 + #define SEL_COLUMNS \ "id," \ "imsi," \ @@ -197,36 +199,90 @@ for (i = 0; i < ARRAY_SIZE(stmt_bootstrap_sql); i++) { int rc; sqlite3_stmt *stmt; - - rc = sqlite3_prepare_v2(dbc->db, stmt_bootstrap_sql[i], -1, - &stmt, NULL); + rc = sqlite3_prepare_v2(dbc->db, stmt_bootstrap_sql[i], -1, &stmt, NULL); if (rc != SQLITE_OK) { - LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", - stmt_bootstrap_sql[i]); + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", stmt_bootstrap_sql[i]); return rc; } - /* execute the statement */ rc = sqlite3_step(stmt); db_remove_reset(stmt); sqlite3_finalize(stmt); if (rc != SQLITE_DONE) { LOGP(DDB, LOGL_ERROR, "Cannot bootstrap database: SQL error: (%d) %s," " during stmt '%s'", - rc, sqlite3_errmsg(dbc->db), - stmt_bootstrap_sql[i]); + rc, sqlite3_errmsg(dbc->db), stmt_bootstrap_sql[i]); return rc; } } return SQLITE_OK; } -struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite_logging) +/* https://www.sqlite.org/fileformat2.html#storage_of_the_sql_database_schema */ +static bool db_table_exists(struct db_context *dbc, const char *table_name) +{ + const char *table_exists_sql = "SELECT name FROM sqlite_master WHERE type='table' AND name=?"; + sqlite3_stmt *stmt; + int rc; + + rc = sqlite3_prepare_v2(dbc->db, table_exists_sql, -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", table_exists_sql); + return false; + } + + if (!db_bind_text(stmt, NULL, table_name)) + return false; + + rc = sqlite3_step(stmt); + db_remove_reset(stmt); + sqlite3_finalize(stmt); + return (rc == SQLITE_ROW); +} + +/* Indicate whether the database is initialized with tables for schema version 0. + * We only check for the 'subscriber' table here because Neels said so. */ +static bool db_is_bootstrapped_v0(struct db_context *dbc) +{ + if (!db_table_exists(dbc, "subscriber")) { + LOGP(DDB, LOGL_DEBUG, "Table 'subscriber' not found in database '%s'\n", dbc->fname); + return false; + } + + return true; +} + +static int db_get_user_version(struct db_context *dbc) +{ + const char *user_version_sql = "PRAGMA user_version"; + sqlite3_stmt *stmt; + int version, rc; + + rc = sqlite3_prepare_v2(dbc->db, user_version_sql, -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", user_version_sql); + return -1; + } + rc = sqlite3_step(stmt); + if (rc == SQLITE_ROW) { + version = sqlite3_column_int(stmt, 0); + } else { + LOGP(DDB, LOGL_ERROR, "SQL statement '%s' failed: %d\n", user_version_sql, rc); + version = -1; + } + + db_remove_reset(stmt); + sqlite3_finalize(stmt); + return version; +} + +struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite_logging, bool allow_upgrade) { struct db_context *dbc = talloc_zero(ctx, struct db_context); unsigned int i; int rc; bool has_sqlite_config_sqllog = false; + int version; LOGP(DDB, LOGL_NOTICE, "using database: %s\n", fname); LOGP(DDB, LOGL_INFO, "Compiled against SQLite3 lib version %s\n", SQLITE_VERSION); @@ -275,10 +331,40 @@ LOGP(DDB, LOGL_ERROR, "Unable to set Write-Ahead Logging: %s\n", err_msg); - rc = db_bootstrap(dbc); - if (rc != SQLITE_OK) { - LOGP(DDB, LOGL_ERROR, "Failed to bootstrap DB: (rc=%d) %s\n", - rc, sqlite3_errmsg(dbc->db)); + version = db_get_user_version(dbc); + if (version < 0) { + LOGP(DDB, LOGL_ERROR, "Unable to read user version number from database '%s'\n", dbc->fname); + goto out_free; + } + + /* An empty database will always report version zero. */ + if (version == 0 && !db_is_bootstrapped_v0(dbc)) { + LOGP(DDB, LOGL_NOTICE, "Missing database tables detected; Bootstrapping database '%s'\n", dbc->fname); + rc = db_bootstrap(dbc); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Failed to bootstrap DB: (rc=%d) %s\n", + rc, sqlite3_errmsg(dbc->db)); + goto out_free; + } + } + + LOGP(DDB, LOGL_NOTICE, "Database '%s' has HLR DB schema version %d\n", dbc->fname, version); + + if (version < CURRENT_SCHEMA_VERSION && allow_upgrade) { + /* Future version upgrades will happen here. */ + } + + if (version != CURRENT_SCHEMA_VERSION) { + if (version < CURRENT_SCHEMA_VERSION) { + LOGP(DDB, LOGL_NOTICE, "HLR DB schema version %d is outdated\n", version); + if (!allow_upgrade) { + LOGP(DDB, LOGL_ERROR, "Not upgrading HLR database to schema version %d; " + "use the --db-upgrade option to allow HLR database upgrades\n", + CURRENT_SCHEMA_VERSION); + } + } else + LOGP(DDB, LOGL_ERROR, "HLR DB schema version %d is unknown\n", version); + goto out_free; } diff --git a/src/db.h b/src/db.h index 34582c8..66dfe57 100644 --- a/src/db.h +++ b/src/db.h @@ -39,7 +39,7 @@ bool db_bind_int(sqlite3_stmt *stmt, const char *param_name, int nr); bool db_bind_int64(sqlite3_stmt *stmt, const char *param_name, int64_t nr); void db_close(struct db_context *dbc); -struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite3_logging); +struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite3_logging, bool allow_upgrades); #include diff --git a/src/hlr.c b/src/hlr.c index 78d6c91..14945b6 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -483,6 +483,7 @@ printf(" -s --disable-color Do not print ANSI colors in the log\n"); printf(" -T --timestamp Prefix every log line with a timestamp.\n"); printf(" -e --log-level number Set a global loglevel.\n"); + printf(" -U --db-upgrade Allow HLR database schema upgrades.\n"); printf(" -V --version Print the version of OsmoHLR.\n"); } @@ -490,10 +491,12 @@ const char *config_file; const char *db_file; bool daemonize; + bool db_upgrade; } cmdline_opts = { .config_file = "osmo-hlr.cfg", .db_file = "hlr.db", .daemonize = false, + .db_upgrade = false, }; static void handle_options(int argc, char **argv) @@ -509,11 +512,12 @@ {"disable-color", 0, 0, 's'}, {"log-level", 1, 0, 'e'}, {"timestamp", 0, 0, 'T'}, + {"db-upgrade", 0, 0, 'U' }, {"version", 0, 0, 'V' }, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "hc:l:d:Dse:TV", + c = getopt_long(argc, argv, "hc:l:d:Dse:TUV", long_options, &option_index); if (c == -1) break; @@ -544,6 +548,9 @@ case 'T': log_set_print_timestamp(osmo_stderr_target, 1); break; + case 'U': + cmdline_opts.db_upgrade = true; + break; case 'V': print_version(1); exit(0); @@ -637,7 +644,7 @@ exit(1); } - g_hlr->dbc = db_open(hlr_ctx, cmdline_opts.db_file, true); + g_hlr->dbc = db_open(hlr_ctx, cmdline_opts.db_file, true, cmdline_opts.db_upgrade); if (!g_hlr->dbc) { LOGP(DMAIN, LOGL_FATAL, "Error opening database\n"); exit(1); diff --git a/src/hlr_db_tool.c b/src/hlr_db_tool.c index e83b098..1a9c60c 100644 --- a/src/hlr_db_tool.c +++ b/src/hlr_db_tool.c @@ -44,8 +44,10 @@ const char *db_file; bool bootstrap; const char *import_nitb_db; + bool db_upgrade; } cmdline_opts = { .db_file = "hlr.db", + .db_upgrade = false, }; static void print_help() @@ -59,6 +61,7 @@ printf(" -s --disable-color Do not print ANSI colors in the log\n"); printf(" -T --timestamp Prefix every log line with a timestamp.\n"); printf(" -e --log-level number Set a global loglevel.\n"); + printf(" -U --db-upgrade Allow HLR database schema upgrades.\n"); printf(" -V --version Print the version of OsmoHLR-db-tool.\n"); printf("\n"); printf("Commands:\n"); @@ -96,11 +99,12 @@ {"disable-color", 0, 0, 's'}, {"timestamp", 0, 0, 'T'}, {"log-level", 1, 0, 'e'}, + {"db-upgrade", 0, 0, 'U' }, {"version", 0, 0, 'V' }, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "hl:d:sTe:V", + c = getopt_long(argc, argv, "hl:d:sTe:UV", long_options, &option_index); if (c == -1) break; @@ -124,6 +128,9 @@ case 'e': log_set_log_level(osmo_stderr_target, atoi(optarg)); break; + case 'U': + cmdline_opts.db_upgrade = true; + break; case 'V': print_version(1); exit(EXIT_SUCCESS); @@ -409,7 +416,7 @@ exit(EXIT_FAILURE); } - g_hlr_db_tool_ctx->dbc = db_open(g_hlr_db_tool_ctx, cmdline_opts.db_file, true); + g_hlr_db_tool_ctx->dbc = db_open(g_hlr_db_tool_ctx, cmdline_opts.db_file, true, cmdline_opts.db_upgrade); if (!g_hlr_db_tool_ctx->dbc) { LOGP(DMAIN, LOGL_FATAL, "Error opening database\n"); exit(EXIT_FAILURE); diff --git a/tests/db/db_test.c b/tests/db/db_test.c index 058588b..c4ed6ed 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -850,7 +850,7 @@ log_set_log_level(osmo_stderr_target, LOGL_ERROR); /* Disable SQLite logging so that we're not vulnerable on SQLite error messages changing across * library versions. */ - dbc = db_open(ctx, "db_test.db", false); + dbc = db_open(ctx, "db_test.db", false, false); log_set_log_level(osmo_stderr_target, 0); OSMO_ASSERT(dbc); -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 10 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:01:43 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Dec 2018 14:01:43 +0000 Subject: Change in osmo-hlr[master]: Rename db_bootstrap.sed to db_sql2c.sed In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/12101 ) Change subject: Rename db_bootstrap.sed to db_sql2c.sed ...................................................................... Rename db_bootstrap.sed to db_sql2c.sed Side effect of the db schema patch, now a mere cosmetic change. Change-Id: I47a101e3b76b2125d786f22bf100604cf5e8eb40 --- M src/Makefile.am R src/db_sql2c.sed 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/Makefile.am b/src/Makefile.am index 4f167f0..7ee019f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ EXTRA_DIST = \ populate_hlr_db.pl \ - db_bootstrap.sed \ + db_sql2c.sed \ $(NULL) BUILT_SOURCES = \ @@ -114,11 +114,11 @@ BOOTSTRAP_SQL = $(top_srcdir)/sql/hlr.sql -db_bootstrap.h: $(BOOTSTRAP_SQL) $(srcdir)/db_bootstrap.sed - echo "/* DO NOT EDIT THIS FILE. It is generated from osmo-hlr.git/sql/hlr.sql */" > "$@" +db_bootstrap.h: $(BOOTSTRAP_SQL) $(srcdir)/db_sql2c.sed + echo "/* DO NOT EDIT THIS FILE. It is generated from files in osmo-hlr.git/sql/ */" > "$@" echo "#pragma once" >> "$@" echo "static const char *stmt_bootstrap_sql[] = {" >> "$@" cat "$(BOOTSTRAP_SQL)" \ - | sed -f "$(srcdir)/db_bootstrap.sed" \ + | sed -f "$(srcdir)/db_sql2c.sed" \ >> "$@" echo "};" >> "$@" diff --git a/src/db_bootstrap.sed b/src/db_sql2c.sed similarity index 93% rename from src/db_bootstrap.sed rename to src/db_sql2c.sed index 60b8243..1d301f8 100644 --- a/src/db_bootstrap.sed +++ b/src/db_sql2c.sed @@ -1,4 +1,4 @@ -# Input to this is sql/hlr.sql. +# Input to this are sql/*.sql files. # # We want each SQL statement line wrapped in "...\n", and each end (";") to # become a comma: -- To view, visit https://gerrit.osmocom.org/12101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I47a101e3b76b2125d786f22bf100604cf5e8eb40 Gerrit-Change-Number: 12101 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:42:35 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:42:35 +0000 Subject: Change in osmo-hlr[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12105 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I62a0c0e9cb384f8909229e153ade5567328e5c61 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/05/12105/1 diff --git a/Makefile.am b/Makefile.am index 210e499..a612bf4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ .version \ $(NULL) -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) pkgconfigdir = $(libdir)/pkgconfig -- To view, visit https://gerrit.osmocom.org/12105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I62a0c0e9cb384f8909229e153ade5567328e5c61 Gerrit-Change-Number: 12105 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:43:00 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:43:00 +0000 Subject: Change in osmo-iuh[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12106 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I3cfc4ccf799108ee2f411be443069c88a013df5b --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/06/12106/1 diff --git a/Makefile.am b/Makefile.am index 2e59306..22dcfe4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ EXTRA_DIST = asn1 .version README.md -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3cfc4ccf799108ee2f411be443069c88a013df5b Gerrit-Change-Number: 12106 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:43:13 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:43:13 +0000 Subject: Change in osmo-pcu[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12107 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I10d1eef9838c0b843a3a4103b7b03e8e9457b69e --- M Makefile.am M contrib/jenkins.sh 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/07/12107/1 diff --git a/Makefile.am b/Makefile.am index 723c9ed..fe94ea2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = include src doc tests contrib EXTRA_DIST = osmoappdesc.py README.md -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5f81978..ea1675c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -77,7 +77,7 @@ autoreconf --install --force ./configure $PCU_CONFIG $MAKE $PARALLEL_MAKE -DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" AM_DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" \ +DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" \ $MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/12107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I10d1eef9838c0b843a3a4103b7b03e8e9457b69e Gerrit-Change-Number: 12107 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:44:45 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:44:45 +0000 Subject: Change in osmo-pcap[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12108 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: Iaac6d41ef1cc2d5449edf870f635b28b045dc7db --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/08/12108/1 diff --git a/Makefile.am b/Makefile.am index 1dd1ff4..3fcbc70 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) -- To view, visit https://gerrit.osmocom.org/12108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaac6d41ef1cc2d5449edf870f635b28b045dc7db Gerrit-Change-Number: 12108 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:44:56 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:44:56 +0000 Subject: Change in osmo-sip-connector[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12109 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I6aadee1ab05b4caec0857e476190db7b83c85984 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/09/12109/1 diff --git a/Makefile.am b/Makefile.am index 84b252a..824b8ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6aadee1ab05b4caec0857e476190db7b83c85984 Gerrit-Change-Number: 12109 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:45:02 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:45:02 +0000 Subject: Change in osmo-ggsn[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12110 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I810b2b96ea077e8bd5ab01df5137e214a4349628 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/10/12110/1 diff --git a/Makefile.am b/Makefile.am index be378be..c2d497c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ EXTRA_DIST = git-version-gen .version README.md README.FreeBSD README.MacOSX -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I810b2b96ea077e8bd5ab01df5137e214a4349628 Gerrit-Change-Number: 12110 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:45:10 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:45:10 +0000 Subject: Change in osmo-sgsn[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12111 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I5bf96adcf06f1844ffc888d8690d2cc0df48e3f9 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/11/12111/1 diff --git a/Makefile.am b/Makefile.am index 1883ab5..7ff989d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5bf96adcf06f1844ffc888d8690d2cc0df48e3f9 Gerrit-Change-Number: 12111 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:45:16 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:45:16 +0000 Subject: Change in osmo-bsc[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12112 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I38bd2bffa24c5b970aa4a42dcfc8d8766bb96046 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/12112/1 diff --git a/Makefile.am b/Makefile.am index 60a5b4e..f42e6d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I38bd2bffa24c5b970aa4a42dcfc8d8766bb96046 Gerrit-Change-Number: 12112 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:45:23 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:45:23 +0000 Subject: Change in osmo-mgw[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12113 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: Ie9db1519e89d2a8ca1e403e480f57d72fc25ab75 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/13/12113/1 diff --git a/Makefile.am b/Makefile.am index 1497f80..3a94711 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9db1519e89d2a8ca1e403e480f57d72fc25ab75 Gerrit-Change-Number: 12113 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:45:30 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:45:30 +0000 Subject: Change in osmo-msc[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12114 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I6eb789b34523ed45a3626972f420d409fbab1597 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/14/12114/1 diff --git a/Makefile.am b/Makefile.am index 9f3644f..3f89896 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6eb789b34523ed45a3626972f420d409fbab1597 Gerrit-Change-Number: 12114 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:45:45 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:45:45 +0000 Subject: Change in openbsc[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12115 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I88cc2058bc4ff07d092b060d4cc4e28c3203c625 --- M openbsc/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/15/12115/1 diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am index 792dcf2..19999b1 100644 --- a/openbsc/Makefile.am +++ b/openbsc/Makefile.am @@ -22,7 +22,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I88cc2058bc4ff07d092b060d4cc4e28c3203c625 Gerrit-Change-Number: 12115 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:45:50 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:45:50 +0000 Subject: Change in libosmo-sccp[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12116 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: Ib3f443e07f51df352357c5a90792bd946efcdf27 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/16/12116/1 diff --git a/Makefile.am b/Makefile.am index 7d09259..a3f76ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = .version git-version-gen osmoappdesc.py doc/examples/osmo-stp.cfg -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3f443e07f51df352357c5a90792bd946efcdf27 Gerrit-Change-Number: 12116 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:45:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:45:57 +0000 Subject: Change in osmo-bts[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12117 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I332c94502cce0f3f11fe3f4d9f6c9918ff0c0263 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/17/12117/1 diff --git a/Makefile.am b/Makefile.am index 5b49bb7..e403f5e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,7 @@ git-version-gen .version \ README.md -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I332c94502cce0f3f11fe3f4d9f6c9918ff0c0263 Gerrit-Change-Number: 12117 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 14:46:07 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 14:46:07 +0000 Subject: Change in osmo-trx[master]: Fix DISTCHECK_CONFIGURE_FLAGS override Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12118 Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I725026cd2dda333085a263c503058aac4305197d --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/12118/1 diff --git a/Makefile.am b/Makefile.am index 38cd88d..79c4e06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,7 +42,7 @@ COPYING \ README -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) .PHONY: release -- To view, visit https://gerrit.osmocom.org/12118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I725026cd2dda333085a263c503058aac4305197d Gerrit-Change-Number: 12118 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:01:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:01:20 +0000 Subject: Change in osmo-hlr[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12105 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62a0c0e9cb384f8909229e153ade5567328e5c61 Gerrit-Change-Number: 12105 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:01:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:01:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:01:34 +0000 Subject: Change in osmo-pcu[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12107 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I10d1eef9838c0b843a3a4103b7b03e8e9457b69e Gerrit-Change-Number: 12107 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:01:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:01:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:01:47 +0000 Subject: Change in osmo-trx[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12118 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I725026cd2dda333085a263c503058aac4305197d Gerrit-Change-Number: 12118 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:01:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:06:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:06:59 +0000 Subject: Change in osmo-bts[master]: oc2g: Fix headers missing during make distcheck Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12119 Change subject: oc2g: Fix headers missing during make distcheck ...................................................................... oc2g: Fix headers missing during make distcheck Change-Id: I2e4aad190c44fea047b4aefcf55335789fa4c571 --- M src/osmo-bts-oc2g/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/19/12119/1 diff --git a/src/osmo-bts-oc2g/Makefile.am b/src/osmo-bts-oc2g/Makefile.am index 7188626..54a8afa 100644 --- a/src/osmo-bts-oc2g/Makefile.am +++ b/src/osmo-bts-oc2g/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = misc/oc2gbts_mgr.h misc/oc2gbts_misc.h misc/oc2gbts_par.h misc/oc2gbts_led.h \ misc/oc2gbts_temp.h misc/oc2gbts_power.h misc/oc2gbts_clock.h \ - misc/oc2gbts_bid.h misc/oc2gbts_nl.h \ + misc/oc2gbts_bid.h misc/oc2gbts_bts.h misc/oc2gbts_nl.h misc/oc2gbts_swd.h \ hw_misc.h l1_if.h l1_transp.h oc2gbts.h oml_router.h utils.h bin_PROGRAMS = osmo-bts-oc2g oc2gbts-mgr oc2gbts-util -- To view, visit https://gerrit.osmocom.org/12119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2e4aad190c44fea047b4aefcf55335789fa4c571 Gerrit-Change-Number: 12119 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:07:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:07:37 +0000 Subject: Change in osmo-bts[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12117 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Build hopefully fixed by https://gerrit.osmocom.org/#/c/osmo-bts/+/12119 -- To view, visit https://gerrit.osmocom.org/12117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I332c94502cce0f3f11fe3f4d9f6c9918ff0c0263 Gerrit-Change-Number: 12117 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:07:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:08:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:08:08 +0000 Subject: Change in openbsc[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12115 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I88cc2058bc4ff07d092b060d4cc4e28c3203c625 Gerrit-Change-Number: 12115 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:08:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:08:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:08:14 +0000 Subject: Change in osmo-bsc[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12112 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38bd2bffa24c5b970aa4a42dcfc8d8766bb96046 Gerrit-Change-Number: 12112 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:08:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:08:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:08:19 +0000 Subject: Change in osmo-msc[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12114 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6eb789b34523ed45a3626972f420d409fbab1597 Gerrit-Change-Number: 12114 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:08:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:08:26 +0000 Subject: Change in osmo-iuh[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12106 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3cfc4ccf799108ee2f411be443069c88a013df5b Gerrit-Change-Number: 12106 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:08:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:08:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:08:33 +0000 Subject: Change in osmo-sgsn[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12111 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5bf96adcf06f1844ffc888d8690d2cc0df48e3f9 Gerrit-Change-Number: 12111 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:08:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:08:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:08:38 +0000 Subject: Change in osmo-bts[master]: oc2g: Fix headers missing during make distcheck In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12119 ) Change subject: oc2g: Fix headers missing during make distcheck ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2e4aad190c44fea047b4aefcf55335789fa4c571 Gerrit-Change-Number: 12119 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Dec 2018 15:08:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:08:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:08:39 +0000 Subject: Change in libosmo-sccp[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12116 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib3f443e07f51df352357c5a90792bd946efcdf27 Gerrit-Change-Number: 12116 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:08:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:08:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:08:44 +0000 Subject: Change in osmo-mgw[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12113 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie9db1519e89d2a8ca1e403e480f57d72fc25ab75 Gerrit-Change-Number: 12113 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:08:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:08:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:08:52 +0000 Subject: Change in osmo-ggsn[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12110 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I810b2b96ea077e8bd5ab01df5137e214a4349628 Gerrit-Change-Number: 12110 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:08:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:08:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:08:57 +0000 Subject: Change in osmo-sip-connector[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12109 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6aadee1ab05b4caec0857e476190db7b83c85984 Gerrit-Change-Number: 12109 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:08:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:09:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:09:02 +0000 Subject: Change in osmo-pcap[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12108 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaac6d41ef1cc2d5449edf870f635b28b045dc7db Gerrit-Change-Number: 12108 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:09:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:10:27 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:10:27 +0000 Subject: Change in osmo-pcap[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12108 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: Iaac6d41ef1cc2d5449edf870f635b28b045dc7db --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 1dd1ff4..3fcbc70 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) -- To view, visit https://gerrit.osmocom.org/12108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaac6d41ef1cc2d5449edf870f635b28b045dc7db Gerrit-Change-Number: 12108 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:10:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:10:34 +0000 Subject: Change in osmo-ggsn[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12110 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I810b2b96ea077e8bd5ab01df5137e214a4349628 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index be378be..c2d497c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ EXTRA_DIST = git-version-gen .version README.md README.FreeBSD README.MacOSX -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I810b2b96ea077e8bd5ab01df5137e214a4349628 Gerrit-Change-Number: 12110 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:10:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:10:37 +0000 Subject: Change in osmo-mgw[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12113 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: Ie9db1519e89d2a8ca1e403e480f57d72fc25ab75 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 1497f80..3a94711 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie9db1519e89d2a8ca1e403e480f57d72fc25ab75 Gerrit-Change-Number: 12113 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:10:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:10:40 +0000 Subject: Change in libosmo-sccp[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12116 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: Ib3f443e07f51df352357c5a90792bd946efcdf27 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 7d09259..a3f76ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = .version git-version-gen osmoappdesc.py doc/examples/osmo-stp.cfg -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib3f443e07f51df352357c5a90792bd946efcdf27 Gerrit-Change-Number: 12116 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:10:42 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:10:42 +0000 Subject: Change in osmo-sgsn[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12111 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I5bf96adcf06f1844ffc888d8690d2cc0df48e3f9 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 1883ab5..7ff989d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5bf96adcf06f1844ffc888d8690d2cc0df48e3f9 Gerrit-Change-Number: 12111 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:10:44 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:10:44 +0000 Subject: Change in osmo-iuh[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12106 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I3cfc4ccf799108ee2f411be443069c88a013df5b --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 2e59306..22dcfe4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ EXTRA_DIST = asn1 .version README.md -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3cfc4ccf799108ee2f411be443069c88a013df5b Gerrit-Change-Number: 12106 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:10:47 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:10:47 +0000 Subject: Change in osmo-msc[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12114 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I6eb789b34523ed45a3626972f420d409fbab1597 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 9f3644f..3f89896 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6eb789b34523ed45a3626972f420d409fbab1597 Gerrit-Change-Number: 12114 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:10:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:10:49 +0000 Subject: Change in osmo-bsc[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12112 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I38bd2bffa24c5b970aa4a42dcfc8d8766bb96046 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 60a5b4e..f42e6d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I38bd2bffa24c5b970aa4a42dcfc8d8766bb96046 Gerrit-Change-Number: 12112 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:10:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:10:52 +0000 Subject: Change in openbsc[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12115 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I88cc2058bc4ff07d092b060d4cc4e28c3203c625 --- M openbsc/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am index 792dcf2..19999b1 100644 --- a/openbsc/Makefile.am +++ b/openbsc/Makefile.am @@ -22,7 +22,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I88cc2058bc4ff07d092b060d4cc4e28c3203c625 Gerrit-Change-Number: 12115 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:11:01 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:11:01 +0000 Subject: Change in osmo-trx[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12118 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I725026cd2dda333085a263c503058aac4305197d --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 38cd88d..79c4e06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,7 +42,7 @@ COPYING \ README -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) .PHONY: release -- To view, visit https://gerrit.osmocom.org/12118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I725026cd2dda333085a263c503058aac4305197d Gerrit-Change-Number: 12118 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:11:04 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:11:04 +0000 Subject: Change in osmo-pcu[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12107 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I10d1eef9838c0b843a3a4103b7b03e8e9457b69e --- M Makefile.am M contrib/jenkins.sh 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 723c9ed..fe94ea2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = include src doc tests contrib EXTRA_DIST = osmoappdesc.py README.md -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5f81978..ea1675c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -77,7 +77,7 @@ autoreconf --install --force ./configure $PCU_CONFIG $MAKE $PARALLEL_MAKE -DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" AM_DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" \ +DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" \ $MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/12107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I10d1eef9838c0b843a3a4103b7b03e8e9457b69e Gerrit-Change-Number: 12107 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:11:07 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:11:07 +0000 Subject: Change in osmo-hlr[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12105 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I62a0c0e9cb384f8909229e153ade5567328e5c61 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index 210e499..a612bf4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ .version \ $(NULL) -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) pkgconfigdir = $(libdir)/pkgconfig -- To view, visit https://gerrit.osmocom.org/12105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I62a0c0e9cb384f8909229e153ade5567328e5c61 Gerrit-Change-Number: 12105 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:11:21 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 4 Dec 2018 15:11:21 +0000 Subject: Change in osmo-sip-connector[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12109 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I6aadee1ab05b4caec0857e476190db7b83c85984 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 84b252a..824b8ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6aadee1ab05b4caec0857e476190db7b83c85984 Gerrit-Change-Number: 12109 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:22:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 15:22:33 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12090 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12090/1/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/12090/1/contrib/jenkins.sh at 8 PS1, Line 8: # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "True") you know, it's really weird to have all variables as "True" except one being "1". I'd also favor "1" but I guess since "True" has been used before, PUBLISH should be the same. -- To view, visit https://gerrit.osmocom.org/12090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5b112fc1663b78800d3c2c4ff2a0771cf5af11b Gerrit-Change-Number: 12090 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:22:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:23:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 15:23:19 +0000 Subject: Change in osmo-bts[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12117 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I332c94502cce0f3f11fe3f4d9f6c9918ff0c0263 Gerrit-Change-Number: 12117 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 15:23:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:24:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 15:24:20 +0000 Subject: Change in osmo-bts[master]: oc2g: Fix headers missing during make distcheck In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12119 ) Change subject: oc2g: Fix headers missing during make distcheck ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2e4aad190c44fea047b4aefcf55335789fa4c571 Gerrit-Change-Number: 12119 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 04 Dec 2018 15:24:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Dec 4 15:24:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 15:24:31 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-s?= =?UTF-8?Q?se,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#715?= Message-ID: <717928454.1017.1543937071971.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Oliver Smith] Fix DISTCHECK_CONFIGURE_FLAGS override ------------------------------------------ [...truncated 124.23 KB...] Making all in lms make[4]: Entering directory ' CXX LMSDevice.lo CXXLD libdevice.la ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' CXX radioVector.lo CXX radioClock.lo CXX radioInterface.lo CXX signalVector.lo CXX Transceiver.lo CXX sigProcLib.lo CXX radioBuffer.lo CXX ChannelizerBase.lo CXX Channelizer.lo CXX Synthesis.lo CXX Resampler.lo CXX radioInterfaceResamp.lo CXX radioInterfaceMulti.lo CXX osmo_trx_uhd-osmo-trx.o CXX osmo_trx_usrp1-osmo-trx.o CXX osmo_trx_lms-osmo-trx.o CXXLD libtransceiver_common.la ar: `u' modifier ignored since `D' is the default (see `U') CXXLD osmo-trx-uhd CXXLD osmo-trx-lms CXXLD osmo-trx-usrp1 make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in contrib make[2]: Entering directory ' Making all in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' Making all in CommonLibs make[3]: Entering directory ' CXX BitVectorTest.o CXX PRBSTest.o CXX TimevalTest.o CXX SocketsTest.o CXX VectorTest.o CXX InterthreadTest.o CXX LogTest.o CXXLD LogTest CXXLD BitVectorTest CXXLD PRBSTest CXXLD TimevalTest CXXLD SocketsTest CXXLD VectorTest CXXLD InterthreadTest make[3]: Leaving directory ' Making all in Transceiver52M make[3]: Entering directory ' CC convolve_test-convolve_test.o CCLD convolve_test make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + make check Making check in doc make[1]: Entering directory ' Making check in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in manuals make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making check in CommonLibs make[1]: Entering directory ' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory ' Making check in GSM make[1]: Entering directory ' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory ' Making check in Transceiver52M make[1]: Entering directory ' Making check in arch make[2]: Entering directory ' Making check in common make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in x86 make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making check in device make[2]: Entering directory ' Making check in usrp1 make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in uhd make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in lms make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making check in contrib make[1]: Entering directory ' Making check in systemd make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making check in tests make[1]: Entering directory ' Making check in CommonLibs make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in Transceiver52M make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' make[2]: Entering directory ' make check-local make[3]: Entering directory ' :;{ \ echo '# Signature of the current package.' && \ echo 'm4_define([AT_PACKAGE_NAME],' && \ echo ' [osmo-trx])' && \ echo 'm4_define([AT_PACKAGE_TARNAME],' && \ echo ' [osmo-trx])' && \ echo 'm4_define([AT_PACKAGE_VERSION],' && \ echo ' [0.4.0.100-4adc])' && \ echo 'm4_define([AT_PACKAGE_STRING],' && \ echo ' [osmo-trx 0.4.0.100-4adc])' && \ echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ echo ' [openbsc at lists.osmocom.org])'; \ echo 'm4_define([AT_PACKAGE_URL],' && \ echo ' [])'; \ } >'./package.m4' /bin/bash ../missing --run autom4te --language=autotest -I '.' -o testsuite.tmp testsuite.at mv testsuite.tmp testsuite /bin/bash './testsuite' ## ----------------------------------- ## ## osmo-trx 0.4.0.100-4adc test suite. ## ## ----------------------------------- ## Regression tests. 1: BitVectorTest ok 2: InterthreadTest ok 3: LogTest ok 4: PRBSTest ok 5: SocketsTest ok 6: TimevalTest FAILED (testsuite.at:38) 7: VectorTest ok 8: convolve_test skipped (testsuite.at:50) ## ------------- ## ## Test results. ## ## ------------- ## ERROR: 7 tests were run, 1 failed unexpectedly. 1 test was skipped. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [osmo-trx 0.4.0.100-4adc] testsuite: 6 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:689: recipe for target 'check-local' failed make[3]: *** [check-local] Error 1 make[3]: Leaving directory ' Makefile:549: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:401: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:516: recipe for target 'check-recursive' failed make: *** [check-recursive] Error 1 + cat-testlogs.sh ======================== ./tests/testsuite.dir/6/testsuite.log # -*- compilation -*- 6. testsuite.at:35: testing TimevalTest ... ./testsuite.at:38: $abs_top_builddir/tests/CommonLibs/TimevalTest stderr: 1543937071.232158 elapsed: -10000 now: 1543937061.242333 then: 1543937071.232158 remaining: 9990 now: 1543937061.742476 then: 1543937071.232158 remaining: 9490 now: 1543937070.357730 then: 1543937071.232158 remaining: 875 now: 1543937070.857855 then: 1543937071.232158 remaining: 375 now: 1543937071.357976 then: 1543937071.232158 remaining: -125 TimevalTest: TimevalTest.cpp:61: int main(int, char**): Assertion `loops >= 18' failed. : line 25: 15391 Aborted $abs_top_builddir/tests/CommonLibs/TimevalTest --- expout 2018-12-04 15:24:21.212009090 +0000 +++ 2018-12-04 15:24:21.212009090 +0000 @@ -1 +0,0 @@ -Done ./testsuite.at:38: exit code was 134, expected 0 6. testsuite.at:35: 6. TimevalTest (testsuite.at:35): FAILED (testsuite.at:38) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:38:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:38:47 +0000 Subject: Change in osmo-trx[master]: Add CTRL log category Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12120 Change subject: Add CTRL log category ...................................................................... Add CTRL log category This log category is applied to messages related to TRX CTRL socket interface, and it's printed in yellow, same color used in osmo-bts-trx for TRX category (so same messages are printed with same color in both sides). Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 --- M CommonLibs/debug.c M CommonLibs/debug.h M Transceiver52M/Transceiver.cpp 3 files changed, 14 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/20/12120/1 diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index c6de21a..dc5ecaa 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -10,6 +10,12 @@ .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DCTRL] = { + .name = "DCTRL", + .description = "TRX CTRL interface", + .color = "\033[1;33m", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, [DDEV] = { .name = "DDEV", .description = "Device/Driver specific code", diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index f8f6239..a6fea6b 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -5,6 +5,7 @@ /* Debug Areas of the code */ enum { DMAIN, + DCTRL, DDEV, DLMS, }; diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 8702fb6..6dae66f 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -715,13 +715,13 @@ /* Verify a command signature */ if (strncmp(buffer, "CMD ", 4)) { - LOG(WARNING) << "bogus message on control interface"; + LOGC(DCTRL, WARNING) << "bogus message on control interface"; return; } /* Set command pointer */ command = buffer + 4; - LOG(INFO) << "chan " << chan << ": command is " << command; + LOGC(DCTRL, INFO) << "chan " << chan << ": command is " << command; if (match_cmd(command, "POWEROFF", NULL)) { stop(); @@ -800,7 +800,7 @@ sscanf(params, "%d", &freqKhz); mRxFreq = freqKhz * 1e3; if (!mRadioInterface->tuneRx(mRxFreq, chan)) { - LOG(ALERT) << "RX failed to tune"; + LOGC(DCTRL, ALERT) << "RX failed to tune"; sprintf(response,"RSP RXTUNE 1 %d",freqKhz); } else @@ -811,7 +811,7 @@ sscanf(params, "%d", &freqKhz); mTxFreq = freqKhz * 1e3; if (!mRadioInterface->tuneTx(mTxFreq, chan)) { - LOG(ALERT) << "TX failed to tune"; + LOGC(DCTRL, ALERT) << "TX failed to tune"; sprintf(response,"RSP TXTUNE 1 %d",freqKhz); } else @@ -823,7 +823,7 @@ if (TSC > 7) { sprintf(response, "RSP SETTSC 1 %d", TSC); } else { - LOG(NOTICE) << "Changing TSC from " << mTSC << " to " << TSC; + LOGC(DCTRL, NOTICE) << "Changing TSC from " << mTSC << " to " << TSC; mTSC = TSC; sprintf(response,"RSP SETTSC 0 %d", TSC); } @@ -833,7 +833,7 @@ int timeslot; sscanf(params, "%d %d", ×lot, &corrCode); if ((timeslot < 0) || (timeslot > 7)) { - LOG(WARNING) << "bogus message on control interface"; + LOGC(DCTRL, WARNING) << "bogus message on control interface"; sprintf(response,"RSP SETSLOT 1 %d %d",timeslot,corrCode); return; } @@ -848,7 +848,7 @@ mWriteBurstToDiskMask = mask; sprintf(response,"RSP _SETBURSTTODISKMASK 0 %d",mask); } else { - LOG(WARNING) << "bogus command " << command << " on control interface."; + LOGC(DCTRL, WARNING) << "bogus command " << command << " on control interface."; sprintf(response,"RSP ERR 1"); } -- To view, visit https://gerrit.osmocom.org/12120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 Gerrit-Change-Number: 12120 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:40:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:40:00 +0000 Subject: Change in osmo-bts[master]: oc2g: Fix headers missing during make distcheck In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12119 ) Change subject: oc2g: Fix headers missing during make distcheck ...................................................................... oc2g: Fix headers missing during make distcheck Change-Id: I2e4aad190c44fea047b4aefcf55335789fa4c571 --- M src/osmo-bts-oc2g/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-oc2g/Makefile.am b/src/osmo-bts-oc2g/Makefile.am index 7188626..54a8afa 100644 --- a/src/osmo-bts-oc2g/Makefile.am +++ b/src/osmo-bts-oc2g/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = misc/oc2gbts_mgr.h misc/oc2gbts_misc.h misc/oc2gbts_par.h misc/oc2gbts_led.h \ misc/oc2gbts_temp.h misc/oc2gbts_power.h misc/oc2gbts_clock.h \ - misc/oc2gbts_bid.h misc/oc2gbts_nl.h \ + misc/oc2gbts_bid.h misc/oc2gbts_bts.h misc/oc2gbts_nl.h misc/oc2gbts_swd.h \ hw_misc.h l1_if.h l1_transp.h oc2gbts.h oml_router.h utils.h bin_PROGRAMS = osmo-bts-oc2g oc2gbts-mgr oc2gbts-util -- To view, visit https://gerrit.osmocom.org/12119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2e4aad190c44fea047b4aefcf55335789fa4c571 Gerrit-Change-Number: 12119 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:40:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:40:00 +0000 Subject: Change in osmo-bts[master]: Fix DISTCHECK_CONFIGURE_FLAGS override In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12117 ) Change subject: Fix DISTCHECK_CONFIGURE_FLAGS override ...................................................................... Fix DISTCHECK_CONFIGURE_FLAGS override Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the automake manual, as otherwise the flag can't be changed by the user anymore. Related: OS#3718 Change-Id: I332c94502cce0f3f11fe3f4d9f6c9918ff0c0263 --- M Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 5b49bb7..e403f5e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,7 @@ git-version-gen .version \ README.md -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/12117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I332c94502cce0f3f11fe3f4d9f6c9918ff0c0263 Gerrit-Change-Number: 12117 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:40:03 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 4 Dec 2018 15:40:03 +0000 Subject: Change in osmo-hlr[master]: store timestamp of last location update seen from subscriber Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12121 Change subject: store timestamp of last location update seen from subscriber ...................................................................... store timestamp of last location update seen from subscriber Store a timestamp of the last location update seen from a subscriber in the HLR DB. Timestamps are stored in a new 'last_lu_seen' column in the 'subscriber' table, in granularity of seconds. At present, osmo-hlr only records these timestamps but otherwise makes no use of them. Because the timestamps are stored in a human-readable formt, they may already provide value to external processes which need this information. For example: sqlite> select imsi,last_lu_seen from subscriber; 901990000000001|2018-12-04 14:17:12 I didn't bother adding additional tests because the code added with this commit is already being exercised by several calls to db_subscr_lu() in db_test.c. This change requires a HLR DB schema update. Existing databases won't be upgraded automatically. However, osmo-hlr will refuse to operate with databases which are not upgraded. Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Related: OS#2838 --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c 4 files changed, 104 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/21/12121/1 diff --git a/sql/hlr.sql b/sql/hlr.sql index 3499109..d1db256 100644 --- a/sql/hlr.sql +++ b/sql/hlr.sql @@ -36,7 +36,10 @@ -- Chapter 2.7.5 ms_purged_cs BOOLEAN NOT NULL DEFAULT 0, -- Chapter 2.7.6 - ms_purged_ps BOOLEAN NOT NULL DEFAULT 0 + ms_purged_ps BOOLEAN NOT NULL DEFAULT 0, + + -- Timestamp of last location update seen from subscriber + last_lu_seen TIMESTAMP default NULL ); CREATE TABLE subscriber_apn ( @@ -69,4 +72,4 @@ CREATE UNIQUE INDEX idx_subscr_imsi ON subscriber (imsi); -- Set HLR database schema version number -PRAGMA user_version = 0; +PRAGMA user_version = 1; diff --git a/src/db.c b/src/db.c index df52f9b..70b5a26 100644 --- a/src/db.c +++ b/src/db.c @@ -27,7 +27,7 @@ #include "db.h" #include "db_bootstrap.h" -#define CURRENT_SCHEMA_VERSION 0 +#define CURRENT_SCHEMA_VERSION 1 #define SEL_COLUMNS \ "id," \ @@ -42,7 +42,8 @@ "nam_ps," \ "lmsi," \ "ms_purged_cs," \ - "ms_purged_ps" + "ms_purged_ps," \ + "last_lu_seen" static const char *stmt_sql[] = { [DB_STMT_SEL_BY_IMSI] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE imsi = ?", @@ -73,6 +74,7 @@ "INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, op, opc, ind_bitlen)" " VALUES($subscriber_id, $algo_id_3g, $k, $op, $opc, $ind_bitlen)", [DB_STMT_AUC_3G_DELETE] = "DELETE FROM auc_3g WHERE subscriber_id = $subscriber_id", + [DB_STMT_SET_LAST_LU_SEEN] = "UPDATE subscriber SET last_lu_seen = datetime($val, 'unixepoch') WHERE id = $subscriber_id", }; static void sql3_error_log_cb(void *arg, int err_code, const char *msg) @@ -252,6 +254,41 @@ return true; } +static int +db_upgrade_v1(struct db_context *dbc) +{ + sqlite3_stmt *stmt; + int rc; + const char *update_stmt_sql = "ALTER TABLE subscriber ADD COLUMN last_lu_seen TIMESTAMP default NULL"; + const char *set_schema_version_sql = "PRAGMA user_version = 1"; + + rc = sqlite3_prepare_v2(dbc->db, update_stmt_sql, -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", update_stmt_sql); + return rc; + } + rc = sqlite3_step(stmt); + db_remove_reset(stmt); + sqlite3_finalize(stmt); + if (rc != SQLITE_DONE) { + LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1); + return rc; + } + + rc = sqlite3_prepare_v2(dbc->db, set_schema_version_sql, -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", set_schema_version_sql); + return rc; + } + rc = sqlite3_step(stmt); + if (rc != SQLITE_DONE) + LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1); + + db_remove_reset(stmt); + sqlite3_finalize(stmt); + return rc; +} + static int db_get_user_version(struct db_context *dbc) { const char *user_version_sql = "PRAGMA user_version"; @@ -346,12 +383,28 @@ rc, sqlite3_errmsg(dbc->db)); goto out_free; } + version = CURRENT_SCHEMA_VERSION; } LOGP(DDB, LOGL_NOTICE, "Database '%s' has HLR DB schema version %d\n", dbc->fname, version); if (version < CURRENT_SCHEMA_VERSION && allow_upgrade) { - /* Future version upgrades will happen here. */ + switch (version) { + case 0: + rc = db_upgrade_v1(dbc); + if (rc != SQLITE_DONE) { + LOGP(DDB, LOGL_ERROR, "Failed to upgrade HLR DB schema to version 1: (rc=%d) %s\n", + rc, sqlite3_errmsg(dbc->db)); + goto out_free; + } + version = 1; + /* fall through */ + /* case N: ... */ + default: + break; + } + LOGP(DDB, LOGL_NOTICE, "Database '%s' has been upgraded to HLR DB schema version %d\n", + dbc->fname, version); } if (version != CURRENT_SCHEMA_VERSION) { diff --git a/src/db.h b/src/db.h index 66dfe57..5129b8d 100644 --- a/src/db.h +++ b/src/db.h @@ -25,6 +25,7 @@ DB_STMT_AUC_2G_DELETE, DB_STMT_AUC_3G_INSERT, DB_STMT_AUC_3G_DELETE, + DB_STMT_SET_LAST_LU_SEEN, _NUM_DB_STMT }; diff --git a/src/db_hlr.c b/src/db_hlr.c index 2bccc38..81897a8 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -577,6 +578,7 @@ { sqlite3_stmt *stmt; int rc, ret = 0; + struct timespec t; stmt = dbc->stmt[is_ps ? DB_STMT_UPD_SGSN_BY_ID : DB_STMT_UPD_VLR_BY_ID]; @@ -603,13 +605,53 @@ ": no such subscriber\n", is_ps? "SGSN" : "VLR", subscr_id); ret = -ENOENT; + goto out; } else if (rc != 1) { LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%"PRId64 ": SQL modified %d rows (expected 1)\n", is_ps? "SGSN" : "VLR", subscr_id, rc); ret = -EIO; + goto out; } + db_remove_reset(stmt); + + if (clock_gettime(CLOCK_MONOTONIC, &t) != 0) { + LOGP(DAUC, LOGL_ERROR, "Cannot get the current time: (%d) %s\n", errno, strerror(errno)); + ret = -errno; + goto out; + } + + stmt = dbc->stmt[DB_STMT_SET_LAST_LU_SEEN]; + + if (!db_bind_int64(stmt, "$subscriber_id", subscr_id)) + return -EIO; + if (!db_bind_int64(stmt, "$val", (int64_t)t.tv_sec)) { + ret = -EIO; + goto out; + } + + rc = sqlite3_step(stmt); + if (rc != SQLITE_DONE) { + LOGP(DAUC, LOGL_ERROR, + "Cannot update LU timestamp for subscriber ID=%"PRId64": SQL error: (%d) %s\n", + subscr_id, rc, sqlite3_errmsg(dbc->db)); + ret = -EIO; + goto out; + } + + /* verify execution result */ + rc = sqlite3_changes(dbc->db); + if (!rc) { + LOGP(DAUC, LOGL_ERROR, "Cannot update LU timestamp for subscriber ID=%"PRId64 + ": no such subscriber\n", subscr_id); + ret = -ENOENT; + goto out; + } else if (rc != 1) { + LOGP(DAUC, LOGL_ERROR, "Update LU timestamp for subscriber ID=%"PRId64 + ": SQL modified %d rows (expected 1)\n", subscr_id, rc); + ret = -EIO; + } out: db_remove_reset(stmt); return ret; -- To view, visit https://gerrit.osmocom.org/12121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Gerrit-Change-Number: 12121 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:41:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 15:41:04 +0000 Subject: Change in osmo-hlr[master]: introduce osmo_gsup_client_create2() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12098 ) Change subject: introduce osmo_gsup_client_create2() ...................................................................... Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/12098/2/src/gsupclient/gsup_client.c File src/gsupclient/gsup_client.c: https://gerrit.osmocom.org/#/c/12098/2/src/gsupclient/gsup_client.c at a178 PS2, Line 178: maybe rather keep this check? What happens if unit_name == NULL? Should we anyway force the caller to set one? I mean, there apparently was a reason for this, and the reason hasn't changed. https://gerrit.osmocom.org/#/c/12098/2/src/gsupclient/gsup_client.c at 260 PS2, Line 260: * Create a gsup client connecting to the specified IP address and TCP port Please use punctuation to end a sentence. (I'm quite astonished at how often I need to say that recently.) This project doesn't build doxygen, but if we use the format it might as well be correct. Also end all \param in a '.'. Also although I personally prefer '/**', osmocom has chosen to use '/*!' as doxygen indicator. -- To view, visit https://gerrit.osmocom.org/12098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ief09677e07d6e977247185b72c605f109aa091f5 Gerrit-Change-Number: 12098 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 04 Dec 2018 15:41:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:49:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:49:15 +0000 Subject: Change in osmo-trx[master]: transceiver: Log CTRL iface responses towards osmo-bts-trx Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12122 Change subject: transceiver: Log CTRL iface responses towards osmo-bts-trx ...................................................................... transceiver: Log CTRL iface responses towards osmo-bts-trx Change-Id: I8128c42e63ab1fcd2a58812f3b7cf94435b5bbd8 --- M Transceiver52M/Transceiver.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/22/12122/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 6dae66f..f9e38f2 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -721,7 +721,7 @@ /* Set command pointer */ command = buffer + 4; - LOGC(DCTRL, INFO) << "chan " << chan << ": command is " << command; + LOGC(DCTRL, INFO) << "chan " << chan << ": command is '" << command << "'"; if (match_cmd(command, "POWEROFF", NULL)) { stop(); @@ -852,6 +852,7 @@ sprintf(response,"RSP ERR 1"); } + LOGC(DCTRL, INFO) << "chan " << chan << ": response is '" << response << "'"; mCtrlSockets[chan]->write(response, strlen(response) + 1); } -- To view, visit https://gerrit.osmocom.org/12122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8128c42e63ab1fcd2a58812f3b7cf94435b5bbd8 Gerrit-Change-Number: 12122 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:51:09 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 4 Dec 2018 15:51:09 +0000 Subject: Change in osmo-trx[master]: Add CTRL log category In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12120 ) Change subject: Add CTRL log category ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12120/1/CommonLibs/debug.h File CommonLibs/debug.h: https://gerrit.osmocom.org/#/c/12120/1/CommonLibs/debug.h at 8 PS1, Line 8: DCTRL, I think it's too easy to confuse with DLCTRL from libosmocore. Maybe call it DCTRLIF or alike? -- To view, visit https://gerrit.osmocom.org/12120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 Gerrit-Change-Number: 12120 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Tue, 04 Dec 2018 15:51:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:52:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Dec 2018 15:52:02 +0000 Subject: Change in osmo-trx[master]: Add CTRL log category In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12120 ) Change subject: Add CTRL log category ...................................................................... Patch Set 1: Actually I would argue to log to DLCTRL in this case. Either you want to see logging of all CTRL related messages at a certain lvel, or not... -- To view, visit https://gerrit.osmocom.org/12120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 Gerrit-Change-Number: 12120 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Tue, 04 Dec 2018 15:52:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:52:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Dec 2018 15:52:22 +0000 Subject: Change in osmo-trx[master]: lms: Make sure LMS_Close is called when Device is torn down In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12086 ) Change subject: lms: Make sure LMS_Close is called when Device is torn down ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I56ffb87079e34aa2d0322fd2ca6429742f9f7640 Gerrit-Change-Number: 12086 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Dec 2018 15:52:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:52:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Dec 2018 15:52:42 +0000 Subject: Change in osmo-trx[master]: osmo-trx: Change some lines to use libosmocore logging instead of cout In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12087 ) Change subject: osmo-trx: Change some lines to use libosmocore logging instead of cout ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66e3c37014ba12cd002e5b678bc0a6026f5dfc7e Gerrit-Change-Number: 12087 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Dec 2018 15:52:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:52:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Dec 2018 15:52:49 +0000 Subject: Change in osmo-trx[master]: lms: Close device on LMS_Init failure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12091 ) Change subject: lms: Close device on LMS_Init failure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0b307452a9e122a0ea39a46f096423c9a5293d30 Gerrit-Change-Number: 12091 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 15:52:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:52:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Dec 2018 15:52:56 +0000 Subject: Change in osmo-trx[master]: lms: Allow setting Tx/RxGain for chan!=0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12096 ) Change subject: lms: Allow setting Tx/RxGain for chan!=0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5fae92a7ed5e2d92be12b9dfd33fc56195030c0b Gerrit-Change-Number: 12096 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Dec 2018 15:52:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:53:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Dec 2018 15:53:39 +0000 Subject: Change in osmo-trx[master]: lms: allow setting Tx/RxFreq for lchan!=0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12097 ) Change subject: lms: allow setting Tx/RxFreq for lchan!=0 ...................................................................... Patch Set 1: missing a "Related: OS#3346 -- To view, visit https://gerrit.osmocom.org/12097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9dd0bb41d1863111d28947fc0d7c7e7ecfaf5fa8 Gerrit-Change-Number: 12097 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 15:53:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:53:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Dec 2018 15:53:43 +0000 Subject: Change in osmo-trx[master]: lms: Allow setting Tx/RxGain for chan!=0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12096 ) Change subject: lms: Allow setting Tx/RxGain for chan!=0 ...................................................................... Patch Set 1: Code-Review+1 missing a "Related: OS#3346 -- To view, visit https://gerrit.osmocom.org/12096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5fae92a7ed5e2d92be12b9dfd33fc56195030c0b Gerrit-Change-Number: 12096 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 04 Dec 2018 15:53:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:53:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Dec 2018 15:53:51 +0000 Subject: Change in osmo-trx[master]: lms: Improve Set{Rx, Tx}{Gain, Freq} logging In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12099 ) Change subject: lms: Improve Set{Rx,Tx}{Gain,Freq} logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6713a27c5f74beb7fcfdd712fcf695afccbc3d76 Gerrit-Change-Number: 12099 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 15:53:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:53:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 4 Dec 2018 15:53:58 +0000 Subject: Change in osmo-trx[master]: transceiver: log chan on CTRL command received In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12100 ) Change subject: transceiver: log chan on CTRL command received ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3b2a35e03a8aaddd6efebc8db2ccca872f51f20 Gerrit-Change-Number: 12100 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 15:53:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:55:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:55:15 +0000 Subject: Change in osmo-trx[master]: Add CTRL log category In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12120 ) Change subject: Add CTRL log category ...................................................................... Patch Set 1: > Actually I would argue to log to DLCTRL in this case. Either you > want to see logging of all CTRL related messages at a certain lvel, > or not... I don't really understand this comment. libosmocore IPA CTRL interface has nothing to do with CTRL socket of the TRX, so for sure I don't want them to be the same category. -- To view, visit https://gerrit.osmocom.org/12120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 Gerrit-Change-Number: 12120 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Tue, 04 Dec 2018 15:55:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:56:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:56:46 +0000 Subject: Change in osmo-trx[master]: Add CTRL log category In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12120 ) Change subject: Add CTRL log category ...................................................................... Patch Set 1: > I think it's too easy to confuse with DLCTRL from libosmocore. Maybe call it DCTRLIF or alike? I originally thought about that too, but I think having CTRL is nicer when reading code (shorter lines). That's what we have DL in front of the libosmocore CTRL iface, to differentiate it. -- To view, visit https://gerrit.osmocom.org/12120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 Gerrit-Change-Number: 12120 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Tue, 04 Dec 2018 15:56:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:57:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:57:37 +0000 Subject: Change in osmo-trx[master]: lms: Make sure LMS_Close is called when Device is torn down In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12086 ) Change subject: lms: Make sure LMS_Close is called when Device is torn down ...................................................................... lms: Make sure LMS_Close is called when Device is torn down This change fixes lots of memory leaks inside libLimeSuite as announced by ASan after exiting the osmo-trx process (throgh CTRL+C for instance). This way also we make sure libLimeSuite can communicate with the HW and close whatever subsystems were enabled during LMS_Open time. Change-Id: I56ffb87079e34aa2d0322fd2ca6429742f9f7640 --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 2 files changed, 11 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 2ceca0d..144f75d 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -57,6 +57,15 @@ m_last_tx_overruns.resize(chans, 0); } +LMSDevice::~LMSDevice() +{ + LOGC(DDEV, INFO) << "Closing LMS device"; + if (m_lms_dev) { + LMS_Close(m_lms_dev); + m_lms_dev = NULL; + } +} + static void lms_log_callback(int lvl, const char *msg) { /* map lime specific log levels */ @@ -204,6 +213,7 @@ out_close: LOGC(DDEV, ALERT) << "Error in LMS open, closing: " << LMS_GetLastErrorMessage(); LMS_Close(m_lms_dev); + m_lms_dev = NULL; return -1; } diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 6635c13..d1a8813 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -74,6 +74,7 @@ LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths); + ~LMSDevice(); /** Instantiate the LMS */ int open(const std::string &args, int ref, bool swap_channels); -- To view, visit https://gerrit.osmocom.org/12086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I56ffb87079e34aa2d0322fd2ca6429742f9f7640 Gerrit-Change-Number: 12086 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:57:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:57:38 +0000 Subject: Change in osmo-trx[master]: osmo-trx: Change some lines to use libosmocore logging instead of cout In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12087 ) Change subject: osmo-trx: Change some lines to use libosmocore logging instead of cout ...................................................................... osmo-trx: Change some lines to use libosmocore logging instead of cout Change-Id: I66e3c37014ba12cd002e5b678bc0a6026f5dfc7e --- M Transceiver52M/osmo-trx.cpp 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index b6b676e..2b69da4 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -398,7 +398,7 @@ int rc; memset(¶m, 0, sizeof(param)); param.sched_priority = prio; - printf("Setting SCHED_RR priority(%d)\n", param.sched_priority); + LOG(INFO) << "Setting SCHED_RR priority " << param.sched_priority; rc = sched_setscheduler(getpid(), SCHED_RR, ¶m); if (rc != 0) { LOG(ERROR) << "Config: Setting SCHED_RR failed"; @@ -441,12 +441,12 @@ } ost << std::endl; - std::cout << ost << std::endl; + LOG(INFO) << ost << std::endl; } static void trx_stop() { - std::cout << "Shutting down transceiver..." << std::endl; + LOG(NOTICE) << "Shutting down transceiver..." << std::endl; delete transceiver; delete radio; @@ -489,7 +489,7 @@ goto shutdown; chans = transceiver->numChans(); - std::cout << "-- Transceiver active with " + LOG(NOTICE) << "-- Transceiver active with " << chans << " channel(s)" << std::endl; return 0; @@ -564,7 +564,7 @@ g_ctrlh = ctrl_interface_setup(NULL, OSMO_CTRL_PORT_TRX, NULL); if (!g_ctrlh) { - fprintf(stderr, "Failed to create CTRL interface.\n"); + LOG(ERROR) << "Failed to create CTRL interface.\n"; exit(1); } -- To view, visit https://gerrit.osmocom.org/12087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I66e3c37014ba12cd002e5b678bc0a6026f5dfc7e Gerrit-Change-Number: 12087 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 15:57:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 15:57:38 +0000 Subject: Change in osmo-trx[master]: lms: Close device on LMS_Init failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12091 ) Change subject: lms: Close device on LMS_Init failure ...................................................................... lms: Close device on LMS_Init failure Change-Id: I0b307452a9e122a0ea39a46f096423c9a5293d30 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 144f75d..712652a 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -135,7 +135,7 @@ LOGC(DDEV, INFO) << "Init LMS device"; if (LMS_Init(m_lms_dev) != 0) { LOGC(DDEV, ERROR) << "LMS_Init() failed"; - return -1; + goto out_close; } if (LMS_GetSampleRateRange(m_lms_dev, LMS_CH_RX, &range_sr)) -- To view, visit https://gerrit.osmocom.org/12091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0b307452a9e122a0ea39a46f096423c9a5293d30 Gerrit-Change-Number: 12091 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Dec 4 16:03:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 4 Dec 2018 16:03:30 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-trx_=C2=BB_--wi?= =?UTF-8?Q?th-sse,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#716?= In-Reply-To: <717928454.1017.1543937071971.JavaMail.jenkins@jenkins.osmocom.org> References: <717928454.1017.1543937071971.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <61567880.1018.1543939410788.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:11:39 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 4 Dec 2018 16:11:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: First SGs testcases In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#10) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: First SGs testcases ...................................................................... WIP: MSC_Tests: First SGs testcases This extens MSC_Tests.ttcn with the first couple of SGs interface test cases for RESET, LU, DETACH, PAGING and SMS procedures In particular the following testcases are added: - TC_sgsap_reset: isolated reset procedure test - TC_sgsap_lu: isolated location update with TMSI realloc - TC_sgsap_lu_imsi_reject: location update, reject case - TC_sgsap_lu_and_nothing: location update with failed TMSI realloc - TC_sgsap_expl_imsi_det_eps: detach from EPS serveces - TC_sgsap_expl_imsi_det_noneps: detach from non-EPS services - TC_sgsap_paging_rej: isolated paging, reject case - TC_sgsap_paging_subscr_rej: isolated paging, subscr rejects call - TC_sgsap_paging_ue_unr: isolated paging, ue is unreachable - TC_sgsap_paging_and_nothing: page, but don't respond - TC_sgsap_mt_sms: mobile terminated SMS through SGs Interface - TC_sgsap_mo_sms: mobile originated SMS through SGs Interface - TC_sgsap_mt_sms_and_nothing: trigger SMS, but don't respond to paging - TC_sgsap_mt_sms_and_reject: trigger SMS, but reject paging - TC_sgsap_unexp_ud: Send unexpected unitdata (SGs Association: NULL) - TC_sgsap_unsol_ud: Send unsolicited unitdata (subscriber not in VLR) Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Related: OS#3645 --- M library/SGsAP_Emulation.ttcn M library/SGsAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.default M msc/MSC_Tests.ttcn M msc/gen_links.sh M msc/regen_makefile.sh 7 files changed, 890 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11488/10 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 10 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:13:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 16:13:23 +0000 Subject: Change in osmo-trx[master]: lms: Allow setting Tx/RxGain for chan!=0 In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12096 to look at the new patch set (#2). Change subject: lms: Allow setting Tx/RxGain for chan!=0 ...................................................................... lms: Allow setting Tx/RxGain for chan!=0 Related: OS#3346 Change-Id: I5fae92a7ed5e2d92be12b9dfd33fc56195030c0b --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/96/12096/2 -- To view, visit https://gerrit.osmocom.org/12096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5fae92a7ed5e2d92be12b9dfd33fc56195030c0b Gerrit-Change-Number: 12096 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:13:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 16:13:23 +0000 Subject: Change in osmo-trx[master]: lms: Allow setting Tx/RxFreq for lchan!=0 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12097 to look at the new patch set (#2). Change subject: lms: Allow setting Tx/RxFreq for lchan!=0 ...................................................................... lms: Allow setting Tx/RxFreq for lchan!=0 Related: OS#3346 Change-Id: I9dd0bb41d1863111d28947fc0d7c7e7ecfaf5fa8 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 0 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/97/12097/2 -- To view, visit https://gerrit.osmocom.org/12097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9dd0bb41d1863111d28947fc0d7c7e7ecfaf5fa8 Gerrit-Change-Number: 12097 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:20:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 16:20:44 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix count in ts_lchans_waiting In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11983 ) Change subject: bsc: timeslot_fsm: Fix count in ts_lchans_waiting ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32008859cc23cd2afddd79daae21497d0945fed0 Gerrit-Change-Number: 11983 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 04 Dec 2018 16:20:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:22:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 16:22:48 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11993 ) Change subject: bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e95a21e5a5ec6c35b1ab20b7a642fd7eb81e556 Gerrit-Change-Number: 11993 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 16:22:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:25:54 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 4 Dec 2018 16:25:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11897 to look at the new patch set (#6). Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... MSC_Test: Test what happens when Paging for SMS is unanswered Trigger sending of an SM, but ignore any paging requests from the MSC, make sure that the MSC is not paging indefinitely Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Related: OS#3704 --- M msc/MSC_Tests.ttcn 1 file changed, 67 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/11897/6 -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:27:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 16:27:23 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH D... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11995 ) Change subject: bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH DEACT ...................................................................... Patch Set 3: Code-Review+2 (3 comments) https://gerrit.osmocom.org/#/c/11995/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11995/3//COMMIT_MSG at 8 PS3, Line 8: DEACT (odd line feed) https://gerrit.osmocom.org/#/c/11995/3//COMMIT_MSG at 16 PS3, Line 16: process aborted due to the defalt switch case. (default) https://gerrit.osmocom.org/#/c/11995/3/src/osmo-bsc/timeslot_fsm.c File src/osmo-bsc/timeslot_fsm.c: https://gerrit.osmocom.org/#/c/11995/3/src/osmo-bsc/timeslot_fsm.c at 539 PS3, Line 539: return; ..and after the PDCH DEACT somehow concludes, the TS sees that there is no lchan waiting anymore and it goes back to UNUSED, right? -- To view, visit https://gerrit.osmocom.org/11995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac Gerrit-Change-Number: 11995 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 16:27:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:28:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 16:28:18 +0000 Subject: Change in osmo-bsc[master]: bsc: timelost_fsm: Remove unneeded set of out variable on failure In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11981 ) Change subject: bsc: timelost_fsm: Remove unneeded set of out variable on failure ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib8f9b7e1f584dee885d6823dc043682577572bd8 Gerrit-Change-Number: 11981 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 16:28:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:30:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 16:30:29 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RE... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11994 ) Change subject: bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RELEASED ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11994/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11994/3//COMMIT_MSG at 9 PS3, Line 9: 20181128193707326 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Freeing instance have you tried 'logging print basename last'? :) (just saying because I really like it.) -- To view, visit https://gerrit.osmocom.org/11994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I43aab5ed8ac369869b191b3b7c938ce4985ab849 Gerrit-Change-Number: 11994 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 04 Dec 2018 16:30:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:31:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 16:31:35 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_fsm: Fix invalid duplicated transition In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11996 ) Change subject: bsc: lchan_fsm: Fix invalid duplicated transition ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d95bbd8244cc8e9c1cfb6fe0f76148332386a3d Gerrit-Change-Number: 11996 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 04 Dec 2018 16:31:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:33:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 16:33:30 +0000 Subject: Change in osmo-bsc[master]: bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12050 ) Change subject: bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie438b4efaa9832c44009a92c3df698875f1fa9ae Gerrit-Change-Number: 12050 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 04 Dec 2018 16:33:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:34:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 16:34:15 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_l... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11982 ) Change subject: bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_lchan_fsms ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9dc2a6e5b15376d049bd2ac5ddfa24340771b5c8 Gerrit-Change-Number: 11982 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 04 Dec 2018 16:34:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:41:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 16:41:27 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11954 ) Change subject: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan ...................................................................... Patch Set 6: Code-Review-1 (2 comments) please submit the for_each fix separately and go ahead and +2 right away. About the comments, I think the first comment isn't saying anything. The second comment is a nice clarification compared to the old one. https://gerrit.osmocom.org/#/c/11954/6/src/osmo-bsc/timeslot_fsm.c File src/osmo-bsc/timeslot_fsm.c: https://gerrit.osmocom.org/#/c/11954/6/src/osmo-bsc/timeslot_fsm.c at 890 PS6, Line 890: /* If we were switching to PDCH, there's no PDCH lchan managed there is no thing as a "PDCH lchan" https://gerrit.osmocom.org/#/c/11954/6/src/osmo-bsc/timeslot_fsm.c at 891 PS6, Line 891: * in BSC, So we need to set it manually. */ "in BSC", i.e. "here"? I don't get this comment at all :) -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 16:41:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:47:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 16:47:28 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11954 ) Change subject: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan ...................................................................... Patch Set 6: (2 comments) I think the comments and the for_each change belong together, since the change in behavior in the for_each section means it's not longer true an "lchan would be waiting" as stated in the old comment. https://gerrit.osmocom.org/#/c/11954/6/src/osmo-bsc/timeslot_fsm.c File src/osmo-bsc/timeslot_fsm.c: https://gerrit.osmocom.org/#/c/11954/6/src/osmo-bsc/timeslot_fsm.c at 890 PS6, Line 890: /* If we were switching to PDCH, there's no PDCH lchan managed > there is no thing as a "PDCH lchan" That's exactly what I'm saying here, for people reading this code which may have not gone through all code base to understand this kind of stuff. I was there and I would have liked to know this kind of information more easily. https://gerrit.osmocom.org/#/c/11954/6/src/osmo-bsc/timeslot_fsm.c at 891 PS6, Line 891: * in BSC, So we need to set it manually. */ > "in BSC", i.e. "here"? [?] yes, here, in BSC. It explains people it's not in the BSC because it's handled somewhere else: the PCU. -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 16:47:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:48:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 16:48:40 +0000 Subject: Change in osmo-bsc[master]: bsc: Fix lchan iteration for dyn TS during PDCH Deact In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11957 ) Change subject: bsc: Fix lchan iteration for dyn TS during PDCH Deact ...................................................................... Patch Set 4: Code-Review+2 (1 comment) the amount of meta overhead compared to this fix is amazing :) https://gerrit.osmocom.org/#/c/11957/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11957/4//COMMIT_MSG at 8 PS4, Line 8: ok, will accept this time, but still: a commit log should first and foremost briefly say what is being done and also why in a way that is quick to read and understand. Imagine someone trying to find a bug and reading all the commit logs. Reading this would be "yes, but what was wrong with the iteration?" which is only revealed three paragraphs later... Add more details in the bottom if you must, but first punch out a crisp TLDR. -- To view, visit https://gerrit.osmocom.org/11957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9cedb77d6578597f1febab36c54b2ee427c7a4a2 Gerrit-Change-Number: 11957 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 16:48:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:56:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 16:56:42 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... Patch Set 5: Code-Review+2 (1 comment) I still don't see thru the code changes, but if you say it fixes it and harald's earlier +2 are enough for me https://gerrit.osmocom.org/#/c/11932/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11932/4//COMMIT_MSG at 32 PS4, Line 32: 20181123044720705 DTRX trx_if.c:492 Response message: 'RSP SETSLOT 0 6 1' yes, but timestamps in a commit log ... about putting the filename in the end: the aim is that the logging context lines up: we often log the same context throughout a .c file, and it helps me a lot to spot stuff going on with a given context if that is always printed at the same indent. Especially if the same fsm instance is logged at from different source files. > I'll submit a new version removing the category log for this patch. would have been fine, was just suggesting changes for future patches -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 16:56:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 16:57:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 16:57:53 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT Before this patch, PDCH DEACT was (n)acked to the BSC without taking into account if TRX succeeded or failed to set the TS: 20181123044720655 DRLL rsl.c:2523 (bts=0,trx=0,ts=0,ss=0) Rx RLL DATA_REQ Abis -> LAPDm 20181123044720700 DRSL rsl.c:2805 (bts=0,trx=0,ts=6,pchan=TCH/F_PDCH as PDCH) ss=0 Rx RSL IPAC_PDCH_DEACT 20181123044720700 DRSL rsl.c:2205 (bts=0,trx=0,ts=6,pchan=TCH/F_PDCH as PDCH) Request to PDCH DEACT, but lchan is still active 20181123044720700 DRSL rsl.c:2131 (bts=0,trx=0,ts=6,ss=0) Tx PDCH DEACT NACK (cause = 0x0f) 20181123044720700 DPCU pcu_sock.c:124 Sending info 20181123044720700 DPCU pcu_sock.c:139 BTS is up 20181123044720700 DPCU pcu_sock.c:232 trx=0 ts=7: available (tsc=7 arfcn=868) 20181123044720703 DPCU pcu_sock.c:608 Deactivate request received: TRX=0 TX=6 20181123044720703 DL1C l1sap.c:1519 deactivating channel chan_nr=TCH/F on TS6 trx=0 20181123044720703 DTRX trx_if.c:242 Enqueuing TRX control command 'CMD NOHANDOVER 6 0' 20181123044720703 DL1C l1sap.c:648 deactivate confirm chan_nr=TCH/F on TS6 trx=0 20181123044720703 DRSL rsl.c:714 (bts=0,trx=0,ts=6,ss=0) not sending REL ACK 20181123044720703 DRSL rsl.c:2264 (bts=0,trx=0,ts=6,ss=0) PDCH DEACT operation: channel disconnected, will reconnect as TCH 20181123044720703 DL1C scheduler.c:593 Configuring multiframe with TCH/F+SACCH trx=0 ts=6 20181123044720703 DTRX trx_if.c:242 Enqueuing TRX control command 'CMD SETSLOT 6 1' 20181123044720703 DL1C l1_if.c:780 (bts=0,trx=0,ts=6) bts_model_ts_connect(as_pchan=TCH/F) success, calling cb_ts_connected() 20181123044720703 DRSL rsl.c:2339 (bts=0,trx=0,ts=6,ss=0) PDCH DEACT operation: timeslot connected as TCH/F 20181123044720703 DRSL rsl.c:2440 (bts=0,trx=0,ts=6,ss=0) TCH/F_PDCH switched to TCH/F mode (ts->flags == 0) 20181123044720703 DRSL rsl.c:2103 (bts=0,trx=0,ts=6,ss=0) Tx PDCH DEACT ACK 20181123044720704 DTRX trx_if.c:492 Response message: 'RSP NOHANDOVER 0 6' 20181123044720705 DTRX trx_if.c:492 Response message: 'RSP SETSLOT 0 6 1' Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c --- 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, 81 insertions(+), 9 deletions(-) Approvals: Neels Hofmeyr: 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 da1b554..290ceee 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -58,6 +59,16 @@ [GSM_PCHAN_UNKNOWN] = 0, }; +static enum gsm_phys_chan_config transceiver_chan_type_2_pchan(uint8_t type) +{ + int i; + for (i = 0; i < _GSM_PCHAN_MAX; i++) { + if (transceiver_chan_types[i] == type) + return (enum gsm_phys_chan_config) i; + } + return GSM_PCHAN_UNKNOWN; +} + struct trx_l1h *trx_l1h_alloc(void *tall_ctx, struct phy_instance *pinst) { struct trx_l1h *l1h; @@ -140,6 +151,34 @@ LID_SACCH, 0); } +static void l1if_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct gsm_bts_trx *trx = pinst->trx; + struct gsm_bts_trx_ts *ts; + enum gsm_phys_chan_config pchan; + + if (tn >= TRX_NR_TS) { + LOGP(DL1C, LOGL_ERROR, "transceiver (%s) SETSLOT invalid param TN (%" PRIu8 ")\n", + phy_instance_name(pinst), tn); + return; + } + + pchan = transceiver_chan_type_2_pchan(type); + if (pchan == GSM_PCHAN_UNKNOWN) { + LOGP(DL1C, LOGL_ERROR, "transceiver (%s) SETSLOT invalid param TS_TYPE (%" PRIu8 ")\n", + phy_instance_name(pinst), type); + return; + } + + ts = &trx->ts[tn]; + LOGP(DL1C, LOGL_DEBUG, "%s l1if_setslot_cb(as_pchan=%s)," + " calling cb_ts_connected(rc=%d)\n", + gsm_ts_name(ts), gsm_pchan_name(pchan), rc); + cb_ts_connected(ts, rc); +} + + /* * transceiver provisioning */ @@ -196,7 +235,7 @@ if (l1h->config.slottype_valid[tn] && !l1h->config.slottype_sent[tn]) { trx_if_cmd_setslot(l1h, tn, - l1h->config.slottype[tn]); + l1h->config.slottype[tn], l1if_setslot_cb); l1h->config.slottype_sent[tn] = 1; } } @@ -775,8 +814,5 @@ if (rc) cb_ts_connected(ts, rc); - LOGP(DL1C, LOGL_NOTICE, "%s bts_model_ts_connect(as_pchan=%s) success," - " calling cb_ts_connected()\n", - gsm_ts_name(ts), gsm_pchan_name(as_pchan)); - cb_ts_connected(ts, 0); + /* cb_ts_connected will be called in l1if_setslot_cb once we receive RSP SETSLOT */ } diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index abe6846..8914557 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -189,6 +189,8 @@ /*! Send a new TRX control command. * \param[inout] l1h TRX Layer1 handle to which to send command * \param[in] criticial + * \param[in] cb callback function to be called when valid response is + * received. Type of cb depends on type of message. * \param[in] cmd zero-terminated string containing command * \param[in] fmt Format string (+ variable list of arguments) * \returns 0 on success; negative on error @@ -196,7 +198,7 @@ * The new ocommand will be added to the end of the control command * queue. */ -static int trx_ctrl_cmd(struct trx_l1h *l1h, int critical, const char *cmd, +static int trx_ctrl_cmd_cb(struct trx_l1h *l1h, int critical, void *cb, const char *cmd, const char *fmt, ...) { struct trx_ctrl_msg *tcm; @@ -231,6 +233,7 @@ tcm->params_len = 0; } tcm->critical = critical; + tcm->cb = cb; /* Avoid adding consecutive duplicate messages, eg: two consecutive POWEROFF */ if(pending) @@ -249,6 +252,7 @@ return 0; } +#define trx_ctrl_cmd(l1h, critical, cmd, fmt, ...) trx_ctrl_cmd_cb(l1h, critical, NULL, cmd, fmt, ##__VA_ARGS__) /*! Send "POWEROFF" command to TRX */ int trx_if_cmd_poweroff(struct trx_l1h *l1h) @@ -315,9 +319,9 @@ } /*! Send "SETSLOT" command to TRX: Configure Channel Combination for TS */ -int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type) +int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type, trx_if_cmd_setslot_cb *cb) { - return trx_ctrl_cmd(l1h, 1, "SETSLOT", "%d %d", tn, type); + return trx_ctrl_cmd_cb(l1h, 1, cb, "SETSLOT", "%d %d", tn, type); } /*! Send "RXTUNE" command to TRX: Tune Receiver to given ARFCN */ @@ -374,6 +378,7 @@ char cmd[50]; char params[100]; int status; + void *cb; }; static int parse_rsp(const char *buf_in, size_t len_in, struct trx_ctrl_rsp *rsp) @@ -437,6 +442,30 @@ return true; } +static int trx_ctrl_rx_rsp_setslot(struct trx_l1h *l1h, struct trx_ctrl_rsp *rsp) +{ + trx_if_cmd_setslot_cb *cb = (trx_if_cmd_setslot_cb*) rsp->cb; + struct phy_instance *pinst = l1h->phy_inst; + unsigned int tn, ts_type; + + if (rsp->status) + LOGP(DTRX, LOGL_ERROR, "transceiver (%s) SETSLOT failed with status %d\n", + phy_instance_name(pinst), rsp->status); + + /* Since message was already validated against CMD we sent, we know format + * of params is: " " */ + if (sscanf(rsp->params, "%u %u", &tn, &ts_type) < 2) { + LOGP(DTRX, LOGL_ERROR, "transceiver (%s) SETSLOT unable to parse params\n", + phy_instance_name(pinst)); + return -EINVAL; + } + + if (cb) + cb(l1h, tn, ts_type, rsp->status); + + return rsp->status == 0 ? 0 : -EINVAL; +} + /* -EINVAL: unrecoverable error, exit BTS * N > 0: try sending originating command again after N seconds * 0: Done with response, get originating command out from send queue @@ -459,6 +488,8 @@ phy_link_state_set(pinst->phy_link, PHY_LINK_SHUTDOWN); return 5; } + } else if (strcmp(rsp->cmd, "SETSLOT") == 0) { + return trx_ctrl_rx_rsp_setslot(l1h, rsp); } if (rsp->status) { @@ -526,6 +557,8 @@ goto rsp_error; } + rsp.cb = tcm->cb; + /* check for response code */ rc = trx_ctrl_rx_rsp(l1h, &rsp, tcm->critical); if (rc == -EINVAL) diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h index 206f5e5..cdfbd41 100644 --- a/src/osmo-bts-trx/trx_if.h +++ b/src/osmo-bts-trx/trx_if.h @@ -12,8 +12,11 @@ int cmd_len; int params_len; int critical; + void *cb; }; +typedef void trx_if_cmd_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc); + void trx_if_init(struct trx_l1h *l1h); int trx_if_cmd_poweroff(struct trx_l1h *l1h); int trx_if_cmd_poweron(struct trx_l1h *l1h); @@ -23,7 +26,7 @@ int trx_if_cmd_setpower(struct trx_l1h *l1h, int db); int trx_if_cmd_setmaxdly(struct trx_l1h *l1h, int dly); int trx_if_cmd_setmaxdlynb(struct trx_l1h *l1h, int dly); -int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type); +int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type, trx_if_cmd_setslot_cb *cb); int trx_if_cmd_rxtune(struct trx_l1h *l1h, uint16_t arfcn); int trx_if_cmd_txtune(struct trx_l1h *l1h, uint16_t arfcn); int trx_if_cmd_handover(struct trx_l1h *l1h, uint8_t tn, uint8_t ss); -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 17:00:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 17:00:19 +0000 Subject: Change in osmo-bsc[master]: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11980 ) Change subject: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11980/3/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/11980/3/include/osmocom/bsc/gsm_data.h at 483 PS3, Line 483: * Iterate all lchan instances set up by this \ref ts type, including those again this is not a doxygen comment (no '/*!' in the start) but still you're using \ref. I'd just drop the doxygen formatting altogether. But doesn't matter much either. -- To view, visit https://gerrit.osmocom.org/11980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1d4bdbfca6b9719f54ee609b6bfadf7f3a4bb43 Gerrit-Change-Number: 11980 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 17:00:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 17:03:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 17:03:21 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH D... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11995 ) Change subject: bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH DEACT ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11995/3/src/osmo-bsc/timeslot_fsm.c File src/osmo-bsc/timeslot_fsm.c: https://gerrit.osmocom.org/#/c/11995/3/src/osmo-bsc/timeslot_fsm.c at 539 PS3, Line 539: return; > .. [?] I think so, through ts_fsm_in_use_onenter calling: osmo_fsm_inst_state_chg(fi, TS_ST_UNUSED, 0, 0); -- To view, visit https://gerrit.osmocom.org/11995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac Gerrit-Change-Number: 11995 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 17:03:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 17:08:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 17:08:34 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH D... In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11995 to look at the new patch set (#4). Change subject: bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH DEACT ...................................................................... bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH DEACT lchan sends TS_EV_LCHAN_UNUSED to its parent (ts) during release time. It was experimentally found that it can happen that an lchan can be terminated while waiting for a PDCH DEACT (N)ACK response. The fsm definition actually states that this event can be received in state TS_ST_WAIT_PDCH_DEACT, but it was not handled before and as a result the process aborted due to the default switch case. Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/11995/4 -- To view, visit https://gerrit.osmocom.org/11995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac Gerrit-Change-Number: 11995 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 17:11:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 17:11:33 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 5: Code-Review-1 (4 comments) I don't like this patch but if you fix the string issues I'm not blocking anymore. https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c at 3916 PS3, Line 3916: "T-number, optionally preceded by 't' or 'T'.") > Following your logic, it's clear that in "foo bar?", ? applies only to last parameter, and not to wh [?] This is about the user typing on the vty and reading the online help. I think above example did show that user experience. I still think this isn't nice: > no timer-dynamic? Calculate T3113 dynamically based on channel config and load because in all cases I know, the help string is useful for the entire command issued so far, not assuming that the user is manually negating what is being said. https://gerrit.osmocom.org/#/c/11654/5/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11654/5/src/osmo-bsc/bsc_vty.c at 3940 PS5, Line 3940: "Calculate T3113 dynamically based on channel config and load\n" as I said, I still think this is misleading and not nice. If you really must do this, then at least define a common FOO_STR instead of duping the char constant. But I'd still urge you to rather fix the vty online doc for the 'no' case. https://gerrit.osmocom.org/#/c/11654/5/src/osmo-bsc/bsc_vty.c at 3941 PS5, Line 3941: "T-number, optionally preceded by 't' or 'T'.") here is another FOO_STR candidate. https://gerrit.osmocom.org/#/c/11654/5/src/osmo-bsc/bsc_vty.c at 3955 PS5, Line 3955: vty_out(vty, "T%d has no dynamic%s", d->T, VTY_NEWLINE); so you also disagree with the other thing I said... -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 17:11:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 17:12:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 17:12:19 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH D... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11995 ) Change subject: bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH DEACT ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac Gerrit-Change-Number: 11995 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 04 Dec 2018 17:12:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 17:19:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 4 Dec 2018 17:19:38 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11954 ) Change subject: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan ...................................................................... Patch Set 7: (2 comments) I still think the one part fixes how it works, and the other just clarifies comments, without changing the meaning of the comments. To me clearly separate changes... https://gerrit.osmocom.org/#/c/11954/6/src/osmo-bsc/timeslot_fsm.c File src/osmo-bsc/timeslot_fsm.c: https://gerrit.osmocom.org/#/c/11954/6/src/osmo-bsc/timeslot_fsm.c at 890 PS6, Line 890: /* If we were switching to PDCH, there's no PDCH lchan managed > That's exactly what I'm saying here, for people reading this code which may have not gone through al [?] the way I read it, it implies that "there is a PDCH lchan, but it is not managed here". Also when doing PDCH_ACT, we simply and plainly are switching to PDCH, there isn't even an lchan involved. We're switching *because* all lchans are gone. And always to PDCH, as the code aptly shows. Nothing to do with "manual" or "PDCH lchans" :P https://gerrit.osmocom.org/#/c/11954/6/src/osmo-bsc/timeslot_fsm.c at 891 PS6, Line 891: * in BSC, So we need to set it manually. */ > yes, here, in BSC. [?] can we rephrase it so it still helps future readers while it doesn't make me twitch? When switching to PDCH, there are no lchans and we are telling the PCU to take over the timeslot. ? -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 7 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 17:19:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 17:33:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 17:33:18 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11954 to look at the new patch set (#8). Change subject: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan ...................................................................... bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan If ts_is_lchan_waiting_for_pchan() wasn't accounting for TCH lchans waiting for TS to deactive PDCH in order to setup the TS as TCH. Since now TCH lchan is catched by ts_is_lchan_waiting_for_pchan() when TS state is TS_ST_WAIT_PDCH_DEACT, there's no need to check for that case in caller ts_is_pchan_switching(), since it will never hit because the callee returns true in that case now. See osmo-bsc I9cedb77d6578597f1febab36c54b2ee427c7a4a2 for similar extensive explanation. Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/11954/8 -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 8 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 17:42:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 17:42:34 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/11654/5/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11654/5/src/osmo-bsc/bsc_vty.c at 3955 PS5, Line 3955: vty_out(vty, "T%d has no dynamic%s", d->T, VTY_NEWLINE); > so you also disagree with the other thing I said... Yes, I disagree but I'll change it in order to get this patch merged, since it makes no sense to keep this patch forever unmerged for this kind of reasons. -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 04 Dec 2018 17:42:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 17:48:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 17:48:24 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Hello Stefan Sperling, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11654 to look at the new patch set (#6). Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... paging: Add VTY options to calculate T3113 timeout dynamically The idea is to have a base static value which is set like before "timer t3113 [seconds]", but now have a part of this timeout calculated dynamically based on BTS channel configuration and channel load. This patch only implements initial support to calculate based on channel configuration, but doesn't include code to calculate based on channel load. To implement the later part, we probably need to keep track of BTS paging queues per paging group, which we don't do nowadays. Dynamic calculation is enabled by default, and default static base value is decreased accordingly. This way, in a typical setup were the default 10 seconds were used, now the calculated final value is 11 seconds. That's intended because it was observed experimentally in osmo-gsm-tester with a similar channel setup that sometimes paging response can arrive slightly later than 10 seconds. Related: OS#3680 Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/gsm_timers.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/gsm_timers_vty.c M src/osmo-bsc/net_init.c M src/osmo-bsc/paging.c 7 files changed, 86 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/11654/6 -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 18:51:02 2018 From: gerrit-no-reply at lists.osmocom.org (lazlo) Date: Tue, 4 Dec 2018 18:51:02 +0000 Subject: Change in pysim[master]: utils: add EF [H|O]PLMNwAcT decoding. Message-ID: lazlo has uploaded this change for review. ( https://gerrit.osmocom.org/12123 Change subject: utils: add EF [H|O]PLMNwAcT decoding. ...................................................................... utils: add EF [H|O]PLMNwAcT decoding. Allow decoding and pretty printing of PLMNwAcT, HPLMNwAcT and OPLMNwAct. Includes unit tests for the added functions. Change-Id: I9b8ca6ffd98f665690b84239d9a228e2c72c6ff9 --- M pySim-read.py M pySim/utils.py A pySim/utils_test.py 3 files changed, 153 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/23/12123/1 diff --git a/pySim-read.py b/pySim-read.py index 4356453..70d3f14 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -37,7 +37,7 @@ import simplejson as json from pySim.commands import SimCardCommands -from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid +from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, format_xplmn_w_act def parse_options(): @@ -129,7 +129,7 @@ try: (res, sw) = scc.read_binary(EF['PLMNwAcT']) if sw == '9000': - print("PLMNwAcT: %s" % (res)) + print("PLMNwAcT: %s" % (format_xplmn_w_act(res))) else: print("PLMNwAcT: Can't read, response code = %s" % (sw,)) except Exception as e: @@ -139,7 +139,7 @@ try: (res, sw) = scc.read_binary(EF['OPLMNwAcT']) if sw == '9000': - print("OPLMNwAcT: %s" % (res)) + print("OPLMNwAcT: %s" % (format_xplmn_w_act(res))) else: print("OPLMNwAcT: Can't read, response code = %s" % (sw,)) except Exception as e: @@ -149,7 +149,7 @@ try: (res, sw) = scc.read_binary(EF['HPLMNAcT']) if sw == '9000': - print("HPLMNAcT: %s" % (res)) + print("HPLMNAcT: %s" % (format_xplmn_w_act(res))) else: print("HPLMNAcT: Can't read, response code = %s" % (sw,)) except Exception as e: diff --git a/pySim/utils.py b/pySim/utils.py index ba94702..3ea543f 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -113,6 +113,79 @@ 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) ] + +# Accepts hex string representing three bytes +def dec_mcc_from_plmn(plmn): + ia = h2i(plmn) + digit1 = ia[0] & 0x0F # 1st byte, LSB + digit2 = (ia[0] & 0xF0) >> 4 # 1st byte, MSB + digit3 = ia[1] & 0x0F # 2nd byte, LSB + if digit3 == 0xF and digit2 == 0xF and digit1 == 0xF: + return 0xFFF # 4095 + mcc = digit1 * 100 + mcc += digit2 * 10 + mcc += digit3 + return mcc + +def dec_mnc_from_plmn(plmn): + ia = h2i(plmn) + digit1 = ia[2] & 0x0F # 3rd byte, LSB + digit2 = (ia[2] & 0xF0) >> 4 # 3rd byte, MSB + digit3 = (ia[1] & 0xF0) >> 4 # 2nd byte, MSB + if digit3 == 0xF and digit2 == 0xF and digit1 == 0xF: + return 0xFFF # 4095 + mnc = 0 + # signifies two digit MNC + if digit3 == 0xF: + mnc += digit1 * 10 + mnc += digit2 + else: + mnc += digit1 * 100 + mnc += digit2 * 10 + mnc += digit3 + return mnc + +def dec_act(twohexbytes): + act_list = [ + {'bit': 15, 'name': "UTRAN"}, + {'bit': 14, 'name': "E-UTRAN"}, + {'bit': 7, 'name': "GSM"}, + {'bit': 6, 'name': "GSM COMPACT"}, + {'bit': 5, 'name': "cdma2000 HRPD"}, + {'bit': 4, 'name': "cdma2000 1xRTT"}, + ] + ia = h2i(twohexbytes) + u16t = (ia[0] << 8)|ia[1] + sel = [] + for a in act_list: + if u16t & (1 << a['bit']): + sel.append(a['name']) + return sel + +def dec_xplmn_w_act(fivehexbytes): + res = {'mcc': 0, 'mnc': 0, 'act': []} + plmn_chars = 6 + act_chars = 4 + plmn_str = fivehexbytes[:plmn_chars] # first three bytes (six ascii hex chars) + act_str = fivehexbytes[plmn_chars:plmn_chars + act_chars] # two bytes after first three bytes + res['mcc'] = dec_mcc_from_plmn(plmn_str) + res['mnc'] = dec_mnc_from_plmn(plmn_str) + res['act'] = dec_act(act_str) + return res + +def format_xplmn_w_act(hexstr): + s = "" + for rec_data in hexstr_to_fivebytearr(hexstr): + rec_info = dec_xplmn_w_act(rec_data) + if rec_info['mcc'] == 0xFFF and rec_info['mnc'] == 0xFFF: + rec_str = "unused" + else: + rec_str = "MCC: %3s MNC: %3s AcT: %s" % (rec_info['mcc'], rec_info['mnc'], ", ".join(rec_info['act'])) + s += "%s # %s\n" % (rec_data, rec_str) + return s + def derive_milenage_opc(ki_hex, op_hex): """ Run the milenage algorithm to calculate OPC from Ki and OP diff --git a/pySim/utils_test.py b/pySim/utils_test.py new file mode 100644 index 0000000..ff028da --- /dev/null +++ b/pySim/utils_test.py @@ -0,0 +1,76 @@ +#!/usr/bin/pyton + +import unittest +import utils + +class DecTestCase(unittest.TestCase): + + def testSplitHexStringToListOf5ByteEntries(self): + input_str = "ffffff0003ffffff0002ffffff0001" + expected = [ + "ffffff0003", + "ffffff0002", + "ffffff0001", + ] + self.assertEqual(utils.hexstr_to_fivebytearr(input_str), expected) + + def testDecMCCfromPLMN(self): + self.assertEqual(utils.dec_mcc_from_plmn("92f501"), 295) + + def testDecMCCfromPLMN_unused(self): + self.assertEqual(utils.dec_mcc_from_plmn("ff0f00"), 4095) + + def testDecMNCfromPLMN_twoDigitMNC(self): + self.assertEqual(utils.dec_mnc_from_plmn("92f501"), 10) + + def testDecMNCfromPLMN_threeDigitMNC(self): + self.assertEqual(utils.dec_mnc_from_plmn("031263"), 361) + + def testDecMNCfromPLMN_unused(self): + self.assertEqual(utils.dec_mnc_from_plmn("00f0ff"), 4095) + + def testDecAct_noneSet(self): + self.assertEqual(utils.dec_act("0000"), []) + + def testDecAct_onlyUtran(self): + self.assertEqual(utils.dec_act("8000"), ["UTRAN"]) + + def testDecAct_onlyEUtran(self): + self.assertEqual(utils.dec_act("4000"), ["E-UTRAN"]) + + def testDecAct_onlyGsm(self): + self.assertEqual(utils.dec_act("0080"), ["GSM"]) + + def testDecAct_onlyGsmCompact(self): + self.assertEqual(utils.dec_act("0040"), ["GSM COMPACT"]) + + def testDecAct_onlyCdma2000HRPD(self): + self.assertEqual(utils.dec_act("0020"), ["cdma2000 HRPD"]) + + def testDecAct_onlyCdma20001xRTT(self): + self.assertEqual(utils.dec_act("0010"), ["cdma2000 1xRTT"]) + + def testDecAct_allSet(self): + self.assertEqual(utils.dec_act("ffff"), ["UTRAN", "E-UTRAN", "GSM", "GSM COMPACT", "cdma2000 HRPD", "cdma2000 1xRTT"]) + + def testDecxPlmn_w_act(self): + expected = {'mcc': 295, 'mnc': 10, 'act': ["UTRAN"]} + self.assertEqual(utils.dec_xplmn_w_act("92f5018000"), expected) + + def testFormatxPlmn_w_act(self): + input_str = "92f501800092f5508000ffffff0000ffffff0000ffffff0000ffffff0000ffffff0000ffffff0000ffffff0000ffffff0000" + expected = '''92f5018000 # MCC: 295 MNC: 10 AcT: UTRAN +92f5508000 # MCC: 295 MNC: 5 AcT: UTRAN +ffffff0000 # unused +ffffff0000 # unused +ffffff0000 # unused +ffffff0000 # unused +ffffff0000 # unused +ffffff0000 # unused +ffffff0000 # unused +ffffff0000 # unused +''' + self.assertEqual(utils.format_xplmn_w_act(input_str), expected) + +if __name__ == "__main__": + unittest.main() -- To view, visit https://gerrit.osmocom.org/12123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9b8ca6ffd98f665690b84239d9a228e2c72c6ff9 Gerrit-Change-Number: 12123 Gerrit-PatchSet: 1 Gerrit-Owner: lazlo -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 19:07:04 2018 From: gerrit-no-reply at lists.osmocom.org (lazlo) Date: Tue, 4 Dec 2018 19:07:04 +0000 Subject: Change in pysim[master]: utils: Remove call to format_xplmn_w_act() in pySim-read.py for now (... Message-ID: lazlo has uploaded this change for review. ( https://gerrit.osmocom.org/12124 Change subject: utils: Remove call to format_xplmn_w_act() in pySim-read.py for now (not to break card tests). ...................................................................... utils: Remove call to format_xplmn_w_act() in pySim-read.py for now (not to break card tests). Change-Id: I39d3c1fb217ef91d311e6607c0d50722576c4576 --- M pySim-read.py 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/12124/1 diff --git a/pySim-read.py b/pySim-read.py index 70d3f14..4356453 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -37,7 +37,7 @@ import simplejson as json from pySim.commands import SimCardCommands -from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, format_xplmn_w_act +from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid def parse_options(): @@ -129,7 +129,7 @@ try: (res, sw) = scc.read_binary(EF['PLMNwAcT']) if sw == '9000': - print("PLMNwAcT: %s" % (format_xplmn_w_act(res))) + print("PLMNwAcT: %s" % (res)) else: print("PLMNwAcT: Can't read, response code = %s" % (sw,)) except Exception as e: @@ -139,7 +139,7 @@ try: (res, sw) = scc.read_binary(EF['OPLMNwAcT']) if sw == '9000': - print("OPLMNwAcT: %s" % (format_xplmn_w_act(res))) + print("OPLMNwAcT: %s" % (res)) else: print("OPLMNwAcT: Can't read, response code = %s" % (sw,)) except Exception as e: @@ -149,7 +149,7 @@ try: (res, sw) = scc.read_binary(EF['HPLMNAcT']) if sw == '9000': - print("HPLMNAcT: %s" % (format_xplmn_w_act(res))) + print("HPLMNAcT: %s" % (res)) else: print("HPLMNAcT: Can't read, response code = %s" % (sw,)) except Exception as e: -- To view, visit https://gerrit.osmocom.org/12124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I39d3c1fb217ef91d311e6607c0d50722576c4576 Gerrit-Change-Number: 12124 Gerrit-PatchSet: 1 Gerrit-Owner: lazlo -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 19:56:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 4 Dec 2018 19:56:49 +0000 Subject: Change in osmo-trx[master]: lms: Move {under, over}run checks into separate method Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12125 Change subject: lms: Move {under,over}run checks into separate method ...................................................................... lms: Move {under,over}run checks into separate method Change-Id: I7f450aa79f6285d14826c40ecfdd9490d00509ef --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 2 files changed, 18 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/25/12125/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 9804bbd..8ad7115 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -499,13 +499,27 @@ return GSM::Time(6,7); } +void LMSDevice::update_stream_stats(size_t chan, bool * underrun, bool * overrun) +{ + lms_stream_status_t status; + if (LMS_GetStreamStatus(&m_lms_stream_rx[chan], &status) == 0) { + if (status.underrun > m_last_rx_underruns[chan]) + *underrun = true; + m_last_rx_underruns[chan] = status.underrun; + + if (status.overrun > m_last_rx_overruns[chan]) + *overrun = true; + m_last_rx_overruns[chan] = status.overrun; + LOGC(DDEV, NOTICE) << "chan " << chan << ": underrun " << status.underrun << ", overrun " << status.overrun; + } +} + // NOTE: Assumes sequential reads int LMSDevice::readSamples(std::vector < short *>&bufs, int len, bool * overrun, TIMESTAMP timestamp, bool * underrun, unsigned *RSSI) { int rc = 0; unsigned int i; - lms_stream_status_t status; lms_stream_meta_t rx_metadata = {}; rx_metadata.flushPartialPacket = false; rx_metadata.waitForTimestamp = false; @@ -521,23 +535,14 @@ for (i = 0; i Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 21:41:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 4 Dec 2018 21:41:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler.ttcn: split up f_mo_sms() into two functions In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11717 ) Change subject: BSC_ConnectionHandler.ttcn: split up f_mo_sms() into two functions ...................................................................... BSC_ConnectionHandler.ttcn: split up f_mo_sms() into two functions This would allow to submit an SMS message using f_mo_sms_submit() and wait for RP-ACK using f_mo_sms_wait_rp_ack() separately in the follow-up changes for SMS over GSUP. Change-Id: I5b35206286ae8add8b5bd34b0ab41ba7862c28e4 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 29 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index bf7a6d2..17d9591 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -806,17 +806,13 @@ } } -/* Submit a MO-SMS over an already existing (and authenticated, ...) DTAP connection */ -function f_mo_sms(inout SmsParameters spars) +/* Submit a MO-SMS over an already existing DTAP connection */ +function f_mo_sms_submit(inout SmsParameters spars) runs on BSC_ConnHdlr { var template (value) TPDU_RP_DATA_MS_SGSN tp_mo; var template (value) RPDU_MS_SGSN rp_mo; var template (value) PDU_ML3_MS_NW l3_mo; - var template TPDU_RP_DATA_SGSN_MS tp_mt; - var template RPDU_SGSN_MS rp_mt; - var template PDU_ML3_NW_MS l3_mt; - var default d := activate(as_other_sms()); /* just in case this is routed to SMPP.. */ @@ -830,6 +826,24 @@ /* receive CP-ACK for CP-DATA above */ BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_SMS(spars.tid, c_TIF_REPL, tr_CP_ACK_MT), spars.dlci)); + deactivate(d); + setverdict(pass); +} + +/* Wait RP-ACK for MO-SMS on an already existing DTAP connection */ +function f_mo_sms_wait_rp_ack(inout SmsParameters spars) +runs on BSC_ConnHdlr { + var template (value) PDU_ML3_MS_NW l3_mo; + + var template TPDU_RP_DATA_SGSN_MS tp_mt; + var template RPDU_SGSN_MS rp_mt; + var template PDU_ML3_NW_MS l3_mt; + + var default d := activate(as_other_sms()); + + /* just in case this is routed to SMPP.. */ + f_create_smpp_expect(hex2str(spars.tp.da.tP_DA_NoPad.tP_DAValue)); + if (ispresent(spars.exp_rp_err)) { /* expect an RP-ERROR message from MSC with given cause */ rp_mt := tr_RP_ERROR_MT(spars.rp.msg_ref, spars.exp_rp_err); @@ -847,10 +861,19 @@ l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_ACK_MO); BSSAP.send(ts_PDU_DTAP_MO(l3_mo, spars.dlci, true)); } + deactivate(d); setverdict(pass); } +/* Submit a MO-SMS, and wait for RP-ACK on an existing + * (and authenticated, ...) DTAP connection */ +function f_mo_sms(inout SmsParameters spars) +runs on BSC_ConnHdlr { + f_mo_sms_submit(spars); + f_mo_sms_wait_rp_ack(spars); +} + /* receive MT-SMS delivered from the MSC/SMSC over an already existing DTAP connection */ function f_mt_sms(inout SmsParameters spars) runs on BSC_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/11717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5b35206286ae8add8b5bd34b0ab41ba7862c28e4 Gerrit-Change-Number: 11717 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 21:41:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 4 Dec 2018 21:41:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler.ttcn: split up f_mt_sms() into two functions In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11922 ) Change subject: BSC_ConnectionHandler.ttcn: split up f_mt_sms() into two functions ...................................................................... BSC_ConnectionHandler.ttcn: split up f_mt_sms() into two functions This would allow to expect a MT SMS message using f_mt_sms_expect() and send an RP-ACK using f_mt_sms_send_rp_ack() separately in the follow-up changes for SMS over GSUP. Change-Id: I4730634a9f3352b6f8553ee2fd1d43044f41241e --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 23 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 17d9591..e66a3e6 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -874,17 +874,13 @@ f_mo_sms_wait_rp_ack(spars); } -/* receive MT-SMS delivered from the MSC/SMSC over an already existing DTAP connection */ -function f_mt_sms(inout SmsParameters spars) +/* Wait for MT SMS on an already existing DTAP connection */ +function f_mt_sms_expect(inout SmsParameters spars) runs on BSC_ConnHdlr { - var template (value) TPDU_RP_DATA_MS_SGSN tp_mo; - var template (value) RPDU_MS_SGSN rp_mo; var template (value) PDU_ML3_MS_NW l3_mo; - var template TPDU_RP_DATA_SGSN_MS tp_mt; var template RPDU_SGSN_MS rp_mt; var template PDU_ML3_NW_MS l3_mt; - var PDU_DTAP_MT dtap_mt; var default d := activate(as_other_sms()); @@ -894,6 +890,7 @@ rp_mt := tr_RP_DATA_MT(?, ?, omit, tp_mt); l3_mt := tr_ML3_MT_SMS(?, c_TIF_ORIG, tr_CP_DATA_MT(rp_mt)); BSSAP.receive(tr_PDU_DTAP_MT(l3_mt, spars.dlci)) -> value dtap_mt; + /* Extract relevant identifiers */ spars.tid := bit2int(dtap_mt.dtap.tiOrSkip.transactionId.tio); spars.rp.msg_ref := dtap_mt.dtap.msgs.sms.cP_DATA.cP_User_Data.cP_RPDU.rP_DATA_SGSN_MS.rP_MessageReference; @@ -902,6 +899,19 @@ l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_REPL, ts_CP_ACK_MO); BSSAP.send(ts_PDU_DTAP_MO(l3_mo, spars.dlci, true)); + deactivate(d); + setverdict(pass); +} + +/* Send RP-ACK for MT-SMS over an already existing DTAP connection */ +function f_mt_sms_send_rp_ack(inout SmsParameters spars) +runs on BSC_ConnHdlr { + var template (value) RPDU_MS_SGSN rp_mo; + var template (value) PDU_ML3_MS_NW l3_mo; + var template PDU_ML3_NW_MS l3_mt; + + var default d := activate(as_other_sms()); + /* send RP-ACK for RP-DATA */ rp_mo := ts_RP_ACK_MO(spars.rp.msg_ref); l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_REPL, ts_CP_DATA_MO(rp_mo)); @@ -915,6 +925,13 @@ setverdict(pass); } +/* Wait for a MT-SMS and send RP-ACK over an already existing + * (and authenticated, ...) DTAP connection */ +function f_mt_sms(inout SmsParameters spars) +runs on BSC_ConnHdlr { + f_mt_sms_expect(spars); + f_mt_sms_send_rp_ack(spars); +} -- To view, visit https://gerrit.osmocom.org/11922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4730634a9f3352b6f8553ee2fd1d43044f41241e Gerrit-Change-Number: 11922 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 21:41:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 4 Dec 2018 21:41:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler.ttcn: introduce f_mt_sms_send_rp_error() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11923 ) Change subject: BSC_ConnectionHandler.ttcn: introduce f_mt_sms_send_rp_error() ...................................................................... BSC_ConnectionHandler.ttcn: introduce f_mt_sms_send_rp_error() Change-Id: I3d67a451335e1c1e1b18237fdda82260c0c969fb --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index e66a3e6..f005e02 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -925,6 +925,28 @@ setverdict(pass); } +/* Send RP-ERROR for MT-SMS over an already existing DTAP connection */ +function f_mt_sms_send_rp_error(inout SmsParameters spars, uint7_t cause) +runs on BSC_ConnHdlr { + var template (value) RPDU_MS_SGSN rp_mo; + var template (value) PDU_ML3_MS_NW l3_mo; + var template PDU_ML3_NW_MS l3_mt; + + var default d := activate(as_other_sms()); + + /* send RP-ACK for RP-DATA */ + rp_mo := ts_RP_ERROR_MO(spars.rp.msg_ref, cause); + l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_REPL, ts_CP_DATA_MO(rp_mo)); + BSSAP.send(ts_PDU_DTAP_MO(l3_mo, spars.dlci, true)); + + /* expect CP-ACK for CP-DATA(RP-ERROR) just sent */ + l3_mt := tr_ML3_MT_SMS(spars.tid, c_TIF_ORIG, tr_CP_ACK_MT); + BSSAP.receive(tr_PDU_DTAP_MT(l3_mt, spars.dlci)); + + deactivate(d); + setverdict(pass); +} + /* Wait for a MT-SMS and send RP-ACK over an already existing * (and authenticated, ...) DTAP connection */ function f_mt_sms(inout SmsParameters spars) -- To view, visit https://gerrit.osmocom.org/11923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3d67a451335e1c1e1b18237fdda82260c0c969fb Gerrit-Change-Number: 11923 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 4 21:46:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 4 Dec 2018 21:46:37 +0000 Subject: Change in osmo-trx[master]: SigProcLib: Improve Vector buffer allocation mess In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12085 ) Change subject: SigProcLib: Improve Vector buffer allocation mess ...................................................................... Patch Set 1: (5 comments) https://gerrit.osmocom.org/#/c/12085/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12085/1//COMMIT_MSG at 10 PS1, Line 10: chunk (s) https://gerrit.osmocom.org/#/c/12085/1//COMMIT_MSG at 11 PS1, Line 11: native repeating native https://gerrit.osmocom.org/#/c/12085/1/CommonLibs/Vector.h File CommonLibs/Vector.h: https://gerrit.osmocom.org/#/c/12085/1/CommonLibs/Vector.h at 182 PS1, Line 182: = missing space https://gerrit.osmocom.org/#/c/12085/1/CommonLibs/Vector.h at 183 PS1, Line 183: =o missing space https://gerrit.osmocom.org/#/c/12085/1/Transceiver52M/signalVector.h File Transceiver52M/signalVector.h: https://gerrit.osmocom.org/#/c/12085/1/Transceiver52M/signalVector.h at 16 PS1, Line 16: = cosmetic.issues++: missing spaces -- To view, visit https://gerrit.osmocom.org/12085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie484a4762a7f77fe1b105188ea03a6f025730b82 Gerrit-Change-Number: 12085 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 04 Dec 2018 21:46:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 02:27:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 02:27:31 +0000 Subject: Change in osmo-msc[master]: make: prepare for adding transcript tests Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12126 Change subject: make: prepare for adding transcript tests ...................................................................... make: prepare for adding transcript tests Separate 'make python-test' into separate make targets, to sensibly add VTY transcript tests in an upcoming commit. Feature: even though ./configure was called without --enable-external-tests, each of the {ctrl,vty}x{python,transcript} tests can be invoked individually by e.g. 'make vty-python-test'. A peculiarity is that we use AM_PYTHON_PATH to figure out the 'python' command to invoke as $(PYTHON), but it is empty when not configured with --enable-external-tests. In that case, explain to the user that passing 'PYTHON=python' as make argument still allows running the tests. We could always invoke AM_PYTHON_PATH, but that's not really needed. Both 'vty-transcript-test' and 'ctrl-transcript-test' are still empty, a subsequent patch adds a vty-transcript-test. All of this in preparation of tweaking the 'mncc' vty configuration, to be able to track it in a vty transcript test. Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 --- M tests/Makefile.am 1 file changed, 35 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/12126/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index c225afa..fce110d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -44,19 +44,46 @@ if ENABLE_EXT_TESTS python-tests: $(BUILT_SOURCES) - osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - $(PYTHON) $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v - $(PYTHON) $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v -if BUILD_SMPP - $(PYTHON) $(srcdir)/smpp_test_runner.py -w $(abs_top_builddir) -v -endif - rm -f $(top_builddir)/sms.db +# don't run vty and ctrl tests concurrently so that the ports don't conflict + $(MAKE) vty-test + $(MAKE) ctrl-test else python-tests: $(BUILT_SOURCES) echo "Not running python-based tests (determined at configure-time)" endif +vty-python-test: $(BUILT_SOURCES) + if [ -z "$(PYTHON)" ]; then echo "ERROR: python not configured, for manual invocation use 'make PYTHON=/usr/bin/python'"; exit 1; fi + osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + $(PYTHON) $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v + rm -f $(top_builddir)/sms.db + +# To update the VTY script from current application behavior, +# pass -u to vty_script_runner.py by doing: +# make vty-transcript-test U=-u +vty-transcript-test: + echo "No vty-transcript-test exists yet" + +vty-test: + $(MAKE) vty-python-test + $(MAKE) vty-transcript-test + +ctrl-python-test: $(BUILT_SOURCES) + if [ -z "$(PYTHON)" ]; then echo "ERROR: python not configured, for manual invocation use 'make PYTHON=/usr/bin/python'"; exit 1; fi + $(PYTHON) $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v + rm -f $(top_builddir)/sms.db + +# To update the CTRL script from current application behavior, +# pass -u to ctrl_script_runner.py by doing: +# make ctrl-transcript-test U=-u +ctrl-transcript-test: + echo "No ctrl-transcript-test exists yet" + +ctrl-test: + $(MAKE) ctrl-python-test + $(MAKE) ctrl-transcript-test + check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) $(MAKE) $(AM_MAKEFLAGS) python-tests -- To view, visit https://gerrit.osmocom.org/12126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 Gerrit-Change-Number: 12126 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 02:27:32 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 02:27:32 +0000 Subject: Change in osmo-msc[master]: add test_nodes.vty transcript test Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12127 Change subject: add test_nodes.vty transcript test ...................................................................... add test_nodes.vty transcript test Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 123 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/27/12127/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index fce110d..16251e1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -63,7 +63,11 @@ # pass -u to vty_script_runner.py by doing: # make vty-transcript-test U=-u vty-transcript-test: - echo "No vty-transcript-test exists yet" + osmo_verify_transcript_vty.py -v \ + -n OsmoMSC -p 4254 \ + -r "$(top_builddir)/src/osmo-msc/osmo-msc -c $(top_srcdir)/doc/examples/osmo-msc/osmo-msc.cfg" \ + $(U) $(srcdir)/*.vty + rm -f $(builddir)/sms.db vty-test: $(MAKE) vty-python-test diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty new file mode 100644 index 0000000..61470c4 --- /dev/null +++ b/tests/test_nodes.vty @@ -0,0 +1,118 @@ +OsmoMSC> enable +OsmoMSC# configure terminal +OsmoMSC(config)# list +... + network + msc + mncc-int + hlr + smpp + +OsmoMSC(config)# network +OsmoMSC(config-net)# list +... + network country code <1-999> + mobile network code <0-999> + short name NAME + long name NAME + encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] + authentication (optional|required) + rrlp mode (none|ms-based|ms-preferred|ass-preferred) + mm info (0|1) + timezone <-19-19> (0|15|30|45) + timezone <-19-19> (0|15|30|45) <0-2> + no timezone + periodic location update <6-1530> + no periodic location update + +OsmoMSC(config-net)# exit +OsmoMSC(config)# msc +OsmoMSC(config-msc)# list +... + assign-tmsi + mncc-guard-timeout <0-255> + no assign-tmsi + auth-tuple-max-reuse-count <-1-2147483647> + auth-tuple-reuse-on-error (0|1) + cs7-instance-a <0-15> + cs7-instance-iu <0-15> + paging response-timer (default|<1-65535>) + emergency-call route-to-msisdn MSISDN + mgw local-ip A.B.C.D + mgw local-port <0-65535> + mgw remote-ip A.B.C.D + mgw remote-port <0-65535> + mgw endpoint-range <1-65534> <1-65534> + mgw bts-base <0-65534> + iu rab-assign-addr-enc (x213|v4raw) + asn1 debug (1|0) + asn1 xer-print (1|0) + +OsmoMSC(config-msc)# exit +OsmoMSC(config)# mncc-int +OsmoMSC(config-mncc-int)# list +... + default-codec tch-f (fr|efr|amr) + default-codec tch-h (hr|amr) + +OsmoMSC(config-mncc-int)# exit +OsmoMSC(config)# hlr +OsmoMSC(config-hlr)# list +... + remote-ip A.B.C.D + remote-port <1-65535> + +OsmoMSC(config-hlr)# exit +OsmoMSC(config)# smpp +OsmoMSC(config-smpp)# list +... + smpp-first + no smpp-first + local-tcp-port <1-65535> + local-tcp-ip A.B.C.D <1-65535> + system-id ID + policy (accept-all|closed) + esme NAME + no esme NAME + +OsmoMSC(config-smpp)# exit +OsmoMSC(config)# exit +OsmoMSC# configure terminal +OsmoMSC(config)# network +OsmoMSC(config-net)# end +OsmoMSC# disable +OsmoMSC> enable + +OsmoMSC# show running-config +... +network + network country code 001 + mobile network code 01 + short name OsmoMSC + long name OsmoMSC + encryption a5 0 + authentication optional + rrlp mode none + mm info 1 + periodic location update 30 +msc + mncc-guard-timeout 180 + assign-tmsi + cs7-instance-a 0 + cs7-instance-iu 0 + auth-tuple-max-reuse-count 3 + auth-tuple-reuse-on-error 1 + mgw local-port 2728 + mgw remote-ip 10.23.24.1 + mgw remote-port 2427 +mncc-int + default-codec tch-f fr + default-codec tch-h hr +smpp + local-tcp-port 2775 + policy closed + no smpp-first +hlr + remote-ip 127.0.0.1 + remote-port 4222 +end -- To view, visit https://gerrit.osmocom.org/12127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 Gerrit-Change-Number: 12127 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 02:27:32 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 02:27:32 +0000 Subject: Change in osmo-msc[master]: cosmetic: msc_main.c: default args definition style Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12128 Change subject: cosmetic: msc_main.c: default args definition style ...................................................................... cosmetic: msc_main.c: default args definition style Explicitly name each arg with its default value, omit zero values, end last item in comma. Change-Id: I0e0f1e2c8722768b6c61fd6544911b20fe1af212 --- M src/osmo-msc/msc_main.c 1 file changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/28/12128/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index afab417..07e4c8b 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -96,11 +96,9 @@ const char *mncc_sock_path; int use_db_counter; } msc_cmdline_config = { - "sms.db", - "osmo-msc.cfg", - 0, - 0, - 1 + .database_name = "sms.db", + .config_file = "osmo-msc.cfg", + .use_db_counter = 1, }; /* timer to store statistics */ -- To view, visit https://gerrit.osmocom.org/12128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0e0f1e2c8722768b6c61fd6544911b20fe1af212 Gerrit-Change-Number: 12128 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 02:27:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 02:27:33 +0000 Subject: Change in osmo-msc[master]: msc_main: mncc: move mncc socket decision to after read_cfg Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12129 Change subject: msc_main: mncc: move mncc socket decision to after read_cfg ...................................................................... msc_main: mncc: move mncc socket decision to after read_cfg First step towards allowing to configure the MNCC socket path by config file. Rationale: see I2ec59d5eba407f83295528b51b93678d446b9cee Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 --- M src/osmo-msc/msc_main.c 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/12129/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 07e4c8b..4434056 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -545,11 +545,9 @@ /* Parse options */ handle_options(argc, argv); - /* Allocate global gsm_network struct; choose socket/internal MNCC */ - msc_network = msc_network_alloc(tall_msc_ctx, - msc_cmdline_config.mncc_sock_path? - mncc_sock_from_cc - : int_mncc_recv); + /* Allocate global gsm_network struct. + * At first use the internal MNCC by default, may be changed later according to cfg or cmdline option. */ + msc_network = msc_network_alloc(tall_msc_ctx, int_mncc_recv); if (!msc_network) return -ENOMEM; @@ -577,6 +575,7 @@ /* Initialize MNCC socket if appropriate */ if (msc_cmdline_config.mncc_sock_path) { + msc_network->mncc_recv = mncc_sock_from_cc; rc = mncc_sock_init(msc_network, msc_cmdline_config.mncc_sock_path); if (rc) { -- To view, visit https://gerrit.osmocom.org/12129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 Gerrit-Change-Number: 12129 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 02:27:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 02:27:33 +0000 Subject: Change in osmo-msc[master]: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12130 Change subject: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' ...................................................................... vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' I want to add 'mncc internal' and 'mncc external' commands, and IMHO makes most sense to have a common 'mncc' keyword to start MNCC config commands with. To put it in terms of VTY online help: OsmoMSC(config-msc)# mncc ? internal Use internal MNCC handler external Use internal MNCC handler guard-timeout Set global guard timeout So far only the 'guard-timeout' exists, I want to add 'internal' and 'external' in a subsequent commit. Keep the old command 'mncc-guard-timeout' as deprecated alias. That means it still works from old config files, but online documentation will omit it. On 'write', write back the new format instead. Rationale: see I2ec59d5eba407f83295528b51b93678d446b9cee Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/30/12130/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index aaefb0b..d9e57a7 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -335,16 +335,25 @@ return CMD_SUCCESS; } +#define MNCC_STR "Configure Mobile Network Call Control\n" +#define MNCC_GUARD_TIMEOUT_STR "Set global guard timer for mncc interface activity\n" +#define MNCC_GUARD_TIMEOUT_VALUE_STR "guard timer value (sec.)\n" + DEFUN(cfg_msc_mncc_guard_timeout, cfg_msc_mncc_guard_timeout_cmd, - "mncc-guard-timeout <0-255>", - "Set global guard timer for mncc interface activity\n" - "guard timer value (sec.)") + "mncc guard-timeout <0-255>", + MNCC_STR + MNCC_GUARD_TIMEOUT_STR MNCC_GUARD_TIMEOUT_VALUE_STR) { gsmnet->mncc_guard_timeout = atoi(argv[0]); return CMD_SUCCESS; } +ALIAS_DEPRECATED(cfg_msc_mncc_guard_timeout, + cfg_msc_deprecated_mncc_guard_timeout_cmd, + "mncc-guard-timeout <0-255>", + MNCC_GUARD_TIMEOUT_STR MNCC_GUARD_TIMEOUT_VALUE_STR); + DEFUN(cfg_msc_assign_tmsi, cfg_msc_assign_tmsi_cmd, "assign-tmsi", "Assign TMSI during Location Updating.\n") @@ -433,7 +442,7 @@ static int config_write_msc(struct vty *vty) { vty_out(vty, "msc%s", VTY_NEWLINE); - vty_out(vty, " mncc-guard-timeout %i%s", + vty_out(vty, " mncc guard-timeout %i%s", gsmnet->mncc_guard_timeout, VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", gsmnet->vlr->cfg.assign_tmsi? "" : "no ", VTY_NEWLINE); @@ -1443,6 +1452,7 @@ install_node(&msc_node, config_write_msc); install_element(MSC_NODE, &cfg_msc_assign_tmsi_cmd); install_element(MSC_NODE, &cfg_msc_mncc_guard_timeout_cmd); + install_element(MSC_NODE, &cfg_msc_deprecated_mncc_guard_timeout_cmd); install_element(MSC_NODE, &cfg_msc_no_assign_tmsi_cmd); install_element(MSC_NODE, &cfg_msc_auth_tuple_max_reuse_count_cmd); install_element(MSC_NODE, &cfg_msc_auth_tuple_reuse_on_error_cmd); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 61470c4..6a55e1b 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -30,7 +30,7 @@ OsmoMSC(config-msc)# list ... assign-tmsi - mncc-guard-timeout <0-255> + mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) @@ -96,7 +96,7 @@ mm info 1 periodic location update 30 msc - mncc-guard-timeout 180 + mncc guard-timeout 180 assign-tmsi cs7-instance-a 0 cs7-instance-iu 0 -- To view, visit https://gerrit.osmocom.org/12130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe Gerrit-Change-Number: 12130 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 02:27:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 02:27:33 +0000 Subject: Change in osmo-msc[master]: add VTY commands: mncc internal / external (== -M) Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12131 Change subject: add VTY commands: mncc internal / external (== -M) ...................................................................... add VTY commands: mncc internal / external (== -M) So far the only way to use external MNCC is to pass the -M cmdline arg: osmo-msc -M /path/to/socket However, the osmo-msc.service file for systemd is installed by 'make install', and hence it is quite impractical to depend on such a config item to be required in the service file: - It defies any scheme an operator may have in place to compose the osmo-msc.cfg file -- this option doesn't go in the .cfg file but needs separate action to add to the installed service file. - After a make install or package upgrades / re-installations, this option will be plain overwritten silently, or lead to the need for resolving file conflicts. The initial spark for this came from configuring the 35c3 GSM from cfg templates. Change-Id: I2ec59d5eba407f83295528b51b93678d446b9cee --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/msc_common.h M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 6 files changed, 68 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/31/12131/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index d3cb7d8..63af3e7 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -140,6 +140,7 @@ struct osmo_counter *active_nc_ss; /* layer 4 */ + char *mncc_sock_path; struct mncc_sock_state *mncc_state; mncc_recv_cb_t mncc_recv; struct llist_head upqueue; diff --git a/include/osmocom/msc/msc_common.h b/include/osmocom/msc/msc_common.h index ffe8902..3ca3469 100644 --- a/include/osmocom/msc/msc_common.h +++ b/include/osmocom/msc/msc_common.h @@ -15,6 +15,7 @@ typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *); struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv); +void gsm_network_set_mncc_sock_path(struct gsm_network *net, const char *mncc_sock_path); int msc_vlr_alloc(struct gsm_network *net); int msc_vlr_start(struct gsm_network *net); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index d9e57a7..e1d1b40 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -339,6 +339,25 @@ #define MNCC_GUARD_TIMEOUT_STR "Set global guard timer for mncc interface activity\n" #define MNCC_GUARD_TIMEOUT_VALUE_STR "guard timer value (sec.)\n" +DEFUN(cfg_msc_mncc_internal, + cfg_msc_mncc_internal_cmd, + "mncc internal", + MNCC_STR "Use internal MNCC handler (default; changes need a program restart)\n") +{ + gsm_network_set_mncc_sock_path(gsmnet, NULL); + return CMD_SUCCESS; +} + +DEFUN(cfg_msc_mncc_external, + cfg_msc_mncc_external_cmd, + "mncc external MNCC_SOCKET_PATH", + MNCC_STR "Use external MNCC handler (changes need a program restart)\n" + "File system path to create the MNCC unix domain socket at\n") +{ + gsm_network_set_mncc_sock_path(gsmnet, argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_msc_mncc_guard_timeout, cfg_msc_mncc_guard_timeout_cmd, "mncc guard-timeout <0-255>", @@ -442,6 +461,8 @@ static int config_write_msc(struct vty *vty) { vty_out(vty, "msc%s", VTY_NEWLINE); + if (gsmnet->mncc_sock_path) + vty_out(vty, " mncc external %s%s", gsmnet->mncc_sock_path, VTY_NEWLINE); vty_out(vty, " mncc guard-timeout %i%s", gsmnet->mncc_guard_timeout, VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", @@ -1451,6 +1472,8 @@ install_element(CONFIG_NODE, &cfg_msc_cmd); install_node(&msc_node, config_write_msc); install_element(MSC_NODE, &cfg_msc_assign_tmsi_cmd); + install_element(MSC_NODE, &cfg_msc_mncc_internal_cmd); + install_element(MSC_NODE, &cfg_msc_mncc_external_cmd); install_element(MSC_NODE, &cfg_msc_mncc_guard_timeout_cmd); install_element(MSC_NODE, &cfg_msc_deprecated_mncc_guard_timeout_cmd); install_element(MSC_NODE, &cfg_msc_no_assign_tmsi_cmd); diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 52277b7..37c1d15 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -76,6 +76,13 @@ return net; } +void gsm_network_set_mncc_sock_path(struct gsm_network *net, const char *mncc_sock_path) +{ + if (net->mncc_sock_path) + talloc_free(net->mncc_sock_path); + net->mncc_sock_path = mncc_sock_path ? talloc_strdup(net, mncc_sock_path) : NULL; +} + /* Receive a SAPI-N-REJECT from BSC */ void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci) { diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 4434056..a192b64 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -573,11 +573,20 @@ return 1; } - /* Initialize MNCC socket if appropriate */ + /* Initialize MNCC socket if appropriate. If the cmdline option -M is present, it overrides the .cfg file + * setting 'msc' / 'mncc external MNCC_SOCKET_PATH'. Note that when -M is given, it "bleeds" back into the vty + * 'write' command and is reflected in the written out 'mncc external' cfg. */ if (msc_cmdline_config.mncc_sock_path) { + LOGP(DMNCC, LOGL_NOTICE, + "MNCC socket path is configured from commandline argument -M." + " This affects a written-back config file. Instead consider using the config file directly" + " ('msc' / 'mncc external MNCC_SOCKET_PATH').\n"); + gsm_network_set_mncc_sock_path(msc_network, msc_cmdline_config.mncc_sock_path); + } + if (msc_network->mncc_sock_path) { msc_network->mncc_recv = mncc_sock_from_cc; rc = mncc_sock_init(msc_network, - msc_cmdline_config.mncc_sock_path); + msc_network->mncc_sock_path); if (rc) { fprintf(stderr, "MNCC socket initialization failed. exiting.\n"); exit(1); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 6a55e1b..c6902da 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -30,6 +30,8 @@ OsmoMSC(config-msc)# list ... assign-tmsi + mncc internal + mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> @@ -48,6 +50,29 @@ asn1 debug (1|0) asn1 xer-print (1|0) +OsmoMSC(config-msc)# mncc? + mncc Configure Mobile Network Call Control + +OsmoMSC(config-msc)# mncc ? + internal Use internal MNCC handler (default; changes need a program restart) + external Use external MNCC handler (changes need a program restart) + guard-timeout Set global guard timer for mncc interface activity + +OsmoMSC(config-msc)# mncc external ? + MNCC_SOCKET_PATH File system path to create the MNCC unix domain socket at + +OsmoMSC(config-msc)# mncc external /path/not/used +OsmoMSC(config-msc)# show running-config +... +msc +... + mncc external /path/not/used +... + +OsmoMSC(config-msc)# mncc internal +OsmoMSC(config-msc)# show running-config +... ! mncc external + OsmoMSC(config-msc)# exit OsmoMSC(config)# mncc-int OsmoMSC(config-mncc-int)# list -- To view, visit https://gerrit.osmocom.org/12131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2ec59d5eba407f83295528b51b93678d446b9cee Gerrit-Change-Number: 12131 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 06:17:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 06:17:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3337?= Message-ID: <1582393336.1036.1543990622335.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.97 KB...] ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/openbsc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/openbsc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/openbsc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/openbsc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/openbsc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/openbsc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/openbsc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/openbsc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/openbsc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/openbsc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/openbsc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 06:17:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 06:17:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3337?= Message-ID: <1901906209.1034.1543990622333.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.97 KB...] ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/openbsc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/openbsc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/openbsc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/openbsc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/openbsc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/openbsc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/openbsc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/openbsc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/openbsc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/openbsc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/openbsc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 06:17:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 06:17:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7248?= Message-ID: <1883954626.1035.1543990622334.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.95 KB...] ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 06:21:57 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 06:21:57 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7244?= Message-ID: <1612741958.1038.1543990917235.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.58 KB...] ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-sgsn at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-sgsn" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-sgsn # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-sgsn at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-sgsn" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-sgsn # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-sgsn at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-sgsn" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-sgsn # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-sgsn at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-sgsn" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 06:21:57 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 06:21:57 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7249?= In-Reply-To: <1883954626.1035.1543990622334.JavaMail.jenkins@jenkins.osmocom.org> References: <1883954626.1035.1543990622334.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1682911723.1039.1543990917324.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.57 KB...] ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 06:29:17 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 06:29:17 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7250?= In-Reply-To: <1682911723.1039.1543990917324.JavaMail.jenkins@jenkins.osmocom.org> References: <1682911723.1039.1543990917324.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1620847564.1040.1543991357297.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.59 KB...] ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 06:31:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 06:31:49 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7245?= In-Reply-To: <1612741958.1038.1543990917235.JavaMail.jenkins@jenkins.osmocom.org> References: <1612741958.1038.1543990917235.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2055927755.1042.1543991509742.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Dec 5 06:52:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 06:52:03 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#210?= In-Reply-To: <1848781954.1011.1543906323188.JavaMail.jenkins@jenkins.osmocom.org> References: <1848781954.1011.1543906323188.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <348290027.1044.1543992723966.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 168.24 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 07:33:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 07:33:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_origin/n?= =?UTF-8?Q?rw/litecell15,osmocom-master-debian9,lc15,True_#1037?= Message-ID: <1780844249.1046.1543995195207.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.33 KB...] ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-pcu at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-pcu" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-pcu at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-pcu" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-pcu at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-pcu" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-pcu at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-pcu" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 07:33:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 07:33:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_v2?= =?UTF-8?Q?017.01,osmocom-master-debian9,lc15,True_#1037?= Message-ID: <1351469471.1047.1543995227204.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.31 KB...] ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-pcu at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-pcu" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-pcu at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-pcu" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-pcu at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-pcu" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-pcu at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-pcu" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 07:34:18 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 07:34:18 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_m?= =?UTF-8?Q?aster,osmocom-master-debian9,lc15,True_#1037?= Message-ID: <940057800.1048.1543995258208.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.31 KB...] ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-pcu at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-pcu" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-pcu at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-pcu" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-pcu at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-pcu" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-pcu at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-pcu" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 08:32:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 08:32:52 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7251?= In-Reply-To: <1620847564.1040.1543991357297.JavaMail.jenkins@jenkins.osmocom.org> References: <1620847564.1040.1543991357297.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <262713736.1050.1543998772497.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.94 KB...] ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' Retrying after 10 seconds > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 ERROR: Error fetching remote repo 'origin' hudson.plugins.git.GitException: Failed to fetch from git://git.osmocom.org/osmo-msc at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:888) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: hudson.plugins.git.GitException: Command "git config remote.origin.url git://git.osmocom.org/osmo-msc" returned status code 4: stdout: stderr: error: failed to write new configuration file at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1609) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1243) at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160) at sun.reflect.GeneratedMethodAccessor30.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:929) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:903) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:855) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:283) at com.sun.proxy.$Proxy54.setRemoteUrl(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:295) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:876) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1155) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1186) at hudson.scm.SCM.checkout(SCM.java:504) at hudson.model.AbstractProject.checkout(AbstractProject.java:1208) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) ERROR: Error fetching remote repo 'origin' [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 5 09:48:18 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 5 Dec 2018 09:48:18 +0000 Subject: Change in libosmocore[master]: gsm0808: add encoder for cause codes and use it In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12044 to look at the new patch set (#2). Change subject: gsm0808: add encoder for cause codes and use it ...................................................................... gsm0808: add encoder for cause codes and use it At the moment the all gsm0808 cause codes are encoded directly using the tlv API directly to put a one byte TLV field. This works ok for most situations where the cause code consists of a single byte. However, gsm0808 specifies a two byte cause code model where cause codes may be extended up to two bytes. Instead of implementing the encoding over and over and again, let's rather have an encoder function we can call. - Add an encoder function that can generate single byte and extended cause codeds and makes the length decision automatically. - Use only this function to append cause codes Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c 3 files changed, 43 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/12044/2 -- To view, visit https://gerrit.osmocom.org/12044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb Gerrit-Change-Number: 12044 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 10:00:42 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 10:00:42 +0000 Subject: Change in osmo-pcu[master]: vty: add commands to show TBF of a certain kind In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/6239 ) Change subject: vty: add commands to show TBF of a certain kind ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/6239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80f8df4fe663a0346f4289a4220b761e39726312 Gerrit-Change-Number: 6239 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 05 Dec 2018 10:00:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 10:34:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 10:34:15 +0000 Subject: Change in libosmocore[master]: gsm0808: add encoder for cause codes and use it In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12044 ) Change subject: gsm0808: add encoder for cause codes and use it ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb Gerrit-Change-Number: 12044 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 10:34:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 10:36:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 10:36:39 +0000 Subject: Change in osmo-pcu[master]: vty: add commands to show TBF of a certain kind In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/6239 ) Change subject: vty: add commands to show TBF of a certain kind ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/6239/4/src/pcu_vty_functions.cpp File src/pcu_vty_functions.cpp: https://gerrit.osmocom.org/#/c/6239/4/src/pcu_vty_functions.cpp at 46 PS4, Line 46: static void tbf_print_vty_info(struct vty *vty, gprs_rlcmac_tbf *tbf, bool show_ccch, bool show_pacch) looks like these parameters added in this commit are not used in this function. -- To view, visit https://gerrit.osmocom.org/6239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80f8df4fe663a0346f4289a4220b761e39726312 Gerrit-Change-Number: 6239 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 10:36:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 10:38:15 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 10:38:15 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12090 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12090/1/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/12090/1/contrib/jenkins.sh at 8 PS1, Line 8: # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "True") > you know, it's really weird to have all variables as "True" except one being "1". [?] Right. Well, I thought since it is already used that way, that this is how it needs to be done. However, it is only used *once* already, and that is with osmo-pcu. I found that it was changed from yes/no to True/False here: https://gerrit.osmocom.org/#/c/osmo-ci/+/5770/2/jobs/gerrit-verifications.yml But as you commented there, with values in quotes, Jenkins should not convert them to True/False anymore. I will change it to "0" and "1" to make it consistent. -- To view, visit https://gerrit.osmocom.org/12090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5b112fc1663b78800d3c2c4ff2a0771cf5af11b Gerrit-Change-Number: 12090 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 05 Dec 2018 10:38:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 10:46:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 10:46:52 +0000 Subject: Change in osmo-msc[master]: make: prepare for adding transcript tests In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12126 ) Change subject: make: prepare for adding transcript tests ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12126/1/tests/Makefile.am File tests/Makefile.am: https://gerrit.osmocom.org/#/c/12126/1/tests/Makefile.am at 73 PS1, Line 73: if [ -z "$(PYTHON)" ]; then echo "ERROR: python not configured, for manual invocation use 'make PYTHON=/usr/bin/python'"; exit 1; fi More simple, since already contains a shebang (#!/usr/bin/env python2), let's drop the PYTHON thing completely and use ./ instead: $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v I actually did that in some project already because configure PYTHON definition through some automake macro is broken / not working in all cases. https://gerrit.osmocom.org/#/c/12126/1/tests/Makefile.am at 84 PS1, Line 84: $(MAKE) ctrl-python-test Cannot this be specified like this? ctrl-test: ctrl-python-test ctrl-transcript-test -- To view, visit https://gerrit.osmocom.org/12126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 Gerrit-Change-Number: 12126 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 10:46:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 10:49:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 10:49:58 +0000 Subject: Change in osmo-msc[master]: cosmetic: msc_main.c: default args definition style In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12128 ) Change subject: cosmetic: msc_main.c: default args definition style ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0e0f1e2c8722768b6c61fd6544911b20fe1af212 Gerrit-Change-Number: 12128 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 10:49:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 10:53:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 10:53:41 +0000 Subject: Change in osmo-msc[master]: msc_main: mncc: move mncc socket decision to after read_cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12129 ) Change subject: msc_main: mncc: move mncc socket decision to after read_cfg ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12129/1/src/osmo-msc/msc_main.c File src/osmo-msc/msc_main.c: https://gerrit.osmocom.org/#/c/12129/1/src/osmo-msc/msc_main.c at 549 PS1, Line 549: * At first use the internal MNCC by default, may be changed later according to cfg or cmdline option. */ Please define better "later". From what I see in this change, it's "later in this function", right? This is helpful to confuse reader going to look into other code places (like VTY code, etc.). -- To view, visit https://gerrit.osmocom.org/12129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 Gerrit-Change-Number: 12129 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 10:53:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 10:53:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 10:53:49 +0000 Subject: Change in osmo-msc[master]: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12130 ) Change subject: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe Gerrit-Change-Number: 12130 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 10:53:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 10:53:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 10:53:55 +0000 Subject: Change in osmo-msc[master]: msc_main: mncc: move mncc socket decision to after read_cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12129 ) Change subject: msc_main: mncc: move mncc socket decision to after read_cfg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 Gerrit-Change-Number: 12129 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 10:53:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 10:59:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 10:59:31 +0000 Subject: Change in osmo-msc[master]: add VTY commands: mncc internal / external (== -M) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12131 ) Change subject: add VTY commands: mncc internal / external (== -M) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2ec59d5eba407f83295528b51b93678d446b9cee Gerrit-Change-Number: 12131 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 10:59:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 10:59:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 10:59:53 +0000 Subject: Change in osmo-msc[master]: add test_nodes.vty transcript test In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12127 ) Change subject: add test_nodes.vty transcript test ...................................................................... Patch Set 1: You need to fix the tests and submit those patches before this one. -- To view, visit https://gerrit.osmocom.org/12127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 Gerrit-Change-Number: 12127 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 10:59:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 11:02:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 11:02:14 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12090 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 1: > But as you commented there, with values in quotes, Jenkins should not convert them to True/False anymore. Agree > I will change it to "0" and "1" to make it consistent. Thanks! -- To view, visit https://gerrit.osmocom.org/12090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5b112fc1663b78800d3c2c4ff2a0771cf5af11b Gerrit-Change-Number: 12090 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 05 Dec 2018 11:02:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 11:03:32 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 11:03:32 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7252?= In-Reply-To: <262713736.1050.1543998772497.JavaMail.jenkins@jenkins.osmocom.org> References: <262713736.1050.1543998772497.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <264066302.1052.1544007812070.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Dec 5 11:06:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 11:06:09 +0000 Subject: Change in osmo-trx[master]: SigProcLib: Improve Vector buffer allocation mess In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12085 to look at the new patch set (#2). Change subject: SigProcLib: Improve Vector buffer allocation mess ...................................................................... SigProcLib: Improve Vector buffer allocation mess Original issue: In order to use SSE instructions, 16-byte aligned memory chunks are needed, and C++ version < C++11 doesn't provide for a native new/delete store. For that reason, memalign() must be used in the implementation of convolve_h_alloc() for some buffers. On the other side, The C++ code relies on C++ "new T[]" operator to allocate a chunk of memory containing an array of class instances. As classes are complex types, they cannot be allocated through C structures (calling malloc). Experimentally can be seen too that it's unreliable and the process will crash during startup if malloc() is used and then a Complex<> deferred from it. Previous implementation allowed for use of convolve_h_alloc or new[] based on how the (signal)Vector is called, because then the buffer is not going to be managed internally. But that's unreliable since resize() calling resize() on it could use "delete" operator on a malloc'ed buffer, and end up having a new new[] allocated buffer. It was also found that some of the callers were actually leaking memory through ASan (because the buffer is not managed by the Vector instance). IMHO best option would be to rewrite all this code using C structures and malloc/free exclusively, since it would make all this cod eeasier to maintain. But for now, let's extend the Vector class to allow specifying an external alloc/free function and let the Vector instance take care of the ownership of the buffer in all scenarios. Change-Id: Ie484a4762a7f77fe1b105188ea03a6f025730b82 --- M CommonLibs/Vector.h M Transceiver52M/arch/common/convolve.h M Transceiver52M/arch/common/convolve_base.c M Transceiver52M/sigProcLib.cpp M Transceiver52M/signalVector.cpp M Transceiver52M/signalVector.h 6 files changed, 52 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/85/12085/2 -- To view, visit https://gerrit.osmocom.org/12085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie484a4762a7f77fe1b105188ea03a6f025730b82 Gerrit-Change-Number: 12085 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 11:24:55 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 11:24:55 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_m?= =?UTF-8?Q?aster,osmocom-master-debian9,none,False_#1038?= Message-ID: <1119465684.1054.1544009095519.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 110.27 KB...] echo ' [osmo-pcu])' && \ echo 'm4_define([AT_PACKAGE_TARNAME],' && \ echo ' [osmo-pcu])' && \ echo 'm4_define([AT_PACKAGE_VERSION],' && \ echo ' [0.5.1.36-6146])' && \ echo 'm4_define([AT_PACKAGE_STRING],' && \ echo ' [osmo-pcu 0.5.1.36-6146])' && \ echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ echo ' [osmocom-net-gprs at lists.osmocom.org])'; \ echo 'm4_define([AT_PACKAGE_URL],' && \ echo ' [])'; \ } >'./package.m4' /bin/bash ../missing --run autom4te --language=autotest -I '.' -o testsuite.tmp testsuite.at mv testsuite.tmp testsuite make[2]: Leaving directory ' (cd contrib && make top_distdir=../osmo-pcu-0.5.1.36-6146 distdir=../osmo-pcu-0.5.1.36-6146/contrib \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[2]: Entering directory ' (cd systemd && make top_distdir=../../osmo-pcu-0.5.1.36-6146 distdir=../../osmo-pcu-0.5.1.36-6146/contrib/systemd \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' test -n "" \ || find "osmo-pcu-0.5.1.36-6146" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec /bin/bash -c -m a+r {} {} \; \ || chmod -R a+r "osmo-pcu-0.5.1.36-6146" tardir=osmo-pcu-0.5.1.36-6146 && ${TAR-tar} chof - "$tardir" | BZIP2=${BZIP2--9} bzip2 -c >osmo-pcu-0.5.1.36-6146.tar.bz2 tardir=osmo-pcu-0.5.1.36-6146 && ${TAR-tar} chof - "$tardir" | GZIP=--best gzip -c >osmo-pcu-0.5.1.36-6146.tar.gz make[1]: Leaving directory ' if test -d "osmo-pcu-0.5.1.36-6146"; then find "osmo-pcu-0.5.1.36-6146" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-pcu-0.5.1.36-6146" || { sleep 5 && rm -rf "osmo-pcu-0.5.1.36-6146"; }; else :; fi case 'osmo-pcu-0.5.1.36-6146.tar.gz osmo-pcu-0.5.1.36-6146.tar.bz2' in \ *.tar.gz*) \ GZIP=--best gzip -dc osmo-pcu-0.5.1.36-6146.tar.gz | ${TAR-tar} xf - ;;\ *.tar.bz2*) \ bzip2 -dc osmo-pcu-0.5.1.36-6146.tar.bz2 | ${TAR-tar} xf - ;;\ *.tar.lz*) \ lzip -dc osmo-pcu-0.5.1.36-6146.tar.lz | ${TAR-tar} xf - ;;\ *.tar.xz*) \ xz -dc osmo-pcu-0.5.1.36-6146.tar.xz | ${TAR-tar} xf - ;;\ *.tar.Z*) \ uncompress -c osmo-pcu-0.5.1.36-6146.tar.Z | ${TAR-tar} xf - ;;\ *.shar.gz*) \ GZIP=--best gzip -dc osmo-pcu-0.5.1.36-6146.shar.gz | unshar ;;\ *.zip*) \ unzip osmo-pcu-0.5.1.36-6146.zip ;;\ esac chmod -R a-w osmo-pcu-0.5.1.36-6146 chmod u+w osmo-pcu-0.5.1.36-6146 mkdir osmo-pcu-0.5.1.36-6146/_build osmo-pcu-0.5.1.36-6146/_build/sub osmo-pcu-0.5.1.36-6146/_inst chmod a-w osmo-pcu-0.5.1.36-6146 test -d osmo-pcu-0.5.1.36-6146/_build || exit 0; \ dc_install_base=`CDPATH="${ZSH_VERSION+.}:" && cd osmo-pcu-0.5.1.36-6146/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="${TMPDIR-/tmp}/am-dc-$$/" \ && am__cwd=`pwd` \ && CDPATH="${ZSH_VERSION+.}:" && cd osmo-pcu-0.5.1.36-6146/_build/sub \ && ../../configure \ --with-systemdsystemunitdir=$dc_install_base//lib/systemd/system \ --enable-werror --enable-sanitize \ --srcdir=../.. --prefix="$dc_install_base" \ && make \ && make dvi \ && make check \ && make install \ && make installcheck \ && make uninstall \ && make distuninstallcheck_dir="$dc_install_base" \ distuninstallcheck \ && chmod -R a-w "$dc_install_base" \ && ({ \ (cd ../.. && umask 077 && mkdir "$dc_destdir") \ && make DESTDIR="$dc_destdir" install \ && make DESTDIR="$dc_destdir" uninstall \ && make DESTDIR="$dc_destdir" \ distuninstallcheck_dir="$dc_destdir" distuninstallcheck; \ } || { rm -rf "$dc_destdir"; exit 1; }) \ && rm -rf "$dc_destdir" \ && make dist \ && rm -rf osmo-pcu-0.5.1.36-6146.tar.gz osmo-pcu-0.5.1.36-6146.tar.bz2 \ && make distcleancheck \ && cd "$am__cwd" \ || exit 1 checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking how to run the C++ preprocessor... g++ -E checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC -DPIC checking if g++ PIC flag -fPIC -DPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking if g++ supports -c -o file.o... (cached) yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... (cached) GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOGB... yes checking whether to enable direct DSP access for PDCH of sysmocom-bts... unset checking whether to enable direct PHY access for PDCH of NuRAN Wireless Litecell 1.5 BTS... no checking whether to enable VTY tests... no CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" CXXFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined" LDFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating osmo-pcu.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating tests/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands make[1]: Entering directory ' Making all in include make[2]: Entering directory ' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in src make[2]: Entering directory ' CXX gprs_debug.lo CXX csn1.lo CXX gsm_rlcmac.lo CXX gprs_bssgp_pcu.lo ../../../src/gprs_bssgp_pcu.cpp:982:2: warning: #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" [-Wcpp] #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" ^~~~~~~ CXX gprs_rlcmac.lo CXX gprs_rlcmac_sched.lo CXX gprs_rlcmac_meas.lo CXX gprs_rlcmac_ts_alloc.lo CXX gprs_ms.lo CXX gprs_ms_storage.lo CXX gsm_timer.lo CXX pcu_l1_if.lo CC pcu_vty.lo CXX pcu_vty_functions.lo CC mslot_class.lo CXX tbf.lo CXX tbf_ul.lo CXX tbf_dl.lo CXX bts.lo CXX pdch.lo Makefile:779: recipe for target 'pdch.lo' failed make[2]: *** [pdch.lo] Error 1 make[2]: Leaving directory ' Makefile:466: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:671: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 11:24:59 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 11:24:59 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#7248?= Message-ID: <1992920835.1055.1544009099264.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-sgsn" build number 7248 originally caused by: Started by upstream project "master-osmo-ggsn" build number 1190 originally caused by: Started by upstream project "master-libgtpnl" build number 327 originally caused by: Started by user Neels Hofmeyr Building remotely on build2-deb9build-ansible (ttcn3 osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-sgsn # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-sgsn > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-sgsn +refs/heads/*:refs/remotes/origin/* Checking out Revision cc7795400074bf674b9e2b9af3387fe6ac0482ef (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f cc7795400074bf674b9e2b9af3387fe6ac0482ef Commit message: "Fix DISTCHECK_CONFIGURE_FLAGS override" > git rev-list --no-walk cc7795400074bf674b9e2b9af3387fe6ac0482ef # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins7151566499841298475.sh + docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE=-j 8 -e IU=--disable-iu -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -e PUBLISH=1 -w /build -i -u build -v :/build -v /home/osmocom-build/bin:/build_bin -v /home/osmocom-build/.ssh:/home/build/.ssh:ro osmocom:amd64 /build/contrib/jenkins.sh + base=/build + deps=/build/deps + inst=/build/deps/install + export deps inst + osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD error: unable to write file .gitignore error: unable to write file .gitreview error: unable to write file .mailmap error: unable to write file AUTHORS error: unable to write file COPYING error: unable to write file Makefile.am error: unable to write file README error: unable to write file README.vty-tests error: unable to write file configure.ac error: unable to write file contrib/Makefile.am error: unable to write file contrib/gprs/gb-proxy-unblock-bug.py error: unable to write file contrib/gprs/gprs-bssgp-histogram.lua error: unable to write file contrib/gprs/gprs-buffer-count.lua error: unable to write file contrib/gprs/gprs-split-trace-by-tlli.lua error: unable to write file contrib/gprs/gprs-verify-nu.lua error: unable to write file contrib/jenkins.sh error: unable to write file contrib/systemd/Makefile.am error: unable to write file contrib/systemd/osmo-gbproxy.service error: unable to write file contrib/systemd/osmo-gtphub.service error: unable to write file contrib/systemd/osmo-sgsn.service error: unable to write file debian/changelog error: unable to write file debian/compat error: unable to write file debian/control error: unable to write file debian/copyright error: unable to write file debian/osmo-gbproxy.init error: unable to write file debian/osmo-gbproxy.install error: unable to write file debian/osmo-gtphub.default error: unable to write file debian/osmo-gtphub.init error: unable to write file debian/osmo-gtphub.install error: unable to write file debian/osmo-sgsn.install error: unable to write file debian/rules error: unable to write file debian/source/format error: unable to write file doc/Makefile.am error: unable to write file doc/examples/Makefile.am error: unable to write file doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg error: unable to write file doc/examples/osmo-gbproxy/osmo-gbproxy.cfg error: unable to write file doc/examples/osmo-gtphub/gtphub-example.txt error: unable to write file doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg error: unable to write file doc/examples/osmo-gtphub/osmo-gtphub.cfg error: unable to write file doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg error: unable to write file doc/examples/osmo-sgsn/osmo-sgsn.cfg error: unable to write file doc/manuals/Makefile.am error: unable to write file doc/manuals/chapters/configuration.adoc error: unable to write file doc/manuals/chapters/control.adoc error: unable to write file doc/manuals/chapters/counters.adoc error: unable to write file doc/manuals/chapters/counters_generated.adoc error: unable to write file doc/manuals/chapters/overview.adoc error: unable to write file doc/manuals/chapters/running.adoc error: unable to write file doc/manuals/osmosgsn-usermanual-docinfo.xml error: unable to write file doc/manuals/osmosgsn-usermanual.adoc error: unable to write file doc/manuals/osmosgsn-vty-reference.xml error: unable to write file doc/manuals/vty/sgsn_vty_additions.xml error: unable to write file doc/manuals/vty/sgsn_vty_reference.xml error: unable to write file git-version-gen error: unable to write file include/Makefile.am error: unable to write file include/osmocom/Makefile.am error: unable to write file include/osmocom/sgsn/Makefile.am error: unable to write file include/osmocom/sgsn/common.h error: unable to write file include/osmocom/sgsn/crc24.h error: unable to write file include/osmocom/sgsn/debug.h error: unable to write file include/osmocom/sgsn/gb_proxy.h error: unable to write file include/osmocom/sgsn/gprs_gb_parse.h error: unable to write file include/osmocom/sgsn/gprs_gmm.h error: unable to write file include/osmocom/sgsn/gprs_gmm_attach.h error: unable to write file include/osmocom/sgsn/gprs_llc.h error: unable to write file include/osmocom/sgsn/gprs_llc_xid.h error: unable to write file include/osmocom/sgsn/gprs_sgsn.h error: unable to write file include/osmocom/sgsn/gprs_sndcp.h error: unable to write file include/osmocom/sgsn/gprs_sndcp_comp.h error: unable to write file include/osmocom/sgsn/gprs_sndcp_dcomp.h error: unable to write file include/osmocom/sgsn/gprs_sndcp_pcomp.h error: unable to write file include/osmocom/sgsn/gprs_sndcp_xid.h error: unable to write file include/osmocom/sgsn/gprs_subscriber.h error: unable to write file include/osmocom/sgsn/gprs_utils.h error: unable to write file include/osmocom/sgsn/gtphub.h error: unable to write file include/osmocom/sgsn/sgsn.h error: unable to write file include/osmocom/sgsn/signal.h error: unable to write file include/osmocom/sgsn/slhc.h error: unable to write file include/osmocom/sgsn/v42bis.h error: unable to write file include/osmocom/sgsn/v42bis_private.h error: unable to write file include/osmocom/sgsn/vty.h error: unable to write file m4/README error: unable to write file m4/ax_check_compile_flag.m4 error: unable to write file osmo-sgsn.pc.in error: unable to write file osmoappdesc.py error: unable to write file src/Makefile.am error: unable to write file src/gprs/.gitignore error: unable to write file src/gprs/Makefile.am error: unable to write file src/gprs/crc24.c error: unable to write file src/gprs/gb_proxy.c error: unable to write file src/gprs/gb_proxy_ctrl.c error: unable to write file src/gprs/gb_proxy_main.c error: unable to write file src/gprs/gb_proxy_patch.c error: unable to write file src/gprs/gb_proxy_peer.c error: unable to write file src/gprs/gb_proxy_tlli.c error: unable to write file src/gprs/gb_proxy_vty.c error: unable to write file src/gprs/gprs_gb_parse.c error: unable to write file src/gprs/gprs_gmm.c error: unable to write file src/gprs/gprs_gmm_attach.c error: unable to write file src/gprs/gprs_llc.c error: unable to write file src/gprs/gprs_llc_parse.c error: unable to write file src/gprs/gprs_llc_vty.c error: unable to write file src/gprs/gprs_llc_xid.c error: unable to write file src/gprs/gprs_sgsn.c error: unable to write file src/gprs/gprs_sndcp.c error: unable to write file src/gprs/gprs_sndcp_comp.c error: unable to write file src/gprs/gprs_sndcp_dcomp.c error: unable to write file src/gprs/gprs_sndcp_pcomp.c error: unable to write file src/gprs/gprs_sndcp_vty.c error: unable to write file src/gprs/gprs_sndcp_xid.c error: unable to write file src/gprs/gprs_subscriber.c error: unable to write file src/gprs/gprs_utils.c error: unable to write file src/gprs/gtphub.c error: unable to write file src/gprs/gtphub_ares.c error: unable to write file src/gprs/gtphub_main.c error: unable to write file src/gprs/gtphub_sock.c error: unable to write file src/gprs/gtphub_vty.c error: unable to write file src/gprs/sgsn_ares.c error: unable to write file src/gprs/sgsn_auth.c error: unable to write file src/gprs/sgsn_cdr.c error: unable to write file src/gprs/sgsn_ctrl.c error: unable to write file src/gprs/sgsn_libgtp.c error: unable to write file src/gprs/sgsn_main.c error: unable to write file src/gprs/sgsn_vty.c error: unable to write file src/gprs/slhc.c error: unable to write file src/gprs/v42bis.c error: unable to write file tests/Makefile.am error: unable to write file tests/atlocal.in error: unable to write file tests/ctrl_test_runner.py error: unable to write file tests/gbproxy/Makefile.am error: unable to write file tests/gbproxy/gbproxy_test.c error: unable to write file tests/gbproxy/gbproxy_test.ok error: unable to write file tests/gprs/Makefile.am error: unable to write file tests/gprs/gprs_test.c error: unable to write file tests/gprs/gprs_test.ok error: unable to write file tests/gtphub/Makefile.am error: unable to write file tests/gtphub/gtphub_test.c error: unable to write file tests/gtphub/gtphub_test.ok error: unable to write file tests/sgsn/Makefile.am error: unable to write file tests/sgsn/sgsn_test.c error: unable to write file tests/sgsn/sgsn_test.ok error: unable to write file tests/slhc/Makefile.am error: unable to write file tests/slhc/slhc_test.c error: unable to write file tests/slhc/slhc_test.ok error: unable to write file tests/sndcp_xid/Makefile.am error: unable to write file tests/sndcp_xid/sndcp_xid_test.c error: unable to write file tests/sndcp_xid/sndcp_xid_test.ok error: unable to write file tests/testsuite.at error: unable to write file tests/v42bis/Makefile.am error: unable to write file tests/v42bis/v42bis_test.c error: unable to write file tests/v42bis/v42bis_test.ok error: unable to write file tests/vty_test_runner.py error: unable to write file tests/xid/Makefile.am error: unable to write file tests/xid/xid_test.c error: unable to write file tests/xid/xid_test.ok fatal: unable to write new index file Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 11:25:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 11:25:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3338?= In-Reply-To: <1901906209.1034.1543990622333.JavaMail.jenkins@jenkins.osmocom.org> References: <1901906209.1034.1543990622333.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1140469115.1056.1544009102498.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 671.80 KB...] test_pdu/Makefile.am:60: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:64: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:64: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:64: warning: source file '$(TESTPDU_SOURCE_DIR)/enquire_link_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:64: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:68: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:68: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:68: warning: source file '$(TESTPDU_SOURCE_DIR)/enquire_link_test.c' is in a subdirectory, test_pdu/Makefile.am:68: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_apps/Makefile.am:17: warning: source file '$(TESTAPPS_SOURCE_DIR)/tcp.c' is in a subdirectory, test_apps/Makefile.am:17: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_apps/Makefile.am:17: warning: source file '$(TESTAPPS_SOURCE_DIR)/smpp.c' is in a subdirectory, test_apps/Makefile.am:17: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_apps/Makefile.am:17: warning: source file '$(TESTAPPS_SOURCE_DIR)/esme.c' is in a subdirectory, test_apps/Makefile.am:17: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_pdu/Makefile.am:72: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:72: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:72: warning: source file '$(TESTPDU_SOURCE_DIR)/generic_nack_test.c' is in a subdirectory, test_pdu/Makefile.am:72: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:76: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:76: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:76: warning: source file '$(TESTPDU_SOURCE_DIR)/outbind_test.c' is in a subdirectory, test_pdu/Makefile.am:76: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:80: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:80: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:80: warning: source file '$(TESTPDU_SOURCE_DIR)/query_sm_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:80: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:84: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:84: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:84: warning: source file '$(TESTPDU_SOURCE_DIR)/query_sm_test.c' is in a subdirectory, test_pdu/Makefile.am:84: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:88: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:88: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:88: warning: source file '$(TESTPDU_SOURCE_DIR)/replace_sm_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:88: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:92: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:92: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:92: warning: source file '$(TESTPDU_SOURCE_DIR)/replace_sm_test.c' is in a subdirectory, test_pdu/Makefile.am:92: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_apps/Makefile.am:4: warning: source file '$(TESTAPPS_SOURCE_DIR)/tcp.c' is in a subdirectory, test_apps/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_apps/Makefile.am:4: warning: source file '$(TESTAPPS_SOURCE_DIR)/smpp.c' is in a subdirectory, test_apps/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_apps/Makefile.am:4: warning: source file '$(TESTAPPS_SOURCE_DIR)/sendwp.c' is in a subdirectory, test_apps/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_pdu/Makefile.am:4: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:4: warning: source file '$(TESTPDU_SOURCE_DIR)/submit_multi_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:8: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:8: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:8: warning: source file '$(TESTPDU_SOURCE_DIR)/submit_multi_test.c' is in a subdirectory, test_pdu/Makefile.am:8: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:96: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:96: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:96: warning: source file '$(TESTPDU_SOURCE_DIR)/submit_sm_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:96: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:100: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:100: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:100: warning: source file '$(TESTPDU_SOURCE_DIR)/submit_sm_test.c' is in a subdirectory, test_pdu/Makefile.am:100: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:104: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:104: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:104: warning: source file '$(TESTPDU_SOURCE_DIR)/unbind_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:104: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:108: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:108: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:108: warning: source file '$(TESTPDU_SOURCE_DIR)/unbind_test.c' is in a subdirectory, test_pdu/Makefile.am:108: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here binaries/Makefile.am: installing 'aux_config/depcomp' test_apps/Makefile.am:26: warning: variable 'analizer_SOURCES' is defined but no program or test_apps/Makefile.am:26: library has 'analizer' as canonical name (possible typo) test_apps/Makefile.am:17: warning: variable 'esme_SOURCES' is defined but no program or test_apps/Makefile.am:17: library has 'esme' as canonical name (possible typo) test_apps/Makefile.am:4: warning: variable 'sendwp_SOURCES' is defined but no program or test_apps/Makefile.am:4: library has 'sendwp' as canonical name (possible typo) test_apps/Makefile.am:30: warning: variable 'analizer_LDFLAGS' is defined but no program or test_apps/Makefile.am:30: library has 'analizer' as canonical name (possible typo) test_apps/Makefile.am:24: warning: variable 'esme_LDFLAGS' is defined but no program or test_apps/Makefile.am:24: library has 'esme' as canonical name (possible typo) test_apps/Makefile.am:11: warning: variable 'sendwp_LDFLAGS' is defined but no program or test_apps/Makefile.am:11: library has 'sendwp' as canonical name (possible typo) + ./configure --prefix=/build/deps/install/stow/libsmpp34 --with-systemdsystemunitdir=/build/deps/install/stow/libsmpp34/lib/systemd/system configure: WARNING: unrecognized options: --with-systemdsystemunitdir checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking for stdlib.h... (cached) yes checking netinet/in.h usability... yes checking netinet/in.h presence... yes checking for netinet/in.h... yes checking for stdint.h... (cached) yes checking for string.h... (cached) yes checking for LIBXML2... no checking for stdlib.h... (cached) yes checking for GNU libc compatible malloc... yes checking for memset... yes CFLAGS="-g -O2" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating Makefile config.status: creating def_frame/Makefile config.status: creating def_list/Makefile config.status: creating binaries/Makefile config.status: creating test_apps/Makefile config.status: creating libsmpp34.pc config.status: creating aux_config/config.h config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j1 install echo 1.13.0.3-3cf5 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libsmpp34' Making install in binaries make[2]: Entering directory '/build/deps/libsmpp34/binaries' /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpBuf.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpBuf.Tpo -c -o libsmpp34_la-smpp34_dumpBuf.lo `test -f '../src/smpp34_dumpBuf.c' || echo './'`../src/smpp34_dumpBuf.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpBuf.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpBuf.Tpo -c ../src/smpp34_dumpBuf.c -fPIC -DPIC -o .libs/libsmpp34_la-smpp34_dumpBuf.o libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpBuf.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpBuf.Tpo -c ../src/smpp34_dumpBuf.c -o libsmpp34_la-smpp34_dumpBuf.o >/dev/null 2>&1 mv -f .deps/libsmpp34_la-smpp34_dumpBuf.Tpo .deps/libsmpp34_la-smpp34_dumpBuf.Plo /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpPdu.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpPdu.Tpo -c -o libsmpp34_la-smpp34_dumpPdu.lo `test -f '../src/smpp34_dumpPdu.c' || echo './'`../src/smpp34_dumpPdu.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpPdu.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpPdu.Tpo -c ../src/smpp34_dumpPdu.c -fPIC -DPIC -o .libs/libsmpp34_la-smpp34_dumpPdu.o libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpPdu.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpPdu.Tpo -c ../src/smpp34_dumpPdu.c -o libsmpp34_la-smpp34_dumpPdu.o >/dev/null 2>&1 mv -f .deps/libsmpp34_la-smpp34_dumpPdu.Tpo .deps/libsmpp34_la-smpp34_dumpPdu.Plo /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_pack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_pack.Tpo -c -o libsmpp34_la-smpp34_pack.lo `test -f '../src/smpp34_pack.c' || echo './'`../src/smpp34_pack.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_pack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_pack.Tpo -c ../src/smpp34_pack.c -fPIC -DPIC -o .libs/libsmpp34_la-smpp34_pack.o libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_pack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_pack.Tpo -c ../src/smpp34_pack.c -o libsmpp34_la-smpp34_pack.o >/dev/null 2>&1 Makefile:1031: recipe for target 'libsmpp34_la-smpp34_pack.lo' failed make[2]: Leaving directory '/build/deps/libsmpp34/binaries' make[2]: *** [libsmpp34_la-smpp34_pack.lo] Error 1 Makefile:460: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libsmpp34' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:760: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 11:25:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 11:25:04 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3338?= In-Reply-To: <1582393336.1036.1543990622335.JavaMail.jenkins@jenkins.osmocom.org> References: <1582393336.1036.1543990622335.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1375676343.1057.1544009104560.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 672.38 KB...] binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:64: warning: source file '$(TESTPDU_SOURCE_DIR)/enquire_link_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:64: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:68: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:68: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:68: warning: source file '$(TESTPDU_SOURCE_DIR)/enquire_link_test.c' is in a subdirectory, test_pdu/Makefile.am:68: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_apps/Makefile.am:17: warning: source file '$(TESTAPPS_SOURCE_DIR)/tcp.c' is in a subdirectory, test_apps/Makefile.am:17: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_apps/Makefile.am:17: warning: source file '$(TESTAPPS_SOURCE_DIR)/smpp.c' is in a subdirectory, test_apps/Makefile.am:17: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_apps/Makefile.am:17: warning: source file '$(TESTAPPS_SOURCE_DIR)/esme.c' is in a subdirectory, test_apps/Makefile.am:17: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_pdu/Makefile.am:72: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:72: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:72: warning: source file '$(TESTPDU_SOURCE_DIR)/generic_nack_test.c' is in a subdirectory, test_pdu/Makefile.am:72: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:76: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:76: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:76: warning: source file '$(TESTPDU_SOURCE_DIR)/outbind_test.c' is in a subdirectory, test_pdu/Makefile.am:76: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:80: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:80: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:80: warning: source file '$(TESTPDU_SOURCE_DIR)/query_sm_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:80: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:84: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:84: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:84: warning: source file '$(TESTPDU_SOURCE_DIR)/query_sm_test.c' is in a subdirectory, test_pdu/Makefile.am:84: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:88: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:88: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:88: warning: source file '$(TESTPDU_SOURCE_DIR)/replace_sm_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:88: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:92: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:92: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:92: warning: source file '$(TESTPDU_SOURCE_DIR)/replace_sm_test.c' is in a subdirectory, test_pdu/Makefile.am:92: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_apps/Makefile.am:4: warning: source file '$(TESTAPPS_SOURCE_DIR)/tcp.c' is in a subdirectory, test_apps/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_apps/Makefile.am:4: warning: source file '$(TESTAPPS_SOURCE_DIR)/smpp.c' is in a subdirectory, test_apps/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_apps/Makefile.am:4: warning: source file '$(TESTAPPS_SOURCE_DIR)/sendwp.c' is in a subdirectory, test_apps/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:9: 'test_apps/Makefile.am' included from here test_pdu/Makefile.am:4: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:4: warning: source file '$(TESTPDU_SOURCE_DIR)/submit_multi_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:4: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:8: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:8: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:8: warning: source file '$(TESTPDU_SOURCE_DIR)/submit_multi_test.c' is in a subdirectory, test_pdu/Makefile.am:8: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:96: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:96: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:96: warning: source file '$(TESTPDU_SOURCE_DIR)/submit_sm_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:96: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:100: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:100: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:100: warning: source file '$(TESTPDU_SOURCE_DIR)/submit_sm_test.c' is in a subdirectory, test_pdu/Makefile.am:100: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:104: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:104: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:104: warning: source file '$(TESTPDU_SOURCE_DIR)/unbind_resp_test.c' is in a subdirectory, test_pdu/Makefile.am:104: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:108: warning: source file '$(TESTPDU_SOURCE_DIR)/core.c' is in a subdirectory, test_pdu/Makefile.am:108: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here test_pdu/Makefile.am:108: warning: source file '$(TESTPDU_SOURCE_DIR)/unbind_test.c' is in a subdirectory, test_pdu/Makefile.am:108: but option 'subdir-objects' is disabled binaries/Makefile.am:8: 'test_pdu/Makefile.am' included from here binaries/Makefile.am: installing 'aux_config/depcomp' test_apps/Makefile.am:26: warning: variable 'analizer_SOURCES' is defined but no program or test_apps/Makefile.am:26: library has 'analizer' as canonical name (possible typo) test_apps/Makefile.am:17: warning: variable 'esme_SOURCES' is defined but no program or test_apps/Makefile.am:17: library has 'esme' as canonical name (possible typo) test_apps/Makefile.am:4: warning: variable 'sendwp_SOURCES' is defined but no program or test_apps/Makefile.am:4: library has 'sendwp' as canonical name (possible typo) test_apps/Makefile.am:30: warning: variable 'analizer_LDFLAGS' is defined but no program or test_apps/Makefile.am:30: library has 'analizer' as canonical name (possible typo) test_apps/Makefile.am:24: warning: variable 'esme_LDFLAGS' is defined but no program or test_apps/Makefile.am:24: library has 'esme' as canonical name (possible typo) test_apps/Makefile.am:11: warning: variable 'sendwp_LDFLAGS' is defined but no program or test_apps/Makefile.am:11: library has 'sendwp' as canonical name (possible typo) + ./configure --prefix=/build/deps/install/stow/libsmpp34 --with-systemdsystemunitdir=/build/deps/install/stow/libsmpp34/lib/systemd/system configure: WARNING: unrecognized options: --with-systemdsystemunitdir checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking for stdlib.h... (cached) yes checking netinet/in.h usability... yes checking netinet/in.h presence... yes checking for netinet/in.h... yes checking for stdint.h... (cached) yes checking for string.h... (cached) yes checking for LIBXML2... no checking for stdlib.h... (cached) yes checking for GNU libc compatible malloc... yes checking for memset... yes CFLAGS="-g -O2" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating Makefile config.status: creating def_frame/Makefile config.status: creating def_list/Makefile config.status: creating binaries/Makefile config.status: creating test_apps/Makefile config.status: creating libsmpp34.pc config.status: creating aux_config/config.h config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j1 install echo 1.13.0.3-3cf5 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libsmpp34' Making install in binaries make[2]: Entering directory '/build/deps/libsmpp34/binaries' /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpBuf.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpBuf.Tpo -c -o libsmpp34_la-smpp34_dumpBuf.lo `test -f '../src/smpp34_dumpBuf.c' || echo './'`../src/smpp34_dumpBuf.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpBuf.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpBuf.Tpo -c ../src/smpp34_dumpBuf.c -fPIC -DPIC -o .libs/libsmpp34_la-smpp34_dumpBuf.o libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpBuf.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpBuf.Tpo -c ../src/smpp34_dumpBuf.c -o libsmpp34_la-smpp34_dumpBuf.o >/dev/null 2>&1 mv -f .deps/libsmpp34_la-smpp34_dumpBuf.Tpo .deps/libsmpp34_la-smpp34_dumpBuf.Plo /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpPdu.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpPdu.Tpo -c -o libsmpp34_la-smpp34_dumpPdu.lo `test -f '../src/smpp34_dumpPdu.c' || echo './'`../src/smpp34_dumpPdu.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpPdu.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpPdu.Tpo -c ../src/smpp34_dumpPdu.c -fPIC -DPIC -o .libs/libsmpp34_la-smpp34_dumpPdu.o libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_dumpPdu.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_dumpPdu.Tpo -c ../src/smpp34_dumpPdu.c -o libsmpp34_la-smpp34_dumpPdu.o >/dev/null 2>&1 mv -f .deps/libsmpp34_la-smpp34_dumpPdu.Tpo .deps/libsmpp34_la-smpp34_dumpPdu.Plo /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_pack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_pack.Tpo -c -o libsmpp34_la-smpp34_pack.lo `test -f '../src/smpp34_pack.c' || echo './'`../src/smpp34_pack.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_pack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_pack.Tpo -c ../src/smpp34_pack.c -fPIC -DPIC -o .libs/libsmpp34_la-smpp34_pack.o libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_pack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_pack.Tpo -c ../src/smpp34_pack.c -o libsmpp34_la-smpp34_pack.o >/dev/null 2>&1 mv -f .deps/libsmpp34_la-smpp34_pack.Tpo .deps/libsmpp34_la-smpp34_pack.Plo /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_unpack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_unpack.Tpo -c -o libsmpp34_la-smpp34_unpack.lo `test -f '../src/smpp34_unpack.c' || echo './'`../src/smpp34_unpack.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_unpack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_unpack.Tpo -c ../src/smpp34_unpack.c -fPIC -DPIC -o .libs/libsmpp34_la-smpp34_unpack.o libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../aux_config -I../src -I.. -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -Wall -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS -g -O2 -MT libsmpp34_la-smpp34_unpack.lo -MD -MP -MF .deps/libsmpp34_la-smpp34_unpack.Tpo -c ../src/smpp34_unpack.c -o libsmpp34_la-smpp34_unpack.o >/dev/null 2>&1 make[2]: *** [libsmpp34_la-smpp34_unpack.lo] Error 1 Makefile:1038: recipe for target 'libsmpp34_la-smpp34_unpack.lo' failed make[2]: Leaving directory '/build/deps/libsmpp34/binaries' Makefile:460: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libsmpp34' make[1]: *** [install-recursive] Error 1 Makefile:760: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 11:28:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 11:28:22 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu_=C2=BB_orig?= =?UTF-8?Q?in/nrw/litecell15,osmocom-master-debian9,lc15,True_#1038?= In-Reply-To: <1780844249.1046.1543995195207.JavaMail.jenkins@jenkins.osmocom.org> References: <1780844249.1046.1543995195207.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <974478335.1058.1544009302389.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Dec 5 11:29:43 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 5 Dec 2018 11:29:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11690 to look at the new patch set (#7). Change subject: MSC_Tests: remove unused control interface ...................................................................... MSC_Tests: remove unused control interface MSC_Tests initalizes a control interface (IPA_CTRL) port but none of the test executes control commands, lets remove it as it is not needed. (The background of this patch is the need of the control interface directly inside the BSC_ConnectionHandler, however apparently it is not possible to have two control interfaces active at the same time.) Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Related: OS#3615 --- M msc/MSC_Tests.ttcn 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/11690/7 -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 11:29:43 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 5 Dec 2018 11:29:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Hello daniel, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11697 to look at the new patch set (#9). Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... BSC_ConnectionHandler: introduce ctrl interface There are some upcomming tests which require to access the control interface of the MSC while the actual test is running. Futer test cases (e.g. Paging, see also Change Id: a6a1a6bd6da1bf46d6d703be495795d3610ca431) will use this. Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Related: OS#3615 Related: OS#3187 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/11697/9 -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 11:29:43 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 5 Dec 2018 11:29:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: First SGs testcases In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#12) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: First SGs testcases ...................................................................... WIP: MSC_Tests: First SGs testcases This extens MSC_Tests.ttcn with the first couple of SGs interface test cases for RESET, LU, DETACH, PAGING and SMS procedures In particular the following testcases are added: - TC_sgsap_reset: isolated reset procedure test - TC_sgsap_lu: isolated location update with TMSI realloc - TC_sgsap_lu_imsi_reject: location update, reject case - TC_sgsap_lu_and_nothing: location update with failed TMSI realloc - TC_sgsap_expl_imsi_det_eps: detach from EPS serveces - TC_sgsap_expl_imsi_det_noneps: detach from non-EPS services - TC_sgsap_paging_rej: isolated paging, reject case - TC_sgsap_paging_subscr_rej: isolated paging, subscr rejects call - TC_sgsap_paging_ue_unr: isolated paging, ue is unreachable - TC_sgsap_paging_and_nothing: page, but don't respond - TC_sgsap_mt_sms: mobile terminated SMS through SGs Interface - TC_sgsap_mo_sms: mobile originated SMS through SGs Interface - TC_sgsap_mt_sms_and_nothing: trigger SMS, but don't respond to paging - TC_sgsap_mt_sms_and_reject: trigger SMS, but reject paging - TC_sgsap_unexp_ud: Send unexpected unitdata (SGs Association: NULL) - TC_sgsap_unsol_ud: Send unsolicited unitdata (subscriber not in VLR) Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Related: OS#3645 --- M library/SGsAP_Emulation.ttcn M library/SGsAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.default M msc/MSC_Tests.ttcn M msc/gen_links.sh M msc/regen_makefile.sh 7 files changed, 890 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11488/12 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 12 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 11:30:12 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 11:30:12 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu?= =?UTF-8?Q?_=C2=BB_v2017.01,osmocom-master-debian9,lc15,True_#1038?= In-Reply-To: <1351469471.1047.1543995227204.JavaMail.jenkins@jenkins.osmocom.org> References: <1351469471.1047.1543995227204.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1494206776.1059.1544009412573.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Dec 5 11:32:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 11:32:02 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,lc15,True_#1038?= In-Reply-To: <940057800.1048.1543995258208.JavaMail.jenkins@jenkins.osmocom.org> References: <940057800.1048.1543995258208.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <567320113.1060.1544009522198.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Dec 5 11:45:32 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 5 Dec 2018 11:45:32 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Do the existance check with the path In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/12103 ) Change subject: ms_driver: Do the existance check with the path ...................................................................... ms_driver: Do the existance check with the path Change the existance test to use the full path and not just the binary name. Change-Id: Ibe28514df03efb7c302ac30411761a8d1a6dcf5d --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index b29859b..bc1cce9 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -93,7 +93,7 @@ def check_and_return_binary(name): """Checks the binary exists and returns the path.""" binary = inst.child('bin', name) - if not os.path.isfile(name): + if not os.path.isfile(binary): raise RuntimeError('Binary missing: %r' % binary) return binary -- To view, visit https://gerrit.osmocom.org/12103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibe28514df03efb7c302ac30411761a8d1a6dcf5d Gerrit-Change-Number: 12103 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 11:45:36 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 5 Dec 2018 11:45:36 +0000 Subject: Change in osmo-gsm-tester[master]: md_driver: Store the virtphy unix sockets in the temp directory In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/12104 ) Change subject: md_driver: Store the virtphy unix sockets in the temp directory ...................................................................... md_driver: Store the virtphy unix sockets in the temp directory Storing them inside the testrun directory will most likely violate the file length limit of the AF_UNIX files. This has happened on the jenkins test run and can not be mitigated by picking shorter paths in the code. We are already storing the event server in a tmp directory and can add subdirs+files there. Change-Id: I9ba4cd5c3e220ec10fc7c3160d7211daa821358f --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index bc1cce9..e8e543c 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -113,7 +113,7 @@ options = self.build_binary_options() self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf, self._ev_server, - util.Dir(self._suite_run.get_test_run_dir()), + util.Dir(self.event_server_sk_tmp_dir), suite_run=self._suite_run) # TODO: We should pass subscribers down to the test and not get it from -- To view, visit https://gerrit.osmocom.org/12104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9ba4cd5c3e220ec10fc7c3160d7211daa821358f Gerrit-Change-Number: 12104 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:02:18 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 5 Dec 2018 12:02:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: First SGs testcases In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#13) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: First SGs testcases ...................................................................... WIP: MSC_Tests: First SGs testcases This extens MSC_Tests.ttcn with the first couple of SGs interface test cases for RESET, LU, DETACH, PAGING and SMS procedures In particular the following testcases are added: - TC_sgsap_reset: isolated reset procedure test - TC_sgsap_lu: isolated location update with TMSI realloc - TC_sgsap_lu_imsi_reject: location update, reject case - TC_sgsap_lu_and_nothing: location update with failed TMSI realloc - TC_sgsap_expl_imsi_det_eps: detach from EPS serveces - TC_sgsap_expl_imsi_det_noneps: detach from non-EPS services - TC_sgsap_paging_rej: isolated paging, reject case - TC_sgsap_paging_subscr_rej: isolated paging, subscr rejects call - TC_sgsap_paging_ue_unr: isolated paging, ue is unreachable - TC_sgsap_paging_and_nothing: page, but don't respond - TC_sgsap_mt_sms: mobile terminated SMS through SGs Interface - TC_sgsap_mo_sms: mobile originated SMS through SGs Interface - TC_sgsap_mt_sms_and_nothing: trigger SMS, but don't respond to paging - TC_sgsap_mt_sms_and_reject: trigger SMS, but reject paging - TC_sgsap_unexp_ud: Send unexpected unitdata (SGs Association: NULL) - TC_sgsap_unsol_ud: Send unsolicited unitdata (subscriber not in VLR) - TC_sgsap_lu_and_mt_call: Initiate MT call via SGs, then do CSFB Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Related: OS#3645 --- M library/SGsAP_Emulation.ttcn M library/SGsAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.default M msc/MSC_Tests.ttcn M msc/gen_links.sh M msc/regen_makefile.sh 7 files changed, 890 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11488/13 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 13 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:15:05 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:15:05 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12046 to look at the new patch set (#5). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: Id460a932431b46b88937d96637edd209ca56db97 --- M contrib/jenkins.sh 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/12046/5 -- To view, visit https://gerrit.osmocom.org/12046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id460a932431b46b88937d96637edd209ca56db97 Gerrit-Change-Number: 12046 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Holger Freyther Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:15:31 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:15:31 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11976 to look at the new patch set (#7). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/76/11976/7 -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:16:45 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:16:45 +0000 Subject: Change in osmo-ggsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12063 to look at the new patch set (#4). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b --- M contrib/jenkins.sh 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/63/12063/4 -- To view, visit https://gerrit.osmocom.org/12063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b Gerrit-Change-Number: 12063 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:17:09 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:17:09 +0000 Subject: Change in libosmo-sccp[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12064 to look at the new patch set (#4). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/12064/4 -- To view, visit https://gerrit.osmocom.org/12064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 Gerrit-Change-Number: 12064 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:17:24 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:17:24 +0000 Subject: Change in osmo-bsc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11972 to look at the new patch set (#5). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/72/11972/5 -- To view, visit https://gerrit.osmocom.org/11972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 Gerrit-Change-Number: 11972 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:17:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:17:40 +0000 Subject: Change in osmo-msc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12081 to look at the new patch set (#5). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 --- M contrib/jenkins.sh 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/81/12081/5 -- To view, visit https://gerrit.osmocom.org/12081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 Gerrit-Change-Number: 12081 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:18:58 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:18:58 +0000 Subject: Change in osmo-sgsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12066 to look at the new patch set (#4). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: Ic45322c809f9f65d0fd24b828dab0cd929fa6267 --- M contrib/jenkins.sh 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/66/12066/4 -- To view, visit https://gerrit.osmocom.org/12066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic45322c809f9f65d0fd24b828dab0cd929fa6267 Gerrit-Change-Number: 12066 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:19:50 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:19:50 +0000 Subject: Change in osmo-trx[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12075 to look at the new patch set (#4). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I54fdd18e405b2c84762ea06d91359867ceec8184 --- M contrib/jenkins.sh 1 file changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/75/12075/4 -- To view, visit https://gerrit.osmocom.org/12075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I54fdd18e405b2c84762ea06d91359867ceec8184 Gerrit-Change-Number: 12075 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:19:51 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:19:51 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: run "make distcheck" Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12132 Change subject: jenkins.sh: run "make distcheck" ...................................................................... jenkins.sh: run "make distcheck" Run distcheck in CI to be consistent with other Osmocom projects. Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/32/12132/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 4523a5a..e227bb6 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -99,6 +99,8 @@ $MAKE $PARALLEL_MAKE $MAKE check \ || cat-testlogs.sh +DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck \ + || cat-testlogs.sh if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then make -C "$base/doc/manuals" publish -- To view, visit https://gerrit.osmocom.org/12132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d Gerrit-Change-Number: 12132 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:20:22 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:20:22 +0000 Subject: Change in osmo-sip-connector[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12074 to look at the new patch set (#5). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 --- M contrib/jenkins.sh 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/74/12074/5 -- To view, visit https://gerrit.osmocom.org/12074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 Gerrit-Change-Number: 12074 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:20:54 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:20:54 +0000 Subject: Change in osmo-bts[master]: contrib/jenkins_*.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12076 to look at the new patch set (#4). Change subject: contrib/jenkins_*.sh: build and publish manuals ...................................................................... contrib/jenkins_*.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of jenkins_bts_model.sh. Change the top description line to look like all the other contrib/jenkins.sh files (from other repositories), so it is clear that this is the entry point of Jenkins (and not the other contrib/jenkins_*.sh scripts). When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860 --- M contrib/jenkins_bts_model.sh M contrib/jenkins_common.sh 2 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/76/12076/4 -- To view, visit https://gerrit.osmocom.org/12076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860 Gerrit-Change-Number: 12076 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:21:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:21:17 +0000 Subject: Change in osmo-mgw[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12065 to look at the new patch set (#6). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I24179b21ce4ff182649243e286c87c824b889454 --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/12065/6 -- To view, visit https://gerrit.osmocom.org/12065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I24179b21ce4ff182649243e286c87c824b889454 Gerrit-Change-Number: 12065 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:24:09 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:24:09 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12046 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Abandoned I deleted the change ID by accident, now it is here (already has reviews, so let's keep that newer version): https://gerrit.osmocom.org/#/c/osmo-pcu/+/12090/ -- To view, visit https://gerrit.osmocom.org/12046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Id460a932431b46b88937d96637edd209ca56db97 Gerrit-Change-Number: 12046 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Holger Freyther Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:46:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:46:22 +0000 Subject: Change in osmo-bsc[master]: Add VTY option to avoid sending empty Full BCCH Info for disabled SI Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12133 Change subject: Add VTY option to avoid sending empty Full BCCH Info for disabled SI ...................................................................... Add VTY option to avoid sending empty Full BCCH Info for disabled SI According to 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION: "If the Full BCCH information element is not included this indicates that transmission of the indicated SYSTEM INFORMATION message shall be stopped." However, some ipaccess nanoBTS firmware versions are known to not support some SI elements and also to dislike receiving BCCH Information for those SI, even if received with empty BCCH Information meaning they should not be used. Upon receival of this kind of message, nanoBTS sends a Failure Report with following text: Type=processing failure, Severity=critical failure, Probable cause=Manufacturer specific values: Fatal software error, Additional Text=l2_bch.c:1149 **** ** l2_bch.c#1149:BCHbcchSItypeValid( prim_p->infoType ) ** IPA_SW_FATAL_ERROR ** In task "TRX Proc:L2_BCH" @ (325). **** This kind of issue only appears with some fw versions, since it's known to work fine in other ones, so let's not disable this kind of mesage by default on all BTs of type "nanobts". Instead, add a VTY command that allows disabling this kind of message in order to be able to operate those nanoBTS units. Fixes: OS#3707 Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_data.c 4 files changed, 48 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/12133/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 2f60e4d..23c7b4f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -968,6 +968,9 @@ /* offsets used while generating SI2quater */ size_t e_offset; size_t u_offset; + /* 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION. Some nanoBTS fail upon + * receival of empty SI disabling unsupported SI. see OS#3707. */ + bool si_disabled_send_empty; /* ip.accesss Unit ID's have Site/BTS/TRX layout */ union { diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index 2f44b20..4827529 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -173,12 +173,16 @@ for (n = 0; n < n_si; n++) { i = gen_si[n]; - /* if we don't currently have this SI, we send a zero-length - * RSL BCCH FILLING / SACCH FILLING * in order to deactivate - * the SI, in case it might have previously been active */ - if (!GSM_BTS_HAS_SI(bts, i)) - rc = rsl_si(trx, i, 0); - else + /* 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION. If we don't currently + * have this SI, we send a zero-length RSL BCCH FILLING / + * SACCH FILLING in order to deactivate the SI, in case it + * might have previously been active */ + if (!GSM_BTS_HAS_SI(bts, i)) { + if (bts->si_disabled_send_empty) + rc = rsl_si(trx, i, 0); + else + rc = 0; /* some nanoBTs fw don't like receiving empty unsupported SI */ + } else rc = rsl_si(trx, i, si_len[i]); if (rc < 0) return rc; diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 983dcb9..5524612 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3087,6 +3087,38 @@ return CMD_SUCCESS; } +DEFUN(cfg_bts_si_disabled_send_empty, cfg_bts_si_disabled_send_empty_cmd, + "system-information disabled-si-send-empty-bcch-info", + SI_TEXT + "Send BCCH Info with empty 'Full BCCH Info' TLV to notify disabled SI. " + "Some nanoBTS fw versions are known to fail upron receival of these messages.\n") +{ + struct gsm_bts *bts = vty->index; + + bts->si_disabled_send_empty = true; + + return CMD_SUCCESS; +} + +DEFUN(cfg_bts_no_si_disabled_send_empty, cfg_bts_no_si_disabled_send_empty_cmd, + "no system-information disabled-si-send-empty-bcch-info", + NO_STR SI_TEXT + "Avoid sending BCCH Info with empty 'Full BCCH Info' TLV to notify disabled SI. " + "Some nanoBTS fw versions are known to fail upron receival of these messages.\n") +{ + struct gsm_bts *bts = vty->index; + + if (!is_ipaccess_bts(bts) || is_sysmobts_v2(bts)) { + vty_out(vty, "This command is only intended for ipaccess nanoBTS. See OS#3707.%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + bts->si_disabled_send_empty = false; + + return CMD_SUCCESS; +} + DEFUN(cfg_bts_early_cm, cfg_bts_early_cm_cmd, "early-classmark-sending (allowed|forbidden)", "Early Classmark Sending\n" @@ -5082,6 +5114,8 @@ install_element(BTS_NODE, &cfg_bts_pag_free_cmd); install_element(BTS_NODE, &cfg_bts_si_mode_cmd); install_element(BTS_NODE, &cfg_bts_si_static_cmd); + install_element(BTS_NODE, &cfg_bts_si_disabled_send_empty_cmd); + install_element(BTS_NODE, &cfg_bts_no_si_disabled_send_empty_cmd); install_element(BTS_NODE, &cfg_bts_early_cm_cmd); install_element(BTS_NODE, &cfg_bts_early_cm_3g_cmd); install_element(BTS_NODE, &cfg_bts_neigh_mode_cmd); diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 6d39642..f406f80 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -855,6 +855,7 @@ bts->gprs.ctrl_ack_type_use_block = true; /* use RLC/MAC control block */ bts->neigh_list_manual_mode = NL_MODE_AUTOMATIC; bts->early_classmark_allowed_3g = true; /* 3g Early Classmark Sending controlled by bts->early_classmark_allowed param */ + bts->si_disabled_send_empty = true; bts->si_common.cell_sel_par.cell_resel_hyst = 2; /* 4 dB */ bts->si_common.cell_sel_par.rxlev_acc_min = 0; bts->si_common.si2quater_neigh_list.arfcn = bts->si_common.data.earfcn_list; -- To view, visit https://gerrit.osmocom.org/12133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 Gerrit-Change-Number: 12133 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:46:31 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:46:31 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: WITH_MANUALS In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12045 to look at the new patch set (#7). Change subject: gerrit-verifications/master-builds: WITH_MANUALS ...................................................................... gerrit-verifications/master-builds: WITH_MANUALS Add WITH_MANUALS=1 to generate (and publish in case of master-builds) PDF manuals. Jobs with multiple axes generate the manuals only in the fastest axis. Related: OS#3385 Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 92 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/12045/7 -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:47:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 12:47:53 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12090 to look at the new patch set (#2). Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: Ia5b112fc1663b78800d3c2c4ff2a0771cf5af11b --- M contrib/jenkins.sh 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/90/12090/2 -- To view, visit https://gerrit.osmocom.org/12090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia5b112fc1663b78800d3c2c4ff2a0771cf5af11b Gerrit-Change-Number: 12090 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:51:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:51:06 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11976 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 05 Dec 2018 12:51:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:51:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:51:55 +0000 Subject: Change in osmo-ggsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12063 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b Gerrit-Change-Number: 12063 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 12:51:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:52:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:52:25 +0000 Subject: Change in libosmo-sccp[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12064 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 Gerrit-Change-Number: 12064 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 12:52:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:53:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:53:05 +0000 Subject: Change in osmo-bsc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11972 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 Gerrit-Change-Number: 11972 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 12:53:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:53:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:53:17 +0000 Subject: Change in osmo-msc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12081 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 Gerrit-Change-Number: 12081 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 12:53:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:53:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:53:42 +0000 Subject: Change in osmo-sgsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12066 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic45322c809f9f65d0fd24b828dab0cd929fa6267 Gerrit-Change-Number: 12066 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 12:53:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:53:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:53:58 +0000 Subject: Change in osmo-trx[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12075 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I54fdd18e405b2c84762ea06d91359867ceec8184 Gerrit-Change-Number: 12075 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 12:53:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:54:10 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 12:54:10 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix broken config override Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12134 Change subject: ctrl2cgi: fix broken config override ...................................................................... ctrl2cgi: fix broken config override Previously command-line arguments without defaults took precedence over config file variables while values from config file which had command-line counterparts with default value were silently ignored. Let's fix this by making config file values to be always preferred over command-line equivalents. The easiest way is to use TrapFactory as argparse namespace. This means that some parameter values won't be known initially so logging is moved directly to main. Change-Id: I471b5a6497eadce6456e835233fdaba88a593324 Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 21 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/34/12134/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 1d6813d..89cbf50 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.0.4" # bump this on every non-trivial change +__version__ = "0.0.5" # bump this on every non-trivial change import argparse, os, logging, logging.handlers import hashlib @@ -90,7 +90,7 @@ """ Logging wrapper, calling super() is necessary not to break reconnection logic """ - self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) + self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.addr_ctrl, self.factory.port_ctrl)) super(CTRL, self).connectionMade() @defer.inlineCallbacks @@ -120,25 +120,14 @@ """ Store CGI information so TRAP handler can use it for requests """ - location = None - log = None - semaphore = None - client = None - host = None - port = None - secret_key = None - def __init__(self, host, port, proto, semaphore, log, location, secret_key): - self.host = host # for logging only, - self.port = port # seems to be no way to get it from ReconnectingClientFactory + def __init__(self, proto, log): + self.semaphore = defer.DeferredSemaphore(self.num_max_conn) self.log = log - self.semaphore = semaphore - self.location = location - self.secret_key = secret_key level = self.log.getEffectiveLevel() self.log.setLevel(logging.WARNING) # we do not need excessive debug from lower levels super(TrapFactory, self).__init__(proto, self.log) self.log.setLevel(level) - self.log.debug("Using IPA %s, CGI server: %s" % (Ctrl.version, self.location)) + self.log.debug("Using Osmocom IPA library v%s" % Ctrl.version) if __name__ == '__main__': @@ -151,31 +140,24 @@ p.add_argument('-o', '--output', action='store_true', help="Log to STDOUT in addition to SYSLOG") p.add_argument('-l', '--location', help="Location URL of the CGI server") p.add_argument('-s', '--secret-key', help="Secret key used to generate verification token") - p.add_argument('-c', '--config-file', help="Path Config file. Cmd line args override values in config file") - args = p.parse_args() + p.add_argument('-c', '--config-file', help="Path to config file (in INI format). Values from config file override command line options.") + args = p.parse_args(namespace=TrapFactory) log = debug_init('CTRL2CGI', args.debug, args.output) - location_cfgfile = None - secret_key_cfgfile = None - port_ctrl_cfgfile = None - addr_ctrl_cfgfile = None - num_max_conn_cfgfile = None - if args.config_file: - config = configparser.ConfigParser() - config.read(args.config_file) - if 'main' in config: - location_cfgfile = config['main'].get('location', None) - secret_key_cfgfile = config['main'].get('secret_key', None) - addr_ctrl_cfgfile = config['main'].get('addr_ctrl', None) - port_ctrl_cfgfile = config['main'].get('port_ctrl', None) - num_max_conn_cfgfile = config['main'].get('num_max_conn', None) - location = args.location if args.location is not None else location_cfgfile - secret_key = args.secret_key if args.secret_key is not None else secret_key_cfgfile - addr_ctrl = args.addr_ctrl if args.addr_ctrl is not None else addr_ctrl_cfgfile - port_ctrl = args.port_ctrl if args.port_ctrl is not None else port_ctrl_cfgfile - num_max_conn = args.num_max_conn if args.num_max_conn is not None else num_max_conn_cfgfile + T = TrapFactory(Trap, log) - log.info("CGI proxy %s starting with PID %d ..." % (__version__, os.getpid())) - reactor.connectTCP(addr_ctrl, port_ctrl, TrapFactory(addr_ctrl, port_ctrl, Trap, defer.DeferredSemaphore(num_max_conn), log, location, secret_key)) + if args.config_file: + config = configparser.ConfigParser(interpolation=None) + config.read(args.config_file) + T.location = config['main'].get('location', T.location) + T.addr_ctrl = config['main'].get('addr_ctrl', T.addr_ctrl) + T.port_ctrl = config['main'].getint('port_ctrl', T.port_ctrl) + T.num_max_conn = config['main'].getint('num_max_conn', T.num_max_conn) + T.secret_key = config['main'].get('secret_key', T.secret_key) + + log.info("CGI proxy v%s starting with PID %d:" % (__version__, os.getpid())) + log.info("destination %s (concurrency %d)" % (T.location, T.num_max_conn)) + log.info("connecting to %s:%d..." % (T.addr_ctrl, T.port_ctrl)) + reactor.connectTCP(T.addr_ctrl, T.port_ctrl, T) reactor.run() -- To view, visit https://gerrit.osmocom.org/12134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I471b5a6497eadce6456e835233fdaba88a593324 Gerrit-Change-Number: 12134 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:54:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 12:54:11 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: always log to stdout Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12135 Change subject: Trap handlers: always log to stdout ...................................................................... Trap handlers: always log to stdout Since the scripts are intended to be used as systemd services, there's no need in separate logging via syslog: systemd will take care of properly collecting and storing script output. Hence we can drop extra options and function parameters. Change-Id: Ifcad1877d45d43b3a2e617775a1c9b256e190591 Related: SYS#4399 --- M contrib/systemd/osmo-ctrl2cgi.service M osmopy/trap_helper.py M scripts/ctrl2cgi.py M scripts/soap.py 4 files changed, 5 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/35/12135/1 diff --git a/contrib/systemd/osmo-ctrl2cgi.service b/contrib/systemd/osmo-ctrl2cgi.service index 8563c66..f82e1e9 100644 --- a/contrib/systemd/osmo-ctrl2cgi.service +++ b/contrib/systemd/osmo-ctrl2cgi.service @@ -4,7 +4,7 @@ [Service] Type=simple Restart=always -ExecStart=/usr/bin/ctrl2cgi.py -o -d -c /etc/osmocom/ctrl2cgi.ini +ExecStart=/usr/bin/ctrl2cgi.py -d -c /etc/osmocom/ctrl2cgi.ini RestartSec=2 [Install] diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index d4a3b75..45dc527 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -95,7 +95,7 @@ sys.argv.remove(dbg2) os.execl(path, script, *sys.argv[1:]) -def debug_init(name, is_debug, output): +def debug_init(name, is_debug): """ Initialize signal handlers and logging """ @@ -104,9 +104,7 @@ log.setLevel(logging.DEBUG) else: log.setLevel(logging.INFO) - log.addHandler(logging.handlers.SysLogHandler('/dev/log')) - if output: - log.addHandler(logging.StreamHandler(sys.stdout)) + log.addHandler(logging.StreamHandler(sys.stdout)) reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with caller's add_argument() signal.signal(signal.SIGHUP, reboot) diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 89cbf50..1d90ee0 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -137,13 +137,12 @@ p.add_argument('-p', '--port-ctrl', type=int, default=4250, help="Port to use for CTRL interface, defaults to 4250") p.add_argument('-n', '--num-max-conn', type=int, default=5, help="Max number of concurrent HTTP requests to CGI server") p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") # keep in sync with debug_init call below - p.add_argument('-o', '--output', action='store_true', help="Log to STDOUT in addition to SYSLOG") p.add_argument('-l', '--location', help="Location URL of the CGI server") p.add_argument('-s', '--secret-key', help="Secret key used to generate verification token") p.add_argument('-c', '--config-file', help="Path to config file (in INI format). Values from config file override command line options.") args = p.parse_args(namespace=TrapFactory) - log = debug_init('CTRL2CGI', args.debug, args.output) + log = debug_init('CTRL2CGI', args.debug) T = TrapFactory(Trap, log) diff --git a/scripts/soap.py b/scripts/soap.py index 267b4d8..0534000 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -136,11 +136,10 @@ p.add_argument('-w', '--wsdl', required=True, help="WSDL URL for SOAP") p.add_argument('-n', '--num', type=int, default=5, help="Max number of concurrent HTTP requests to SOAP server") p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") # keep in sync with debug_init call below - p.add_argument('-o', '--output', action='store_true', help="Log to STDOUT in addition to SYSLOG") p.add_argument('-l', '--location', help="Override location found in WSDL file (don't use unless you know what you're doing)") args = p.parse_args() - log = debug_init('CTRL2SOAP', args.debug, args.output) + log = debug_init('CTRL2SOAP', args.debug) log.info("SOAP proxy %s starting with PID %d ..." % (__version__, os.getpid())) reactor.connectTCP(args.ctrl, args.port, TrapFactory(args.ctrl, args.port, Trap, defer.DeferredSemaphore(args.num), log, args.wsdl, args.location)) -- To view, visit https://gerrit.osmocom.org/12135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifcad1877d45d43b3a2e617775a1c9b256e190591 Gerrit-Change-Number: 12135 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:55:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:55:59 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: run "make distcheck" In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12132 ) Change subject: jenkins.sh: run "make distcheck" ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12132/1/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/12132/1/contrib/jenkins.sh at 102 PS1, Line 102: DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck \ Tests fail because it seems somehow they (test binaries) weren't built with flags enabled by --enable-sanitize. -- To view, visit https://gerrit.osmocom.org/12132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d Gerrit-Change-Number: 12132 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 12:55:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:56:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:56:16 +0000 Subject: Change in osmo-sip-connector[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12074 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 Gerrit-Change-Number: 12074 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 12:56:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:57:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:57:02 +0000 Subject: Change in osmo-bts[master]: contrib/jenkins_*.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12076 ) Change subject: contrib/jenkins_*.sh: build and publish manuals ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860 Gerrit-Change-Number: 12076 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 12:57:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:57:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:57:17 +0000 Subject: Change in osmo-mgw[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12065 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24179b21ce4ff182649243e286c87c824b889454 Gerrit-Change-Number: 12065 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 12:57:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:59:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:59:38 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: WITH_MANUALS In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12045 ) Change subject: gerrit-verifications/master-builds: WITH_MANUALS ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 05 Dec 2018 12:59:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 12:59:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 12:59:53 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12090 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia5b112fc1663b78800d3c2c4ff2a0771cf5af11b Gerrit-Change-Number: 12090 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 05 Dec 2018 12:59:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:00:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:00:39 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12090 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: Ia5b112fc1663b78800d3c2c4ff2a0771cf5af11b --- M contrib/jenkins.sh 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index ea1675c..7af7309 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,12 @@ #!/bin/sh # jenkins build helper script for osmo-pcu. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * with_dsp: the DSP to configure ("sysmo", "lc15" or "none") +# * with_vty: enable VTY tests if set to "True" +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -65,6 +72,12 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + PCU_CONFIG="$PCU_CONFIG --enable-manuals" +fi set +x echo @@ -81,4 +94,8 @@ $MAKE distcheck \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia5b112fc1663b78800d3c2c4ff2a0771cf5af11b Gerrit-Change-Number: 12090 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:01:03 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:01:03 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: WITH_MANUALS In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12045 ) Change subject: gerrit-verifications/master-builds: WITH_MANUALS ...................................................................... Patch Set 7: Verified+1 -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 05 Dec 2018 13:01:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:01:05 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:01:05 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: WITH_MANUALS In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12045 ) Change subject: gerrit-verifications/master-builds: WITH_MANUALS ...................................................................... gerrit-verifications/master-builds: WITH_MANUALS Add WITH_MANUALS=1 to generate (and publish in case of master-builds) PDF manuals. Jobs with multiple axes generate the manuals only in the fastest axis. Related: OS#3385 Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 92 insertions(+), 35 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved osmith: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index a4cceee..83f1c30 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -46,7 +46,8 @@ - libgtpnl - libosmo-abis - libosmo-netif - - libosmo-sccp + - libosmo-sccp: + cmd: WITH_MANUALS=1 ./contrib/jenkins.sh - libosmocore: a1_name: arch @@ -101,6 +102,7 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e WITH_MANUALS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh @@ -110,27 +112,35 @@ a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, litecell15, oc2g, oc2g-next] a2_name: BTS_MODEL a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15, oc2g] + a3_name: WITH_MANUALS + a3: !!python/tuple ["1", "0"] combination_filter: > - FIRMWARE_VERSION == "master" || - (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g") || - (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g") + (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "1") || + (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] + combination_filter: > + (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") || + (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1") cmd: ./contrib/jenkins.sh - osmo-gsm-manuals - - osmo-hlr + - osmo-hlr: + cmd: WITH_MANUALS=1 ./contrib/jenkins.sh - osmo-iuh @@ -144,6 +154,7 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e WITH_MANUALS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh @@ -151,7 +162,12 @@ - osmo-msc: a1_name: IU a1: !!python/tuple [--enable-iu, --disable-iu] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] concurrent: true + combination_filter: > + (IU == "--enable-iu" && WITH_MANUALS == "0") || + (IU == "--disable-iu" && WITH_MANUALS == "1") cmd: > # keep first line with less indent to preserve newlines ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" @@ -163,6 +179,7 @@ -e MAKE=make \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e IU="$IU" \ + -e WITH_MANUALS="$WITH_MANUALS" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -u build \ @@ -179,13 +196,15 @@ a2: !!python/tuple [True, False] a3_name: with_dsp a3: !!python/tuple [sysmo, lc15, none] + a4_name: WITH_MANUALS + a4: !!python/tuple ["1", "0"] sequential: true combination_filter: > - (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") || - (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master") + (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") || + (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1") || - osmo-python-tests: repos_url: 'ssh://jenkins at gerrit.osmocom.org:29418/python/{repos}' @@ -194,7 +213,12 @@ - osmo-sgsn: a1_name: IU a1: !!python/tuple [--enable-iu, --disable-iu] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] concurrent: true + combination_filter: > + (IU == "--enable-iu" && WITH_MANUALS == "0") || + (IU == "--disable-iu" && WITH_MANUALS == "1") cmd: > # keep first line with less indent to preserve newlines docker run --rm=true \ @@ -202,6 +226,7 @@ -e MAKE=make \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e IU="$IU" \ + -e WITH_MANUALS="$WITH_MANUALS" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ @@ -209,13 +234,18 @@ osmocom:amd64 /build/contrib/jenkins.sh - osmo-sip-connector + cmd: WITH_MANUALS=1 ./contrib/jenkins.sh - osmo-trx: a1_name: INSTR - # ARM variants temporarily disabled due to issue OS#3061 + # ARM variants temporarily disabled due to issue OS#3061 (mind the combination_filter below!) # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] concurrent: true + combination_filter: > + (INSTR == "--with-sse" && WITH_MANUALS == "1") - osmocom-bb - osmo-tetra diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index cb6220b..4988062 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -82,7 +82,7 @@ master-osmo-iuh, master-osmo-msc, master-osmo-sgsn - cmd: PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh - libosmocore: a1_name: arch @@ -173,6 +173,7 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e WITH_MANUALS="1" \ -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ @@ -184,20 +185,27 @@ a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, origin/nrw/litecell15] a2_name: BTS_MODEL a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15] + a3_name: WITH_MANUALS + a3: !!python/tuple ["1", "0"] combination_filter: > - FIRMWARE_VERSION == "master" || - (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") + (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "1") || + (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") || + (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") cmd: 'PUBLISH=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] + combination_filter: > + (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") || + (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1") cmd: PUBLISH=1 ./contrib/jenkins.sh trigger: master-osmo-sgsn @@ -211,7 +219,7 @@ ./contrib/jenkins.sh - osmo-hlr: - cmd: PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh - osmo-iuh: # Full triggers would be: @@ -232,6 +240,7 @@ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e WITH_MANUALS="1" \ -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ @@ -242,7 +251,12 @@ - osmo-msc: a1_name: IU a1: !!python/tuple [--enable-iu, --disable-iu] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] concurrent: true + combination_filter: > + (IU == "--enable-iu" && WITH_MANUALS == "0") || + (IU == "--disable-iu" && WITH_MANUALS == "1") cmd: > # keep first line with less indent to preserve newlines ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" @@ -254,6 +268,7 @@ -e MAKE=make \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e IU="$IU" \ + -e WITH_MANUALS="$WITH_MANUALS" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e PUBLISH="1" \ @@ -277,19 +292,26 @@ a2: !!python/tuple [True, False] a3_name: with_dsp a3: !!python/tuple [sysmo, lc15, none] + a4_name: WITH_MANUALS + a4: !!python/tuple ["1", "0"] sequential: true combination_filter: > - (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") || - (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master") + (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") || + (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1") cmd: PUBLISH=1 ./contrib/jenkins.sh - osmo-sgsn: a1_name: IU a1: !!python/tuple [--enable-iu, --disable-iu] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] concurrent: true + combination_filter: > + (IU == "--enable-iu" && WITH_MANUALS == "0") || + (IU == "--disable-iu" && WITH_MANUALS == "1") cmd: > # keep first line with less indent to preserve newlines docker run --rm=true \ @@ -297,6 +319,7 @@ -e MAKE=make \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e IU="$IU" \ + -e WITH_MANUALS="$WITH_MANUALS" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e PUBLISH="1" \ @@ -307,17 +330,21 @@ - osmo-sip-connector: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org holger at freyther.de - cmd: PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh - osmo-tetra: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org 246tnt at gmail.com - osmo-trx: a1_name: INSTR - # ARM variants temporarily disabled due to issue OS#3061 + # ARM variants temporarily disabled due to issue OS#3061 (mind the combination_filter below!) # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] concurrent: true + combination_filter: > + (INSTR == "--with-sse" && WITH_MANUALS == "1") cmd: PUBLISH=1 ./contrib/jenkins.sh - osmocom-bb -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:01:08 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:01:08 +0000 Subject: Change in osmo-mgw[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12065 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I24179b21ce4ff182649243e286c87c824b889454 --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b0ef7de..9777d4b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash # jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -23,10 +28,18 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi + set +x echo echo @@ -37,13 +50,17 @@ cd "$base" autoreconf --install --force -./configure --enable-vty-tests --enable-external-tests --enable-werror +./configure --enable-vty-tests --enable-external-tests --enable-werror $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests $CONFIG" \ $MAKE distcheck \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I24179b21ce4ff182649243e286c87c824b889454 Gerrit-Change-Number: 12065 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:01:10 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:01:10 +0000 Subject: Change in osmo-bts[master]: contrib/jenkins_*.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12076 ) Change subject: contrib/jenkins_*.sh: build and publish manuals ...................................................................... contrib/jenkins_*.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of jenkins_bts_model.sh. Change the top description line to look like all the other contrib/jenkins.sh files (from other repositories), so it is clear that this is the entry point of Jenkins (and not the other contrib/jenkins_*.sh scripts). When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860 --- M contrib/jenkins_bts_model.sh M contrib/jenkins_common.sh 2 files changed, 23 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins_bts_model.sh b/contrib/jenkins_bts_model.sh index 9aa943f..ac85c30 100755 --- a/contrib/jenkins_bts_model.sh +++ b/contrib/jenkins_bts_model.sh @@ -1,6 +1,14 @@ #!/bin/sh -# this is a dispatcher script which will call the bts-model-specific -# script based on the bts model specified as command line argument +# jenkins build helper script for osmo-bts. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * FIRMWARE_VERSION: which firmware version to build ("master", "femtobts_v2.7", ...) +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# +# usage: jenkins_bts_model.sh BTS_MODEL +# * BTS_MODEL: which BTS model specific script to run ("sysmo", "oct", ...) +# bts_model="$1" diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh index bdb12d5..fd0359b 100644 --- a/contrib/jenkins_common.sh +++ b/contrib/jenkins_common.sh @@ -38,10 +38,23 @@ osmo-deps.sh libosmocore cd $base shift + + # Manuals: build conf_flags="$*" + if [ "$WITH_MANUALS" = "1" ]; then + conf_flags="$conf_flags --enable-manuals" + osmo-build-dep.sh osmo-gsm-manuals + export PATH="$inst/bin:$PATH" + fi + autoreconf --install --force ./configure $conf_flags $MAKE $PARALLEL_MAKE $MAKE check || cat-testlogs.sh DISTCHECK_CONFIGURE_FLAGS="$conf_flags" $MAKE distcheck || cat-testlogs.sh + + # Manuals: publish + if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + $MAKE -C "$base/doc/manuals" publish + fi } -- To view, visit https://gerrit.osmocom.org/12076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860 Gerrit-Change-Number: 12076 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:01:13 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:01:13 +0000 Subject: Change in osmo-sip-connector[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12074 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 --- M contrib/jenkins.sh 1 file changed, 20 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 00cd5ff..579a9b1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,4 +1,10 @@ #!/usr/bin/env bash +# jenkins build helper script for osmo-sip-connector. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# set -ex @@ -17,6 +23,14 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi set +x echo @@ -27,11 +41,15 @@ set -x autoreconf --install --force -./configure --enable-werror --enable-vty-tests --enable-external-tests +./configure --enable-werror --enable-vty-tests --enable-external-tests $CONFIG $MAKE $PARALLEL_MAKE $MAKE check \ || cat-testlogs.sh -$MAKE distcheck \ +DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4cf9d3c21f3912eac3c51bae1ac7b2ad0845c947 Gerrit-Change-Number: 12074 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:01:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:01:18 +0000 Subject: Change in osmo-trx[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12075 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I54fdd18e405b2c84762ea06d91359867ceec8184 --- M contrib/jenkins.sh 1 file changed, 21 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 029f0e1..4523a5a 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,4 +1,12 @@ #!/bin/sh +# jenkins build helper script for osmo-trx. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * INSTR: configure the CPU instruction set ("--with-sse", "--with-neon" or "--with-neon-vfpv4") +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# * INSIDE_CHROOT: (used internally) set to "1" when the script runs with QEMU in an ARM chroot +# set -ex substr() { [ -z "${2##*$1*}" ]; } @@ -68,6 +76,14 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi set +x echo @@ -79,9 +95,13 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR +./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR $CONFIG $MAKE $PARALLEL_MAKE $MAKE check \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I54fdd18e405b2c84762ea06d91359867ceec8184 Gerrit-Change-Number: 12075 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:01:21 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:01:21 +0000 Subject: Change in osmo-sgsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12066 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: Ic45322c809f9f65d0fd24b828dab0cd929fa6267 --- M contrib/jenkins.sh 1 file changed, 20 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 64663d6..a9d871f 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,11 @@ #!/usr/bin/env bash # jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * IU: configure 3G support (values: "--enable-iu", "--disable-iu") +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -24,6 +30,7 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif @@ -40,6 +47,13 @@ enable_werror="--enable-werror" fi +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi + set +x echo echo @@ -50,13 +64,17 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize $enable_werror $IU --enable-external-tests +./configure --enable-sanitize $enable_werror $IU --enable-external-tests $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="$enable_werror $IU --enable-external-tests" \ + DISTCHECK_CONFIGURE_FLAGS="$enable_werror $IU --enable-external-tests $CONFIG" \ $MAKE distcheck \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic45322c809f9f65d0fd24b828dab0cd929fa6267 Gerrit-Change-Number: 12066 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:01:23 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:01:23 +0000 Subject: Change in osmo-msc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12081 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 --- M contrib/jenkins.sh 1 file changed, 20 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 8b8b6e7..be8dadc 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,11 @@ #!/usr/bin/env bash # jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * IU: configure 3G support (values: "--enable-iu", "--disable-iu") +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -24,6 +30,7 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif @@ -41,6 +48,13 @@ enable_werror="--enable-werror" fi +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi + set +x echo echo @@ -51,13 +65,17 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize $enable_werror --enable-smpp $IU --enable-external-tests +./configure --enable-sanitize $enable_werror --enable-smpp $IU --enable-external-tests $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="$enable_werror --enable-smpp $IU --enable-external-tests" \ + DISTCHECK_CONFIGURE_FLAGS="$enable_werror --enable-smpp $IU --enable-external-tests $CONFIG" \ $MAKE distcheck \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I42d80dadf28fd54c45b275f2c278225a8e7ea031 Gerrit-Change-Number: 12081 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:01:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:01:49 +0000 Subject: Change in osmo-bsc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11972 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0be4fe0..a47935f 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash # jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -24,12 +29,20 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif osmo-build-dep.sh libosmo-sccp osmo-build-dep.sh osmo-mgw +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi + set +x echo echo @@ -40,13 +53,17 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests --enable-werror +./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror $CONFIG" \ $MAKE distcheck \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/11972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 Gerrit-Change-Number: 11972 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:01:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:01:52 +0000 Subject: Change in libosmo-sccp[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12064 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a417a9e..c54c1ac 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,10 @@ #!/bin/sh # jenkins build helper script for libosmo-sccp. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -22,11 +27,19 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmocore "" --disable-doxygen osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi + set +x echo echo @@ -36,10 +49,14 @@ set -x autoreconf --install --force -./configure --enable-sanitize --enable-werror --enable-external-tests +./configure --enable-sanitize --enable-werror --enable-external-tests $CONFIG $MAKE $PARALLEL_MAKE -DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests" \ +DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests $CONFIG" \ $MAKE distcheck \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 Gerrit-Change-Number: 12064 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:01:54 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:01:54 +0000 Subject: Change in osmo-ggsn[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12063 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b --- M contrib/jenkins.sh 1 file changed, 20 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 19df974..b512334 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,11 @@ #!/usr/bin/env bash # jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * GTP: configure GTP tunneling Linux kernel (values: "--enable-gtp-linux" or "--disable-gtp-linux") +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -27,6 +33,14 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi set +x echo @@ -38,8 +52,12 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-werror $GTP +./configure --enable-sanitize --enable-werror $GTP $CONFIG $MAKE $PARALLEL_MAKE -$MAKE distcheck +DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck + +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I43e3b592c593237eb4df2d70c926c031ddb7b20b Gerrit-Change-Number: 12063 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:01:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:01:57 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11976 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 --- M contrib/jenkins.sh 1 file changed, 19 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 8dc0162..1dadac3 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,10 @@ #!/bin/sh # jenkins build helper script for osmo-hlr. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -22,10 +27,18 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false osmo-build-dep.sh libosmo-abis +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi + set +x echo echo @@ -36,9 +49,13 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests --enable-werror +./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG $MAKE $PARALLEL_MAKE $MAKE check || cat-testlogs.sh -$MAKE distcheck || cat-testlogs.sh +DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck || cat-testlogs.sh + +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 13:07:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 13:07:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sip-connector_=C2=BB_a1=3D?= =?UTF-8?Q?default,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#935?= Message-ID: <603617036.1061.1544015226592.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Oliver Smith] contrib/jenkins.sh: build and publish manuals ------------------------------------------ [...truncated 204.80 KB...] make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-19445/ /usr/bin/install -c osmo-sip-connector '/tmp/am-dc-19445/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in tests make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in contrib make[3]: Entering directory ' Making install in systemd make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-19445/ /usr/bin/install -c -m 644 ../../../../contrib/systemd/osmo-sip-connector.service '/tmp/am-dc-19445/ make[5]: Leaving directory ' make[4]: Leaving directory ' make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in doc make[3]: Entering directory ' Making install in examples make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-19445/ /usr/bin/install -c -m 644 ../../../../doc/examples/osmo-sip-connector.cfg '/tmp/am-dc-19445/ /bin/mkdir -p '/tmp/am-dc-19445/ /usr/bin/install -c -m 644 ../../../../doc/examples/osmo-sip-connector.cfg '/tmp/am-dc-19445/ make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in manuals make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-19445/ && rm -f osmo-sip-connector ) make[2]: Leaving directory ' Making uninstall in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'uninstall'. make[2]: Leaving directory ' Making uninstall in contrib make[2]: Entering directory ' Making uninstall in systemd make[3]: Entering directory ' ( cd '/tmp/am-dc-19445/ && rm -f osmo-sip-connector.service ) make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'uninstall-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making uninstall in doc make[2]: Entering directory ' Making uninstall in examples make[3]: Entering directory ' ( cd '/tmp/am-dc-19445/ && rm -f osmo-sip-connector.cfg ) ( cd '/tmp/am-dc-19445/ && rm -f osmo-sip-connector.cfg ) make[3]: Leaving directory ' Making uninstall in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'uninstall'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'uninstall-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'uninstall-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make dist-bzip2 dist-gzip am__post_remove_distdir='@:' make[2]: Entering directory ' if test -d "osmo-sip-connector-1.1.1.35-0241"; then find "osmo-sip-connector-1.1.1.35-0241" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-sip-connector-1.1.1.35-0241" || { sleep 5 && rm -rf "osmo-sip-connector-1.1.1.35-0241"; }; else :; fi test -d "osmo-sip-connector-1.1.1.35-0241" || mkdir "osmo-sip-connector-1.1.1.35-0241" (cd src && make top_distdir=../osmo-sip-connector-1.1.1.35-0241 distdir=../osmo-sip-connector-1.1.1.35-0241/src \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory ' make[3]: Leaving directory ' (cd tests && make top_distdir=../osmo-sip-connector-1.1.1.35-0241 distdir=../osmo-sip-connector-1.1.1.35-0241/tests \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory ' make[3]: Leaving directory ' (cd contrib && make top_distdir=../osmo-sip-connector-1.1.1.35-0241 distdir=../osmo-sip-connector-1.1.1.35-0241/contrib \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory ' (cd systemd && make top_distdir=../../osmo-sip-connector-1.1.1.35-0241 distdir=../../osmo-sip-connector-1.1.1.35-0241/contrib/systemd \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' (cd doc && make top_distdir=../osmo-sip-connector-1.1.1.35-0241 distdir=../osmo-sip-connector-1.1.1.35-0241/doc \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory ' (cd examples && make top_distdir=../../osmo-sip-connector-1.1.1.35-0241 distdir=../../osmo-sip-connector-1.1.1.35-0241/doc/examples \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' (cd manuals && make top_distdir=../../osmo-sip-connector-1.1.1.35-0241 distdir=../../osmo-sip-connector-1.1.1.35-0241/doc/manuals \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make \ top_distdir="osmo-sip-connector-1.1.1.35-0241" distdir="osmo-sip-connector-1.1.1.35-0241" \ dist-hook make[3]: Entering directory ' echo 1.1.1.35-0241 > osmo-sip-connector-1.1.1.35-0241/.tarball-version make[3]: Leaving directory ' test -n "" \ || find "osmo-sip-connector-1.1.1.35-0241" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec /bin/bash -c -m a+r {} {} \; \ || chmod -R a+r "osmo-sip-connector-1.1.1.35-0241" tardir=osmo-sip-connector-1.1.1.35-0241 && ${TAR-tar} chof - "$tardir" | BZIP2=${BZIP2--9} bzip2 -c >osmo-sip-connector-1.1.1.35-0241.tar.bz2 tardir=osmo-sip-connector-1.1.1.35-0241 && ${TAR-tar} chof - "$tardir" | GZIP=--best gzip -c >osmo-sip-connector-1.1.1.35-0241.tar.gz make[2]: Leaving directory ' if test -d "osmo-sip-connector-1.1.1.35-0241"; then find "osmo-sip-connector-1.1.1.35-0241" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-sip-connector-1.1.1.35-0241" || { sleep 5 && rm -rf "osmo-sip-connector-1.1.1.35-0241"; }; else :; fi make[1]: Leaving directory ' make[1]: Entering directory ' Making distclean in src make[2]: Entering directory ' test -z "osmo-sip-connector" || rm -f osmo-sip-connector rm -f *.o rm -f *.tab.c test -z "" || rm -f test . = "../../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[2]: Leaving directory ' Making distclean in tests make[2]: Entering directory ' test -z "" || rm -f test . = "../../../tests" || test -z "" || rm -f rm -f Makefile make[2]: Leaving directory ' Making distclean in contrib make[2]: Entering directory ' Making distclean in systemd make[3]: Entering directory ' test -z "" || rm -f test . = "../../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' test -z "" || rm -f test . = "../../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' Making distclean in doc make[2]: Entering directory ' Making distclean in examples make[3]: Entering directory ' test -z "" || rm -f test . = "../../../../doc/examples" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory ' Making distclean in manuals make[3]: Entering directory ' test -z "" || rm -f test . = "../../../../doc/manuals" || test -z "" || rm -f rm -rf osmosipconnector-usermanual__*.png osmosipconnector-usermanual__*.svg osmosipconnector-usermanual.check osmosipconnector-usermanual.pdf osmosipconnector-usermanual.html osmosipconnector-vty-reference.pdf osmosipconnector-vty-reference.lint generated common build rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' test -z "" || rm -f test . = "../../../doc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' make[2]: Entering directory ' test -z "" || rm -f test . = "../.." || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory ' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory ' if test -d "osmo-sip-connector-1.1.1.35-0241"; then find "osmo-sip-connector-1.1.1.35-0241" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-sip-connector-1.1.1.35-0241" || { sleep 5 && rm -rf "osmo-sip-connector-1.1.1.35-0241"; }; else :; fi ================================================================== osmo-sip-connector-1.1.1.35-0241 archives ready for distribution: osmo-sip-connector-1.1.1.35-0241.tar.gz osmo-sip-connector-1.1.1.35-0241.tar.bz2 ================================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C publish make: Entering directory ' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile= -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] :25: recipe for target 'publish' failed make: *** [publish] Error 255 make: Leaving directory ' Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 13:08:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 13:08:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-hlr_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1666?= Message-ID: <1876381503.1062.1544015301114.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Oliver Smith] contrib/jenkins.sh: build and publish manuals ------------------------------------------ [...truncated 362.47 KB...] make[4]: Leaving directory ' make[3]: Leaving directory ' (cd tests && make top_distdir=../osmo-hlr-0.2.1.82-4b8b distdir=../osmo-hlr-0.2.1.82-4b8b/tests \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory ' (cd auc && make top_distdir=../../osmo-hlr-0.2.1.82-4b8b distdir=../../osmo-hlr-0.2.1.82-4b8b/tests/auc \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' (cd gen_ts_55_205_test_sets && make top_distdir=../../../osmo-hlr-0.2.1.82-4b8b distdir=../../../osmo-hlr-0.2.1.82-4b8b/tests/auc/gen_ts_55_205_test_sets \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[5]: Entering directory ' make[5]: Leaving directory ' make[4]: Leaving directory ' (cd gsup_server && make top_distdir=../../osmo-hlr-0.2.1.82-4b8b distdir=../../osmo-hlr-0.2.1.82-4b8b/tests/gsup_server \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' (cd db && make top_distdir=../../osmo-hlr-0.2.1.82-4b8b distdir=../../osmo-hlr-0.2.1.82-4b8b/tests/db \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' (cd gsup && make top_distdir=../../osmo-hlr-0.2.1.82-4b8b distdir=../../osmo-hlr-0.2.1.82-4b8b/tests/gsup \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make \ top_distdir="osmo-hlr-0.2.1.82-4b8b" distdir="osmo-hlr-0.2.1.82-4b8b" \ dist-hook make[3]: Entering directory ' echo 0.2.1.82-4b8b > osmo-hlr-0.2.1.82-4b8b/.tarball-version make[3]: Leaving directory ' test -n "" \ || find "osmo-hlr-0.2.1.82-4b8b" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec /bin/bash -c -m a+r {} {} \; \ || chmod -R a+r "osmo-hlr-0.2.1.82-4b8b" tardir=osmo-hlr-0.2.1.82-4b8b && ${TAR-tar} chof - "$tardir" | BZIP2=${BZIP2--9} bzip2 -c >osmo-hlr-0.2.1.82-4b8b.tar.bz2 make[2]: Leaving directory ' if test -d "osmo-hlr-0.2.1.82-4b8b"; then find "osmo-hlr-0.2.1.82-4b8b" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-hlr-0.2.1.82-4b8b" || { sleep 5 && rm -rf "osmo-hlr-0.2.1.82-4b8b"; }; else :; fi make[1]: Leaving directory ' make[1]: Entering directory ' Making distclean in doc make[2]: Entering directory ' Making distclean in examples make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../doc/examples" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory ' Making distclean in manuals make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../doc/manuals" || test -z "" || rm -f rm -rf osmohlr-usermanual__*.png osmohlr-usermanual__*.svg osmohlr-usermanual.check osmohlr-usermanual.pdf osmohlr-usermanual.html osmohlr-vty-reference.pdf osmohlr-vty-reference.lint generated common build rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../doc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' Making distclean in src make[2]: Entering directory ' Making distclean in gsupclient make[3]: Entering directory ' test -z "libosmo-gsup-client.la" || rm -f libosmo-gsup-client.la rm -f ./so_locations rm -rf .libs _libs rm -f gsup-test-client rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../src/gsupclient" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -f osmo-hlr osmo-hlr-db-tool osmo-euse-demo test -z "db_bootstrap.h " || rm -f db_bootstrap.h rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -rf ./.deps rm -f Makefile make[2]: Leaving directory ' Making distclean in include make[2]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[2]: Leaving directory ' Making distclean in sql make[2]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../sql" || test -z "" || rm -f rm -f Makefile make[2]: Leaving directory ' Making distclean in contrib make[2]: Entering directory ' Making distclean in systemd make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' Making distclean in tests make[2]: Entering directory ' Making distclean in auc make[3]: Entering directory ' Making distclean in gen_ts_55_205_test_sets make[4]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../../tests/auc/gen_ts_55_205_test_sets" || test -z "" || rm -f rm -f Makefile make[4]: Leaving directory ' make[4]: Entering directory ' rm -f auc_ts_55_205_test_sets rm -rf .libs _libs rm -f auc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/auc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory ' rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' Making distclean in gsup_server make[3]: Entering directory ' rm -rf .libs _libs rm -f gsup_server_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/gsup_server" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' Making distclean in db make[3]: Entering directory ' rm -f db_test rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/db" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' Making distclean in gsup make[3]: Entering directory ' rm -rf .libs _libs rm -f gsup_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/gsup" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs test ! -f '../../../tests/testsuite' || \ /bin/bash '../../../tests/testsuite' --clean rm -f *.lo test -z "" || rm -f test . = "../../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' make[2]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "libosmo-gsup-client.pc" || rm -f libosmo-gsup-client.pc test . = "../.." || test -z "" || rm -f rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory ' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory ' if test -d "osmo-hlr-0.2.1.82-4b8b"; then find "osmo-hlr-0.2.1.82-4b8b" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-hlr-0.2.1.82-4b8b" || { sleep 5 && rm -rf "osmo-hlr-0.2.1.82-4b8b"; }; else :; fi ======================================================== osmo-hlr-0.2.1.82-4b8b archives ready for distribution: osmo-hlr-0.2.1.82-4b8b.tar.bz2 ======================================================== + [ 1 = 1 ] + [ 1 = 1 ] + make -C publish make: Entering directory ' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile= -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] :25: recipe for target 'publish' failed make: *** [publish] Error 255 make: Leaving directory ' Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 13:08:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 13:08:30 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-libosmo-sccp_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1886?= Message-ID: <1702881735.1063.1544015311009.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Oliver Smith] contrib/jenkins.sh: build and publish manuals ------------------------------------------ [...truncated 759.58 KB...] rm -f Makefile make[4]: Leaving directory ' make[4]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory ' rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' Making distclean in src make[2]: Entering directory ' test -z "libosmo-sigtran.la" || rm -f libosmo-sigtran.la rm -f ./so_locations rm -rf .libs _libs test -z "libsccp.a libmtp.a libxua.a" || rm -f libsccp.a libmtp.a libxua.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[2]: Leaving directory ' Making distclean in tests make[2]: Entering directory ' Making distclean in xua make[3]: Entering directory ' rm -rf .libs _libs rm -f xua_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/xua" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' Making distclean in sccp make[3]: Entering directory ' rm -rf .libs _libs rm -f sccp_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/sccp" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' Making distclean in mtp make[3]: Entering directory ' rm -rf .libs _libs rm -f mtp_parse_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/mtp" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' Making distclean in m2ua make[3]: Entering directory ' rm -rf .libs _libs rm -f m2ua_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/m2ua" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' Making distclean in ss7 make[3]: Entering directory ' rm -rf .libs _libs rm -f ss7_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/ss7" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' Making distclean in vty make[3]: Entering directory ' rm -rf .libs _libs rm -f ss7_asp_vty_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/vty" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs test ! -f '../../../tests/testsuite' || \ /bin/bash '../../../tests/testsuite' --clean rm -f *.lo test -z "" || rm -f test . = "../../../tests" || test -z "" || rm -f test -z "atconfig" || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' Making distclean in examples make[2]: Entering directory ' rm -rf .libs _libs rm -f sccp_demo_user rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../examples" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[2]: Leaving directory ' Making distclean in stp make[2]: Entering directory ' rm -f osmo-stp rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../stp" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[2]: Leaving directory ' Making distclean in doc make[2]: Entering directory ' Making distclean in examples make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../doc/examples" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory ' Making distclean in manuals make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../doc/manuals" || test -z "" || rm -f rm -rf osmostp-usermanual__*.png osmostp-usermanual__*.svg osmostp-usermanual.check osmostp-usermanual.pdf osmostp-usermanual.html osmostp-vty-reference.pdf osmostp-vty-reference.lint generated common build rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../doc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' Making distclean in contrib make[2]: Entering directory ' Making distclean in systemd make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' make[2]: Entering directory ' rm -rf .libs _libs test -z "doc/sigtran/html/search/* doc/sigtran/{html,latex}/* doc/html.tar doc/doxygen_sqlite3.db doc/sigtran/doxygen_sqlite3.db doc/*.tag" || rm -f doc/sigtran/html/search/* doc/sigtran/{html,latex}/* doc/html.tar doc/doxygen_sqlite3.db doc/sigtran/doxygen_sqlite3.db doc/*.tag rm: cannot remove 'doc/sigtran/html/search': Is a directory Makefile:819: recipe for target 'mostlyclean-generic' failed make[2]: [mostlyclean-generic] Error 1 (ignored) rm -f *.lo test -z "libosmo-sigtran.pc libosmo-sccp.pc libosmo-mtp.pc libosmo-xua.pc Doxyfile" || rm -f libosmo-sigtran.pc libosmo-sccp.pc libosmo-mtp.pc libosmo-xua.pc Doxyfile test . = "../.." || test -z "" || rm -f rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory ' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory ' if test -d "libosmo-sccp-0.10.0.41-3979"; then find "libosmo-sccp-0.10.0.41-3979" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "libosmo-sccp-0.10.0.41-3979" || { sleep 5 && rm -rf "libosmo-sccp-0.10.0.41-3979"; }; else :; fi ============================================================= libosmo-sccp-0.10.0.41-3979 archives ready for distribution: libosmo-sccp-0.10.0.41-3979.tar.gz libosmo-sccp-0.10.0.41-3979.tar.bz2 ============================================================= + [ 1 = 1 ] + [ 1 = 1 ] + make -C publish make: Entering directory ' # out-of-tree building: use a symlink to the output file like done in # the non-check build above, so the relative include paths work the # same. if ! [ -f osmostp-usermanual.adoc ]; then \ ln -s osmostp-usermanual.adoc osmostp-usermanual.adoc; \ fi asciidoc -v -f -f -f -f -a srcdir='.' osmostp-usermanual.adoc > osmostp-usermanual.check 2>&1 # Make absolutely sure that the %.check target is updated. touch osmostp-usermanual.check # Do print the WARNING output but return error if any was found # (grep -v would omit the WARNING output from the log). mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile= -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] :25: recipe for target 'publish' failed make: *** [publish] Error 255 make: Leaving directory ' Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 13:08:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 13:08:35 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu?= =?UTF-8?Q?_=C2=BB_master,osmocom-master-debian9,none,False_#1039?= In-Reply-To: <1119465684.1054.1544009095519.JavaMail.jenkins@jenkins.osmocom.org> References: <1119465684.1054.1544009095519.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <972374366.1064.1544015315927.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Dec 5 13:08:59 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 13:08:59 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-mgw_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1871?= Message-ID: <659682937.1065.1544015339629.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Oliver Smith] contrib/jenkins.sh: build and publish manuals ------------------------------------------ [...truncated 325.80 KB...] am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp_client' make[4]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp_client' (cd mgcp && make top_distdir=../../osmo-mgw-1.4.0.81-68023 distdir=../../osmo-mgw-1.4.0.81-68023/tests/mgcp \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp' make[4]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp' make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests' (cd contrib && make top_distdir=../osmo-mgw-1.4.0.81-68023 distdir=../osmo-mgw-1.4.0.81-68023/contrib \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib' (cd systemd && make top_distdir=../../osmo-mgw-1.4.0.81-68023 distdir=../../osmo-mgw-1.4.0.81-68023/contrib/systemd \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib/systemd' make[4]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib/systemd' make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib' make \ top_distdir="osmo-mgw-1.4.0.81-68023" distdir="osmo-mgw-1.4.0.81-68023" \ dist-hook make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build' echo 1.4.0.81-68023 > osmo-mgw-1.4.0.81-68023/.tarball-version make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build' test -n "" \ || find "osmo-mgw-1.4.0.81-68023" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec /bin/bash /build/osmo-mgw-1.4.0.81-68023/install-sh -c -m a+r {} {} \; \ || chmod -R a+r "osmo-mgw-1.4.0.81-68023" tardir=osmo-mgw-1.4.0.81-68023 && ${TAR-tar} chof - "$tardir" | BZIP2=${BZIP2--9} bzip2 -c >osmo-mgw-1.4.0.81-68023.tar.bz2 tardir=osmo-mgw-1.4.0.81-68023 && ${TAR-tar} chof - "$tardir" | GZIP=--best gzip -c >osmo-mgw-1.4.0.81-68023.tar.gz make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build' if test -d "osmo-mgw-1.4.0.81-68023"; then find "osmo-mgw-1.4.0.81-68023" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-mgw-1.4.0.81-68023" || { sleep 5 && rm -rf "osmo-mgw-1.4.0.81-68023"; }; else :; fi make[1]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build' make[1]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build' Making distclean in doc make[2]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc' Making distclean in examples make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc/examples' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../doc/examples" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc/examples' Making distclean in manuals make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc/manuals' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../doc/manuals" || test -z "" || rm -f rm -rf osmomgw-usermanual__*.png osmomgw-usermanual__*.svg osmomgw-usermanual.check osmomgw-usermanual.pdf osmomgw-usermanual.html osmomgw-vty-reference.pdf osmomgw-vty-reference.lint generated common build rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc/manuals' make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../doc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc' rm -f Makefile make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc' Making distclean in include make[2]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/include' Making distclean in osmocom make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom' Making distclean in mgcp_client make[4]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom/mgcp_client' test -z "mgcp_common.h" || rm -f mgcp_common.h rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/mgcp_client" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom/mgcp_client' Making distclean in mgcp make[4]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom/mgcp' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/mgcp" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom/mgcp' make[4]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom' make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/src' Making distclean in libosmo-mgcp-client make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/src/libosmo-mgcp-client' test -z "libosmo-mgcp-client.la " || rm -f libosmo-mgcp-client.la rm -f ./so_locations rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libosmo-mgcp-client" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/src/libosmo-mgcp-client' Making distclean in libosmo-mgcp make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/src/libosmo-mgcp' rm -rf .libs _libs test -z "libosmo-mgcp.a " || rm -f libosmo-mgcp.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libosmo-mgcp" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/src/libosmo-mgcp' Making distclean in osmo-mgw make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/src/osmo-mgw' rm -f osmo-mgw rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-mgw" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/src/osmo-mgw' make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests' Making distclean in mgcp_client make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp_client' rm -rf .libs _libs rm -f mgcp_client_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/mgcp_client" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp_client' Making distclean in mgcp make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp' rm -rf .libs _libs rm -f mgcp_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/mgcp" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp' make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib' make[2]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build' rm -rf .libs _libs rm -f *.lo test -z "libosmo-mgcp-client.pc" || rm -f libosmo-mgcp-client.pc test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build' if test -d "osmo-mgw-1.4.0.81-68023"; then find "osmo-mgw-1.4.0.81-68023" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-mgw-1.4.0.81-68023" || { sleep 5 && rm -rf "osmo-mgw-1.4.0.81-68023"; }; else :; fi ========================================================= osmo-mgw-1.4.0.81-68023 archives ready for distribution: osmo-mgw-1.4.0.81-68023.tar.gz osmo-mgw-1.4.0.81-68023.tar.bz2 ========================================================= + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 13:10:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 13:10:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-ggsn_=C2=BB_--disab?= =?UTF-8?Q?le-gtp-linux,1,default,osmocom-master-debian9_#1191?= Message-ID: <1086012670.1066.1544015421194.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 280.72 KB...] make[3]: Leaving directory ' (cd sgsnemu && make top_distdir=../osmo-ggsn-1.2.2.43-33c5 distdir=../osmo-ggsn-1.2.2.43-33c5/sgsnemu \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory ' make[3]: Leaving directory ' (cd doc && make top_distdir=../osmo-ggsn-1.2.2.43-33c5 distdir=../osmo-ggsn-1.2.2.43-33c5/doc \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory ' (cd examples && make top_distdir=../../osmo-ggsn-1.2.2.43-33c5 distdir=../../osmo-ggsn-1.2.2.43-33c5/doc/examples \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make \ top_distdir="../../osmo-ggsn-1.2.2.43-33c5" distdir="../../osmo-ggsn-1.2.2.43-33c5/doc/examples" \ dist-hook make[5]: Entering directory ' for f in $(find ../../../../doc/examples -name '*.cfg*' | sed -e 's,^../../../../doc/examples,,'); do \ j="../../osmo-ggsn-1.2.2.43-33c5/doc/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ../../../../doc/examples/$f $j; \ done make[5]: Leaving directory ' make[4]: Leaving directory ' (cd manuals && make top_distdir=../../osmo-ggsn-1.2.2.43-33c5 distdir=../../osmo-ggsn-1.2.2.43-33c5/doc/manuals \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' (cd contrib && make top_distdir=../osmo-ggsn-1.2.2.43-33c5 distdir=../osmo-ggsn-1.2.2.43-33c5/contrib \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory ' (cd systemd && make top_distdir=../../osmo-ggsn-1.2.2.43-33c5 distdir=../../osmo-ggsn-1.2.2.43-33c5/contrib/systemd \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' (cd tests && make top_distdir=../osmo-ggsn-1.2.2.43-33c5 distdir=../osmo-ggsn-1.2.2.43-33c5/tests \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory ' (cd lib && make top_distdir=../../osmo-ggsn-1.2.2.43-33c5 distdir=../../osmo-ggsn-1.2.2.43-33c5/tests/lib \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' (cd gtp && make top_distdir=../../osmo-ggsn-1.2.2.43-33c5 distdir=../../osmo-ggsn-1.2.2.43-33c5/tests/gtp \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make \ top_distdir="osmo-ggsn-1.2.2.43-33c5" distdir="osmo-ggsn-1.2.2.43-33c5" \ dist-hook make[3]: Entering directory ' echo 1.2.2.43-33c5 > osmo-ggsn-1.2.2.43-33c5/.tarball-version make[3]: Leaving directory ' test -n "" \ || find "osmo-ggsn-1.2.2.43-33c5" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec /bin/bash -c -m a+r {} {} \; \ || chmod -R a+r "osmo-ggsn-1.2.2.43-33c5" tardir=osmo-ggsn-1.2.2.43-33c5 && ${TAR-tar} chof - "$tardir" | GZIP=--best gzip -c >osmo-ggsn-1.2.2.43-33c5.tar.gz make[2]: Leaving directory ' if test -d "osmo-ggsn-1.2.2.43-33c5"; then find "osmo-ggsn-1.2.2.43-33c5" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-ggsn-1.2.2.43-33c5" || { sleep 5 && rm -rf "osmo-ggsn-1.2.2.43-33c5"; }; else :; fi make[1]: Leaving directory ' make[1]: Entering directory ' Making distclean in lib make[2]: Entering directory ' rm -rf .libs _libs test -z "libmisc.a" || rm -f libmisc.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "getopt.h" || rm -f getopt.h test . = "../../../lib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[2]: Leaving directory ' Making distclean in gtp make[2]: Entering directory ' test -z "libgtp.la" || rm -f libgtp.la rm -f ./so_locations rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../gtp" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[2]: Leaving directory ' Making distclean in ggsn make[2]: Entering directory ' rm -f osmo-ggsn rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../ggsn" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[2]: Leaving directory ' Making distclean in sgsnemu make[2]: Entering directory ' rm -f sgsnemu rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../sgsnemu" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[2]: Leaving directory ' Making distclean in doc make[2]: Entering directory ' Making distclean in examples make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../doc/examples" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory ' Making distclean in manuals make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../doc/manuals" || test -z "" || rm -f rm -rf osmoggsn-usermanual__*.png osmoggsn-usermanual__*.svg osmoggsn-usermanual.check osmoggsn-usermanual.pdf osmoggsn-usermanual.html osmoggsn-vty-reference.pdf osmoggsn-vty-reference.lint generated common build rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../doc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' Making distclean in contrib make[2]: Entering directory ' Making distclean in systemd make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' Making distclean in tests make[2]: Entering directory ' Making distclean in lib make[3]: Entering directory ' rm -rf .libs _libs rm -f ippool_test in46a_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/lib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' Making distclean in gtp make[3]: Entering directory ' rm -rf .libs _libs rm -f gtpie_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/gtp" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs test ! -f '../../../tests/testsuite' || /bin/bash '../../../tests/testsuite' --clean rm -f *.lo test -z "" || rm -f test . = "../../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' make[2]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "intl/Makefile po/Makefile libgtp.pc osmo-ggsn.spec" || rm -f intl/Makefile po/Makefile libgtp.pc osmo-ggsn.spec test . = "../.." || test -z "" || rm -f rm -f config.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory ' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory ' if test -d "osmo-ggsn-1.2.2.43-33c5"; then find "osmo-ggsn-1.2.2.43-33c5" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-ggsn-1.2.2.43-33c5" || { sleep 5 && rm -rf "osmo-ggsn-1.2.2.43-33c5"; }; else :; fi ========================================================= osmo-ggsn-1.2.2.43-33c5 archives ready for distribution: osmo-ggsn-1.2.2.43-33c5.tar.gz ========================================================= + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C publish make: Entering directory ' # out-of-tree building: use a symlink to the output file like done in # the non-check build above, so the relative include paths work the # same. if ! [ -f osmoggsn-usermanual.adoc ]; then \ ln -s osmoggsn-usermanual.adoc osmoggsn-usermanual.adoc; \ fi asciidoc -v -f -f -f -f -a srcdir='.' osmoggsn-usermanual.adoc > osmoggsn-usermanual.check 2>&1 # Make absolutely sure that the %.check target is updated. touch osmoggsn-usermanual.check # Do print the WARNING output but return error if any was found # (grep -v would omit the WARNING output from the log). mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile= -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] :25: recipe for target 'publish' failed make: *** [publish] Error 255 make: Leaving directory ' Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 13:11:38 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 13:11:38 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--d?= =?UTF-8?Q?isable-iu,1,default,osmocom-master-debian9_#7249?= Message-ID: <922491589.1067.1544015498937.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 462.88 KB...] test -z "" || rm -f test . = "../../../doc/examples" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/doc/examples' Making distclean in manuals make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/doc/manuals' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../doc/manuals" || test -z "" || rm -f rm -rf osmosgsn-usermanual__*.png osmosgsn-usermanual__*.svg osmosgsn-usermanual.check osmosgsn-usermanual.pdf osmosgsn-usermanual.html osmosgsn-vty-reference.pdf osmosgsn-vty-reference.lint generated common build rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/doc/manuals' make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/doc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../doc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/doc' rm -f Makefile make[2]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/doc' Making distclean in include make[2]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/include' Making distclean in osmocom make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/include/osmocom' Making distclean in sgsn make[4]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/include/osmocom/sgsn' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/sgsn" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/include/osmocom/sgsn' make[4]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/include/osmocom' make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/src' Making distclean in gprs make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/src/gprs' rm -f osmo-gbproxy osmo-sgsn osmo-gtphub rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/gprs" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/src/gprs' make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/src' Making distclean in contrib make[2]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/contrib' Making distclean in tests make[2]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests' Making distclean in gprs make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/gprs' rm -rf .libs _libs rm -f gprs_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gprs" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/gprs' Making distclean in gbproxy make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/gbproxy' rm -rf .libs _libs rm -f gbproxy_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gbproxy" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/gbproxy' Making distclean in gtphub make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/gtphub' rm -rf .libs _libs rm -f gtphub_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gtphub" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/gtphub' Making distclean in sgsn make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/sgsn' rm -rf .libs _libs rm -f sgsn_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/sgsn" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/sgsn' Making distclean in xid make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/xid' rm -rf .libs _libs rm -f xid_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/xid" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/xid' Making distclean in sndcp_xid make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/sndcp_xid' rm -rf .libs _libs rm -f sndcp_xid_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/sndcp_xid" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/sndcp_xid' Making distclean in slhc make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/slhc' rm -rf .libs _libs rm -f slhc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/slhc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/slhc' Making distclean in v42bis make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/v42bis' rm -rf .libs _libs rm -f v42bis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/v42bis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests/v42bis' make[3]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build/tests' make[2]: Entering directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build' rm -rf .libs _libs rm -f *.lo test -z "osmo-sgsn.pc" || rm -f osmo-sgsn.pc test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-sgsn-1.3.0.112-b5ed0/_build' if test -d "osmo-sgsn-1.3.0.112-b5ed0"; then find "osmo-sgsn-1.3.0.112-b5ed0" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-sgsn-1.3.0.112-b5ed0" || { sleep 5 && rm -rf "osmo-sgsn-1.3.0.112-b5ed0"; }; else :; fi =========================================================== osmo-sgsn-1.3.0.112-b5ed0 archives ready for distribution: osmo-sgsn-1.3.0.112-b5ed0.tar.gz osmo-sgsn-1.3.0.112-b5ed0.tar.bz2 =========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] make: *** [publish] Error 255 /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 13:11:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 13:11:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--?= =?UTF-8?Q?with-sse,1,default,osmocom-master-debian9_#718?= Message-ID: <607573455.1068.1544015507398.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 155.65 KB...] ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' Making all in device make[3]: Entering directory ' Making all in usrp1 make[4]: Entering directory ' CXX USRPDevice.lo CXXLD libdevice.la ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' Making all in uhd make[4]: Entering directory ' CXX UHDDevice.lo CXXLD libdevice.la ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' Making all in lms make[4]: Entering directory ' CXX LMSDevice.lo CXXLD libdevice.la ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' CXX radioInterface.lo CXX radioVector.lo CXX radioClock.lo CXX radioBuffer.lo CXX signalVector.lo CXX sigProcLib.lo CXX ChannelizerBase.lo CXX Transceiver.lo CXX Channelizer.lo CXX Synthesis.lo CXX Resampler.lo CXX radioInterfaceResamp.lo CXX radioInterfaceMulti.lo CXX osmo_trx_uhd-osmo-trx.o CXX osmo_trx_usrp1-osmo-trx.o CXX osmo_trx_lms-osmo-trx.o CXXLD libtransceiver_common.la ar: `u' modifier ignored since `D' is the default (see `U') CXXLD osmo-trx-uhd CXXLD osmo-trx-lms CXXLD osmo-trx-usrp1 make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in contrib make[2]: Entering directory ' Making all in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' Making all in CommonLibs make[3]: Entering directory ' CXX BitVectorTest.o CXX InterthreadTest.o CXX PRBSTest.o CXX SocketsTest.o CXX TimevalTest.o CXX LogTest.o CXX VectorTest.o CXXLD LogTest CXXLD TimevalTest CXXLD BitVectorTest CXXLD PRBSTest CXXLD SocketsTest CXXLD VectorTest CXXLD InterthreadTest make[3]: Leaving directory ' Making all in Transceiver52M make[3]: Entering directory ' CC convolve_test-convolve_test.o CCLD convolve_test make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + make check Making check in doc make[1]: Entering directory ' Making check in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in manuals make[2]: Entering directory ' # out-of-tree building: use a symlink to the output file like done in # the non-check build above, so the relative include paths work the # same. if ! [ -f osmotrx-usermanual.adoc ]; then \ ln -s osmotrx-usermanual.adoc osmotrx-usermanual.adoc; \ fi asciidoc -v -f -f -f -f -a srcdir='.' osmotrx-usermanual.adoc > osmotrx-usermanual.check 2>&1 # Make absolutely sure that the %.check target is updated. touch osmotrx-usermanual.check # Do print the WARNING output but return error if any was found # (grep -v would omit the WARNING output from the log). make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making check in CommonLibs make[1]: Entering directory ' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory ' Making check in GSM make[1]: Entering directory ' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory ' Making check in Transceiver52M make[1]: Entering directory ' Making check in arch make[2]: Entering directory ' Making check in common make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in x86 make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making check in device make[2]: Entering directory ' Making check in usrp1 make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in uhd make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in lms make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making check in contrib make[1]: Entering directory ' Making check in systemd make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making check in tests make[1]: Entering directory ' Making check in CommonLibs make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in Transceiver52M make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' make[2]: Entering directory ' make check-local make[3]: Entering directory ' :;{ \ echo '# Signature of the current package.' && \ echo 'm4_define([AT_PACKAGE_NAME],' && \ echo ' [osmo-trx])' && \ echo 'm4_define([AT_PACKAGE_TARNAME],' && \ echo ' [osmo-trx])' && \ echo 'm4_define([AT_PACKAGE_VERSION],' && \ echo ' [0.4.0.104-522c])' && \ echo 'm4_define([AT_PACKAGE_STRING],' && \ echo ' [osmo-trx 0.4.0.104-522c])' && \ echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ echo ' [openbsc at lists.osmocom.org])'; \ echo 'm4_define([AT_PACKAGE_URL],' && \ echo ' [])'; \ } >'./package.m4' /bin/bash ../missing --run autom4te --language=autotest -I '.' -o testsuite.tmp testsuite.at mv testsuite.tmp testsuite /bin/bash './testsuite' ## ----------------------------------- ## ## osmo-trx 0.4.0.104-522c test suite. ## ## ----------------------------------- ## Regression tests. 1: BitVectorTest ok 2: InterthreadTest ok 3: LogTest ok 4: PRBSTest ok 5: SocketsTest ok 6: TimevalTest ok 7: VectorTest ok 8: convolve_test skipped (testsuite.at:50) ## ------------- ## ## Test results. ## ## ------------- ## 7 tests were successful. 1 test was skipped. make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' + [ 1 = 1 ] + [ 1 = 1 ] + make -C publish make: Entering directory ' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile= -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] :25: recipe for target 'publish' failed make: *** [publish] Error 255 make: Leaving directory ' Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 13:15:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 13:15:00 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--di?= =?UTF-8?Q?sable-iu,1,default,osmocom-master-debian9_#7253?= Message-ID: <2009637059.1069.1544015700598.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 960.97 KB...] make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/tests' make \ top_distdir="osmo-msc-1.2.0.122-42a6c" distdir="osmo-msc-1.2.0.122-42a6c" \ dist-hook make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build' echo 1.2.0.122-42a6c > osmo-msc-1.2.0.122-42a6c/.tarball-version make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build' test -n "" \ || find "osmo-msc-1.2.0.122-42a6c" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec /bin/bash /build/osmo-msc-1.2.0.122-42a6c/install-sh -c -m a+r {} {} \; \ || chmod -R a+r "osmo-msc-1.2.0.122-42a6c" tardir=osmo-msc-1.2.0.122-42a6c && ${TAR-tar} chof - "$tardir" | BZIP2=${BZIP2--9} bzip2 -c >osmo-msc-1.2.0.122-42a6c.tar.bz2 tardir=osmo-msc-1.2.0.122-42a6c && ${TAR-tar} chof - "$tardir" | GZIP=--best gzip -c >osmo-msc-1.2.0.122-42a6c.tar.gz make[2]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build' if test -d "osmo-msc-1.2.0.122-42a6c"; then find "osmo-msc-1.2.0.122-42a6c" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-msc-1.2.0.122-42a6c" || { sleep 5 && rm -rf "osmo-msc-1.2.0.122-42a6c"; }; else :; fi make[1]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build' make[1]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build' Making distclean in doc make[2]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/doc' Making distclean in examples make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/doc/examples' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../doc/examples" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/doc/examples' Making distclean in manuals make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/doc/manuals' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../doc/manuals" || test -z "" || rm -f rm -rf osmomsc-usermanual__*.png osmomsc-usermanual__*.svg osmomsc-usermanual.check osmomsc-usermanual.pdf osmomsc-usermanual.html osmomsc-vty-reference.pdf osmomsc-vty-reference.lint generated common build rm -f Makefile make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/doc/manuals' make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/doc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../doc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/doc' rm -f Makefile make[2]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/doc' Making distclean in include make[2]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/include' Making distclean in osmocom make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/include/osmocom' Making distclean in msc make[4]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/include/osmocom/msc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/msc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/include/osmocom/msc' make[4]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/include/osmocom' make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/src' Making distclean in libvlr make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/src/libvlr' rm -rf .libs _libs test -z "libvlr.a" || rm -f libvlr.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libvlr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/src/libvlr' Making distclean in libmsc make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/src/libmsc' rm -rf .libs _libs test -z "libmsc.a " || rm -f libmsc.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libmsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/src/libmsc' Making distclean in osmo-msc make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/src/osmo-msc' rm -f osmo-msc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-msc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/src/osmo-msc' Making distclean in utils make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/src/utils' rm -rf .libs _libs rm -f smpp_mirror rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/src/utils' make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/src' Making distclean in contrib make[2]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/contrib' Making distclean in tests make[2]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/tests' Making distclean in sms_queue make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/tests/sms_queue' rm -rf .libs _libs rm -f sms_queue_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/sms_queue" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/tests/sms_queue' Making distclean in msc_vlr make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/tests/msc_vlr' rm -rf .libs _libs rm -f msc_vlr_test_no_authen msc_vlr_test_gsm_authen msc_vlr_test_gsm_ciph msc_vlr_test_umts_authen msc_vlr_test_authen_reuse msc_vlr_test_hlr_reject msc_vlr_test_hlr_timeout msc_vlr_test_ms_timeout msc_vlr_test_reject_concurrency msc_vlr_test_call msc_vlr_test_rest msc_vlr_test_ss rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/msc_vlr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/tests/msc_vlr' Making distclean in smpp make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/tests/smpp' rm -rf .libs _libs rm -f smpp_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/smpp" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/tests/smpp' make[3]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build/tests' make[2]: Entering directory '/build/osmo-msc-1.2.0.122-42a6c/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-msc-1.2.0.122-42a6c/_build' if test -d "osmo-msc-1.2.0.122-42a6c"; then find "osmo-msc-1.2.0.122-42a6c" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-msc-1.2.0.122-42a6c" || { sleep 5 && rm -rf "osmo-msc-1.2.0.122-42a6c"; }; else :; fi ========================================================== osmo-msc-1.2.0.122-42a6c archives ready for distribution: osmo-msc-1.2.0.122-42a6c.tar.gz osmo-msc-1.2.0.122-42a6c.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:24:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 13:24:45 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix broken config override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12134 ) Change subject: ctrl2cgi: fix broken config override ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12134/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12134/1//COMMIT_MSG at 11 PS1, Line 11: command-line counterparts with default value were silently ignored. Good Catch, it took me a while to understand and see the issue. https://gerrit.osmocom.org/#/c/12134/1//COMMIT_MSG at 13 PS1, Line 13: Let's fix this by making config file values to be always preferred over I don't like this fixing approach, it makes no sense. I'd rather drop cmd line args and supporting only cfg file than having cfg file prcede cmdline. That's super non intuitive, goes against usual behavior of apps and the opposite the user expects. Best fix would be to remove "default" keyword from argparser and apply it manually if the value is None after applying the cfg option from cfg file. See https://docs.python.org/2/library/argparse.html#default if default keyword is not provided, then default=None, so that works easily with what we already have and what I propose. -- To view, visit https://gerrit.osmocom.org/12134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I471b5a6497eadce6456e835233fdaba88a593324 Gerrit-Change-Number: 12134 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 13:24:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:27:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 13:27:59 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: always log to stdout In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12135 ) Change subject: Trap handlers: always log to stdout ...................................................................... Patch Set 1: What if somebody else wishes to use it in another way? TBH I don't see any good benefit in dropping these lines, it's not like those are super intrusive... -- To view, visit https://gerrit.osmocom.org/12135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifcad1877d45d43b3a2e617775a1c9b256e190591 Gerrit-Change-Number: 12135 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 13:27:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:28:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 13:28:51 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: always log to stdout In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12135 ) Change subject: Trap handlers: always log to stdout ...................................................................... Patch Set 1: What about using stdout by default and leaving syslog to be enabled through a flag? -- To view, visit https://gerrit.osmocom.org/12135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifcad1877d45d43b3a2e617775a1c9b256e190591 Gerrit-Change-Number: 12135 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 13:28:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:30:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 13:30:58 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: always log to stdout In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12135 ) Change subject: Trap handlers: always log to stdout ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifcad1877d45d43b3a2e617775a1c9b256e190591 Gerrit-Change-Number: 12135 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 13:30:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 13:49:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 13:49:53 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: fix errors Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12136 Change subject: gerrit-verifications/master-builds: fix errors ...................................................................... gerrit-verifications/master-builds: fix errors Fix three errors that prevented Jenkins from accepting the new configs from Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee ("gerrit-verifications/master-builds: WITH_MANUALS"): * master-builds: fourth axis needs to be in the template or else the server will throw a 500 error. gerrit-verifications already has four template axes. * gerrit-verifications/osmo-pcu: || at the end of combination_filter * gerrit-verifications/osmo-sip-connector: missing ":" Change-Id: I4ad63a3167e59b0837ffd1576fb7c7cf2958ff32 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/36/12136/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 83f1c30..d17934d 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -204,7 +204,7 @@ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") || - (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1") || + (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1") - osmo-python-tests: repos_url: 'ssh://jenkins at gerrit.osmocom.org:29418/python/{repos}' @@ -233,7 +233,7 @@ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh - - osmo-sip-connector + - osmo-sip-connector: cmd: WITH_MANUALS=1 ./contrib/jenkins.sh - osmo-trx: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 4988062..1b7cdfd 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -14,6 +14,8 @@ a2: !!python/tuple [default] a3_name: a3 a3: !!python/tuple [default] + a4_name: a4 + a4: !!python/tuple [default] combination_filter: '' sequential: false # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs) @@ -408,6 +410,10 @@ type: user-defined name: '{obj:a3_name}' values: '{obj:a3}' + - axis: + type: user-defined + name: '{obj:a4_name}' + values: '{obj:a4}' scm: - git: -- To view, visit https://gerrit.osmocom.org/12136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4ad63a3167e59b0837ffd1576fb7c7cf2958ff32 Gerrit-Change-Number: 12136 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:03:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 14:03:51 +0000 Subject: Change in osmo-msc[master]: make: prepare for adding transcript tests In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12126 ) Change subject: make: prepare for adding transcript tests ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12126/1/tests/Makefile.am File tests/Makefile.am: https://gerrit.osmocom.org/#/c/12126/1/tests/Makefile.am at 73 PS1, Line 73: if [ -z "$(PYTHON)" ]; then echo "ERROR: python not configured, for manual invocation use 'make PYTHON=/usr/bin/python'"; exit 1; fi > More simple, since already contains a shebang (#!/usr/bin/env python2), let's drop the PYTHON thing [?] will do (interesting, I thought there were problems with python shebang on some systems so I figured maybe we added this. But we dropped freebsd support anyway.) https://gerrit.osmocom.org/#/c/12126/1/tests/Makefile.am at 84 PS1, Line 84: $(MAKE) ctrl-python-test > Cannot this be specified like this? [?] yes, but like above: # don't run vty and ctrl tests concurrently so that the ports don't conflict I can copy the comment around everywhere... -- To view, visit https://gerrit.osmocom.org/12126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 Gerrit-Change-Number: 12126 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 14:03:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:06:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 14:06:51 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: fix errors In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12136 ) Change subject: gerrit-verifications/master-builds: fix errors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ad63a3167e59b0837ffd1576fb7c7cf2958ff32 Gerrit-Change-Number: 12136 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 05 Dec 2018 14:06:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:07:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 14:07:57 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: run "make distcheck" In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12132 ) Change subject: jenkins.sh: run "make distcheck" ...................................................................... Patch Set 1: maybe in 'make distcheck', because that gets a separate set of configure flags? ah but that doesn't run binaries, does it -- To view, visit https://gerrit.osmocom.org/12132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d Gerrit-Change-Number: 12132 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 14:07:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:08:56 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 14:08:56 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: fix errors In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12136 ) Change subject: gerrit-verifications/master-builds: fix errors ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ad63a3167e59b0837ffd1576fb7c7cf2958ff32 Gerrit-Change-Number: 12136 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 05 Dec 2018 14:08:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:08:58 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 14:08:58 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: fix errors In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12136 ) Change subject: gerrit-verifications/master-builds: fix errors ...................................................................... gerrit-verifications/master-builds: fix errors Fix three errors that prevented Jenkins from accepting the new configs from Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee ("gerrit-verifications/master-builds: WITH_MANUALS"): * master-builds: fourth axis needs to be in the template or else the server will throw a 500 error. gerrit-verifications already has four template axes. * gerrit-verifications/osmo-pcu: || at the end of combination_filter * gerrit-verifications/osmo-sip-connector: missing ":" Change-Id: I4ad63a3167e59b0837ffd1576fb7c7cf2958ff32 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 8 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 83f1c30..d17934d 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -204,7 +204,7 @@ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") || - (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1") || + (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1") - osmo-python-tests: repos_url: 'ssh://jenkins at gerrit.osmocom.org:29418/python/{repos}' @@ -233,7 +233,7 @@ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh - - osmo-sip-connector + - osmo-sip-connector: cmd: WITH_MANUALS=1 ./contrib/jenkins.sh - osmo-trx: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 4988062..1b7cdfd 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -14,6 +14,8 @@ a2: !!python/tuple [default] a3_name: a3 a3: !!python/tuple [default] + a4_name: a4 + a4: !!python/tuple [default] combination_filter: '' sequential: false # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs) @@ -408,6 +410,10 @@ type: user-defined name: '{obj:a3_name}' values: '{obj:a3}' + - axis: + type: user-defined + name: '{obj:a4_name}' + values: '{obj:a4}' scm: - git: -- To view, visit https://gerrit.osmocom.org/12136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4ad63a3167e59b0837ffd1576fb7c7cf2958ff32 Gerrit-Change-Number: 12136 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:09:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Dec 2018 14:09:20 +0000 Subject: Change in osmo-bsc[master]: Add VTY option to avoid sending empty Full BCCH Info for disabled SI In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12133 ) Change subject: Add VTY option to avoid sending empty Full BCCH Info for disabled SI ...................................................................... Patch Set 1: Code-Review-1 (2 comments) Please see my comments. In addition to them, are you sure that this option is being printed by 'show running-config' and 'write'? https://gerrit.osmocom.org/#/c/12133/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12133/1//COMMIT_MSG at 27 PS1, Line 27: let's not disable this kind of mesage by : default Here you notice that it isn't enabled by default. https://gerrit.osmocom.org/#/c/12133/1/src/osmo-bsc/gsm_data.c File src/osmo-bsc/gsm_data.c: https://gerrit.osmocom.org/#/c/12133/1/src/osmo-bsc/gsm_data.c at 858 PS1, Line 858: bts->si_disabled_send_empty = true; So this option is enabled by default now, right? -- To view, visit https://gerrit.osmocom.org/12133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 Gerrit-Change-Number: 12133 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 05 Dec 2018 14:09:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:12:48 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Dec 2018 14:12:48 +0000 Subject: Change in osmo-bsc[master]: Add VTY option to avoid sending empty Full BCCH Info for disabled SI In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12133 ) Change subject: Add VTY option to avoid sending empty Full BCCH Info for disabled SI ...................................................................... Patch Set 1: Verified+1 Also, one person just confirmed that this patch makes nanoBTS work, but 'no system-information disabled-si-send-empty-bcch-info' looks confusing... Maybe we can use some better name? -- To view, visit https://gerrit.osmocom.org/12133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 Gerrit-Change-Number: 12133 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 05 Dec 2018 14:12:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:14:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 14:14:50 +0000 Subject: Change in osmo-msc[master]: make: prepare for adding transcript tests In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12126 ) Change subject: make: prepare for adding transcript tests ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12126/1/tests/Makefile.am File tests/Makefile.am: https://gerrit.osmocom.org/#/c/12126/1/tests/Makefile.am at 49 PS1, Line 49: $(MAKE) ctrl-test whoa, looks like I dropped the smpp_test_runner.py -- To view, visit https://gerrit.osmocom.org/12126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 Gerrit-Change-Number: 12126 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 14:14:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:15:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Dec 2018 14:15:26 +0000 Subject: Change in osmo-bsc[master]: Add VTY option to avoid sending empty Full BCCH Info for disabled SI In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12133 ) Change subject: Add VTY option to avoid sending empty Full BCCH Info for disabled SI ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12133/1/src/osmo-bsc/gsm_data.c File src/osmo-bsc/gsm_data.c: https://gerrit.osmocom.org/#/c/12133/1/src/osmo-bsc/gsm_data.c at 858 PS1, Line 858: bts->si_disabled_send_empty = true; > So this option is enabled by default now, right? Sorry, I was confused by the name... So, we send empty SI by default. Maybe we could just name it 'send_empty_si'? -- To view, visit https://gerrit.osmocom.org/12133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 Gerrit-Change-Number: 12133 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 05 Dec 2018 14:15:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:15:28 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 14:15:28 +0000 Subject: Change in osmo-ci[master]: master-builds: set PUBLISH=0 temporarily Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12137 Change subject: master-builds: set PUBLISH=0 temporarily ...................................................................... master-builds: set PUBLISH=0 temporarily Disable uploading PDFs, as the SSH keys of some Jenkins bots are not whitelisted for uploading yet. They get a permission denied error and this is currently failing builds on master. Related: OS#3385 Change-Id: I946f2e17229d3c602bbe79a72cc37104745ea552 --- M jobs/master-builds.yml 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/37/12137/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 1b7cdfd..e331c9a 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -84,7 +84,7 @@ master-osmo-iuh, master-osmo-msc, master-osmo-sgsn - cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=0 ./contrib/jenkins.sh - libosmocore: a1_name: arch @@ -198,7 +198,7 @@ (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") || (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") - cmd: 'PUBLISH=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' + cmd: 'PUBLISH=0 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP @@ -208,7 +208,7 @@ combination_filter: > (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") || (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1") - cmd: PUBLISH=1 ./contrib/jenkins.sh + cmd: PUBLISH=0 ./contrib/jenkins.sh trigger: master-osmo-sgsn - osmo-gmr: @@ -221,7 +221,7 @@ ./contrib/jenkins.sh - osmo-hlr: - cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=0 ./contrib/jenkins.sh - osmo-iuh: # Full triggers would be: @@ -243,7 +243,7 @@ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e WITH_MANUALS="1" \ - -e PUBLISH="1" \ + -e PUBLISH="0" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ @@ -273,7 +273,7 @@ -e WITH_MANUALS="$WITH_MANUALS" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ - -e PUBLISH="1" \ + -e PUBLISH="0" \ -w /build -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ @@ -303,7 +303,7 @@ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") || (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1") - cmd: PUBLISH=1 ./contrib/jenkins.sh + cmd: PUBLISH=0 ./contrib/jenkins.sh - osmo-sgsn: a1_name: IU @@ -324,7 +324,7 @@ -e WITH_MANUALS="$WITH_MANUALS" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ - -e PUBLISH="1" \ + -e PUBLISH="0" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ @@ -332,7 +332,7 @@ - osmo-sip-connector: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org holger at freyther.de - cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + cmd: WITH_MANUALS=1 PUBLISH=0 ./contrib/jenkins.sh - osmo-tetra: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org 246tnt at gmail.com @@ -347,7 +347,7 @@ concurrent: true combination_filter: > (INSTR == "--with-sse" && WITH_MANUALS == "1") - cmd: PUBLISH=1 ./contrib/jenkins.sh + cmd: PUBLISH=0 ./contrib/jenkins.sh - osmocom-bb - osmo-sysmon -- To view, visit https://gerrit.osmocom.org/12137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I946f2e17229d3c602bbe79a72cc37104745ea552 Gerrit-Change-Number: 12137 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:20:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 14:20:17 +0000 Subject: Change in osmo-msc[master]: make: prepare for adding transcript tests In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12126 to look at the new patch set (#2). Change subject: make: prepare for adding transcript tests ...................................................................... make: prepare for adding transcript tests Separate 'make python-test' into separate make targets, to sensibly add VTY transcript tests in an upcoming commit. Feature: even though ./configure was called without --enable-external-tests, each of the {ctrl,vty}x{python,transcript} tests can be invoked individually by e.g. 'make vty-python-test'. A peculiarity is that we use AM_PYTHON_PATH to figure out the 'python' command to invoke as $(PYTHON), but it is empty when not configured with --enable-external-tests. In that case, explain to the user that passing 'PYTHON=python' as make argument still allows running the tests. We could always invoke AM_PYTHON_PATH, but that's not really needed. Both 'vty-transcript-test' and 'ctrl-transcript-test' are still empty, a subsequent patch adds a vty-transcript-test. All of this in preparation of tweaking the 'mncc' vty configuration, to be able to track it in a vty transcript test. Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 --- M tests/Makefile.am 1 file changed, 41 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/12126/2 -- To view, visit https://gerrit.osmocom.org/12126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 Gerrit-Change-Number: 12126 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:20:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 14:20:17 +0000 Subject: Change in osmo-msc[master]: add test_nodes.vty transcript test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12127 to look at the new patch set (#2). Change subject: add test_nodes.vty transcript test ...................................................................... add test_nodes.vty transcript test Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 124 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/27/12127/2 -- To view, visit https://gerrit.osmocom.org/12127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 Gerrit-Change-Number: 12127 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:20:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 14:20:19 +0000 Subject: Change in osmo-msc[master]: python tests: use py shebang instead of $(PYTHON) Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12138 Change subject: python tests: use py shebang instead of $(PYTHON) ...................................................................... python tests: use py shebang instead of $(PYTHON) I'm going to make the external tests manually launchable. For that I first had an error message if $(PYTHON) was empty. But Pau says I should just use shebang instead and ignore the autoconf python stuff, since that often fails anyway. Change-Id: Ie35dd78c42577109a6a3143221a9769e47d361a5 --- M tests/Makefile.am M tests/ctrl_test_runner.py M tests/smpp_test_runner.py M tests/vty_test_runner.py 4 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/12138/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index c225afa..f6b33fc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -46,10 +46,10 @@ python-tests: $(BUILT_SOURCES) osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - $(PYTHON) $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v - $(PYTHON) $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v + $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v + $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v if BUILD_SMPP - $(PYTHON) $(srcdir)/smpp_test_runner.py -w $(abs_top_builddir) -v + $(srcdir)/smpp_test_runner.py -w $(abs_top_builddir) -v endif rm -f $(top_builddir)/sms.db else diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py old mode 100644 new mode 100755 diff --git a/tests/smpp_test_runner.py b/tests/smpp_test_runner.py old mode 100644 new mode 100755 diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py old mode 100644 new mode 100755 -- To view, visit https://gerrit.osmocom.org/12138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie35dd78c42577109a6a3143221a9769e47d361a5 Gerrit-Change-Number: 12138 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:23:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 14:23:16 +0000 Subject: Change in osmo-msc[master]: msc_main: mncc: move mncc socket decision to after read_cfg In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12129 ) Change subject: msc_main: mncc: move mncc socket decision to after read_cfg ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12129/1/src/osmo-msc/msc_main.c File src/osmo-msc/msc_main.c: https://gerrit.osmocom.org/#/c/12129/1/src/osmo-msc/msc_main.c at 549 PS1, Line 549: * At first use the internal MNCC by default, may be changed later according to cfg or cmdline option. */ > Please define better "later". [?] ah of course -- To view, visit https://gerrit.osmocom.org/12129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 Gerrit-Change-Number: 12129 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 14:23:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:26:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 14:26:19 +0000 Subject: Change in osmo-msc[master]: msc_main: mncc: move mncc socket decision to after read_cfg In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12129 to look at the new patch set (#3). Change subject: msc_main: mncc: move mncc socket decision to after read_cfg ...................................................................... msc_main: mncc: move mncc socket decision to after read_cfg First step towards allowing to configure the MNCC socket path by config file. Rationale: see I2ec59d5eba407f83295528b51b93678d446b9cee Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 --- M src/osmo-msc/msc_main.c 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/12129/3 -- To view, visit https://gerrit.osmocom.org/12129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 Gerrit-Change-Number: 12129 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 14:27:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 14:27:22 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-iuh_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#2595?= Message-ID: <1251190668.1070.1544020042452.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 123.79 KB...] libtool: install: /usr/bin/install -c .libs/libosmoctrl.so.0.3.0T libtool: install: (cd && { ln -s -f libosmoctrl.so.0.3.0 libosmoctrl.so.0 || { rm -f libosmoctrl.so.0 && ln -s libosmoctrl.so.0.3.0 libosmoctrl.so.0; }; }) libtool: install: (cd && { ln -s -f libosmoctrl.so.0.3.0 libosmoctrl.so || { rm -f libosmoctrl.so && ln -s libosmoctrl.so.0.3.0 libosmoctrl.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmoctrl.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/sim make[2]: Entering directory ' CC core.lo CC reader.lo CC class_tables.lo CC reader_pcsc.lo CC card_fs_usim.lo CC card_fs_isim.lo CC card_fs_sim.lo CC card_fs_uicc.lo CC card_fs_tetra.lo CCLD libosmosim.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmosim.la ' libtool: warning: relinking 'libosmosim.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 0:2:0 -o libosmosim.la -rpath core.lo reader.lo reader_pcsc.lo class_tables.lo card_fs_sim.lo card_fs_usim.lo card_fs_uicc.lo card_fs_isim.lo card_fs_tetra.lo ../../src/libosmocore.la ../../src/gsm/libosmogsm.la -ltalloc -lpcsclite ) libtool: install: /usr/bin/install -c .libs/libosmosim.so.0.0.2T libtool: install: (cd && { ln -s -f libosmosim.so.0.0.2 libosmosim.so.0 || { rm -f libosmosim.so.0 && ln -s libosmosim.so.0.0.2 libosmosim.so.0; }; }) libtool: install: (cd && { ln -s -f libosmosim.so.0.0.2 libosmosim.so || { rm -f libosmosim.so && ln -s libosmosim.so.0.0.2 libosmosim.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmosim.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/pseudotalloc make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in utils make[2]: Entering directory ' CC osmo-arfcn.o CC osmo-auc-gen.o CC osmo_config_merge-osmo-config-merge.o CC osmo_sim_test-osmo-sim-test.o CCLD osmo-arfcn CCLD osmo-config-merge CCLD osmo-auc-gen CCLD osmo-sim-test make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-arfcn osmo-auc-gen osmo-config-merge ' libtool: install: /usr/bin/install -c .libs/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen libtool: install: /usr/bin/install -c .libs/osmo-config-merge make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c osmo-release.sh ' /usr/bin/install -c -m 644 libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc ' /usr/bin/install -c -m 644 osmo-release.mk ' make install-data-hook make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-hook'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmocore + osmo-build-dep.sh libosmo-abis =============================== libosmo-abis =============================== + mkdir -p + cd + osmo-deps.sh libosmo-abis + project=libosmo-abis + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmo-abis + git clone git://git.osmocom.org/libosmo-abis libosmo-abis Cloning into 'libosmo-abis'... + cd libosmo-abis + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD Your branch is up-to-date with 'origin/master'. + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master Note: checking out 'origin/master'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b HEAD is now at de5758d... osmo_ortp: Log domain and fix strings without endl char + git rev-parse HEAD de5758d307f6794b4126c6cf5251a5c5a8b9f193 + cd libosmo-abis + mkdir -p + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, '.'. libtoolize: copying file './ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'. libtoolize: copying file 'm4/libtool.m4' libtoolize: copying file 'm4/ltoptions.m4' libtoolize: copying file 'm4/ltsugar.m4' libtoolize: copying file 'm4/ltversion.m4' libtoolize: copying file 'm4/lt~obsolete.m4' configure.ac:20: installing './compile' configure.ac:22: installing './config.guess' configure.ac:22: installing './config.sub' configure.ac:8: installing './install-sh' configure.ac:8: installing './missing' src/Makefile.am: installing './depcomp' + ./configure --prefix= --with-systemdsystemunitdir= configure: WARNING: unrecognized options: --with-systemdsystemunitdir checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... ./configure: line 3431: cannot create temp file for here-document: No space left on device checking whether we are cross compiling... configure: error: in `: configure: error: cannot run C compiled programs. If you meant to cross compile, use `--host'. See `config.log' for more details sort: fflush failed: 'standard output': No space left on device sort: write error ./configure: line 54: echo: write error: No space left on device ./configure: line 75: printf: write error: No space left on device ./configure: line 76: echo: write error: No space left on device cat: write error: No space left on device ./configure: line 78: echo: write error: No space left on device ./configure: line 82: printf: write error: No space left on device Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 14:27:50 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 14:27:50 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4378?= Message-ID: <617489772.1071.1544020070294.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-bsc" build number 4378 originally caused by: Started by upstream project "master-libosmo-sccp" build number 1887 originally caused by: Started by user Oliver Smith Building remotely on build2-deb9build-ansible (ttcn3 osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace Cloning the remote Git repository Cloning repository git://git.osmocom.org/osmo-bsc > git init # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-bsc > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-bsc +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url git://git.osmocom.org/osmo-bsc # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url git://git.osmocom.org/osmo-bsc # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-bsc > git fetch --tags --progress git://git.osmocom.org/osmo-bsc +refs/heads/*:refs/remotes/origin/* Checking out Revision ab9a259cd2e5f0d188ebfecdb2a271e8c0dba94b (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f ab9a259cd2e5f0d188ebfecdb2a271e8c0dba94b Commit message: "contrib/jenkins.sh: build and publish manuals" First time build. Skipping changelog. [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins8998976724133794624.sh + docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE=-j 8 -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -e WITH_MANUALS=1 -e PUBLISH=1 -w /build -i -u build -v :/build -v /home/osmocom-build/bin:/build_bin -v /home/osmocom-build/.ssh:/home/build/.ssh:ro osmocom:amd64 /build/contrib/jenkins.sh + base=/build + deps=/build/deps + inst=/build/deps/install + export deps inst + osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf + [ -d /build/deps ] + [ -d layer1-headers ] + mkdir /build/deps + osmo-build-dep.sh libosmocore '' '--disable-doxygen --enable-gnutls' + mkdir -p /build/deps =============================== libosmocore =============================== + cd /build/deps + osmo-deps.sh libosmocore + project=libosmocore + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmocore + git clone git://git.osmocom.org/libosmocore libosmocore Cloning into 'libosmocore'... + cd libosmocore + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD Your branch is up-to-date with 'origin/master'. + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master Note: checking out 'origin/master'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b new_branch_name HEAD is now at 14f24c6... LCLS: update osmo_lcls struct + git rev-parse HEAD 14f24c678f122576849eb400c8e64f7f4f403f3f + cd libosmocore + mkdir -p /build/deps/install/stow + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:8: installing './install-sh' configure.ac:8: installing './missing' src/Makefile.am: installing './depcomp' + ./configure --prefix=/build/deps/install/stow/libosmocore --with-systemdsystemunitdir=/build/deps/install/stow/libosmocore/lib/systemd/system --disable-doxygen --enable-gnutls configure: WARNING: unrecognized options: --with-systemdsystemunitdir checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... ./configure: line 3662: cannot create temp file for here-document: No space left on device sed: can't read conftest.c: No such file or directory configure: error: in `/build/deps/libosmocore': configure: error: cannot compute suffix of object files: cannot compile See `config.log' for more details sort: fflush failed: standard output: No space left on device sort: write error ./configure: line 54: echo: write error: No space left on device ./configure: line 75: printf: write error: No space left on device ./configure: line 76: echo: write error: No space left on device cat: write error: No space left on device ./configure: line 78: echo: write error: No space left on device ./configure: line 82: printf: write error: No space left on device Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 14:27:57 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 14:27:57 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7250?= Message-ID: <1774758261.1072.1544020077667.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-sgsn" build number 7250 originally caused by: Started by upstream project "master-libosmo-sccp" build number 1887 originally caused by: Started by user Oliver Smith Building remotely on build2-deb9build-ansible (ttcn3 osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to build2-deb9build-ansible at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1071) at hudson.FilePath.act(FilePath.java:1060) at hudson.FilePath.mkdirs(FilePath.java:1245) at hudson.model.AbstractProject.checkout(AbstractProject.java:1202) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) java.nio.file.FileSystemException: /home/osmocom-build/jenkins/workspace/master-osmo-sgsn/IU/--disable-iu/WITH_MANUALS: No space left on device at sun.nio.fs.UnixException.translateToIOException(UnixException.java:91) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:102) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:107) at sun.nio.fs.UnixFileSystemProvider.createDirectory(UnixFileSystemProvider.java:384) at java.nio.file.Files.createDirectory(Files.java:674) at java.nio.file.Files.createAndCheckIsDirectory(Files.java:781) at java.nio.file.Files.createDirectories(Files.java:767) at hudson.FilePath.mkdirs(FilePath.java:3272) at hudson.FilePath.access$1300(FilePath.java:212) at hudson.FilePath$Mkdirs.invoke(FilePath.java:1253) at hudson.FilePath$Mkdirs.invoke(FilePath.java:1249) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:3085) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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) Retrying after 10 seconds Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to build2-deb9build-ansible at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1071) at hudson.FilePath.act(FilePath.java:1060) at hudson.FilePath.mkdirs(FilePath.java:1245) at hudson.model.AbstractProject.checkout(AbstractProject.java:1202) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) java.nio.file.FileSystemException: /home/osmocom-build/jenkins/workspace/master-osmo-sgsn/IU/--disable-iu/WITH_MANUALS: No space left on device at sun.nio.fs.UnixException.translateToIOException(UnixException.java:91) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:102) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:107) at sun.nio.fs.UnixFileSystemProvider.createDirectory(UnixFileSystemProvider.java:384) at java.nio.file.Files.createDirectory(Files.java:674) at java.nio.file.Files.createAndCheckIsDirectory(Files.java:781) at java.nio.file.Files.createDirectories(Files.java:767) at hudson.FilePath.mkdirs(FilePath.java:3272) at hudson.FilePath.access$1300(FilePath.java:212) at hudson.FilePath$Mkdirs.invoke(FilePath.java:1253) at hudson.FilePath$Mkdirs.invoke(FilePath.java:1249) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:3085) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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) Retrying after 10 seconds Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to build2-deb9build-ansible at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1071) at hudson.FilePath.act(FilePath.java:1060) at hudson.FilePath.mkdirs(FilePath.java:1245) at hudson.model.AbstractProject.checkout(AbstractProject.java:1202) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) java.nio.file.FileSystemException: /home/osmocom-build/jenkins/workspace/master-osmo-sgsn/IU/--disable-iu/WITH_MANUALS: No space left on device at sun.nio.fs.UnixException.translateToIOException(UnixException.java:91) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:102) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:107) at sun.nio.fs.UnixFileSystemProvider.createDirectory(UnixFileSystemProvider.java:384) at java.nio.file.Files.createDirectory(Files.java:674) at java.nio.file.Files.createAndCheckIsDirectory(Files.java:781) at java.nio.file.Files.createDirectories(Files.java:767) at hudson.FilePath.mkdirs(FilePath.java:3272) at hudson.FilePath.access$1300(FilePath.java:212) at hudson.FilePath$Mkdirs.invoke(FilePath.java:1253) at hudson.FilePath$Mkdirs.invoke(FilePath.java:1249) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:3085) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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) Retrying after 10 seconds Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to build2-deb9build-ansible at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1071) at hudson.FilePath.act(FilePath.java:1060) at hudson.FilePath.mkdirs(FilePath.java:1245) at hudson.model.AbstractProject.checkout(AbstractProject.java:1202) 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:1815) at hudson.matrix.MatrixRun.run(MatrixRun.java:146) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) java.nio.file.FileSystemException: /home/osmocom-build/jenkins/workspace/master-osmo-sgsn/IU/--disable-iu/WITH_MANUALS: No space left on device at sun.nio.fs.UnixException.translateToIOException(UnixException.java:91) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:102) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:107) at sun.nio.fs.UnixFileSystemProvider.createDirectory(UnixFileSystemProvider.java:384) at java.nio.file.Files.createDirectory(Files.java:674) at java.nio.file.Files.createAndCheckIsDirectory(Files.java:781) at java.nio.file.Files.createDirectories(Files.java:767) at hudson.FilePath.mkdirs(FilePath.java:3272) at hudson.FilePath.access$1300(FilePath.java:212) at hudson.FilePath$Mkdirs.invoke(FilePath.java:1253) at hudson.FilePath$Mkdirs.invoke(FilePath.java:1249) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:3085) at hudson.remoting.UserRequest.perform(UserRequest.java:212) 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) [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 14:28:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 14:28:03 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7254?= Message-ID: <1803962329.1073.1544020083357.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-msc" build number 7254 originally caused by: Started by upstream project "master-libosmo-sccp" build number 1887 originally caused by: Started by user Oliver Smith Building remotely on build2-deb9build-ansible (ttcn3 osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace Cloning the remote Git repository Cloning repository git://git.osmocom.org/osmo-msc > git init # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-msc > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-msc +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url git://git.osmocom.org/osmo-msc # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-msc > git fetch --tags --progress git://git.osmocom.org/osmo-msc +refs/heads/*:refs/remotes/origin/* Checking out Revision 42a6c3924c6e0b726abfe970f9d56f0702a75831 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 42a6c3924c6e0b726abfe970f9d56f0702a75831 Commit message: "contrib/jenkins.sh: build and publish manuals" First time build. Skipping changelog. [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins4046510630090615548.sh + ARTIFACT_STORE=/home/osmocom-build/jenkins_build_artifact_store + mkdir -p /home/osmocom-build/jenkins_build_artifact_store + docker run --rm=true -i -e HOME=/build -e ARTIFACT_STORE=/artifact_store -e JOB_NAME=master-osmo-msc/IU=--disable-iu,WITH_MANUALS=1,a3=default,a4=default,label=osmocom-master-debian9 -e MAKE=make -e PARALLEL_MAKE=-j 8 -e IU=--disable-iu -e WITH_MANUALS=1 -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -e PUBLISH=0 -w /build -u build -v :/build -v /home/osmocom-build/bin:/build_bin -v /home/osmocom-build/jenkins_build_artifact_store:/artifact_store -v /home/osmocom-build/.ssh:/home/build/.ssh:ro osmocom:amd64 /build/contrib/jenkins.sh + base=/build + deps=/build/deps + inst=/build/deps/install + export deps inst + osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf + [ -d /build/deps ] + [ -d layer1-headers ] + mkdir /build/deps + osmo-build-dep.sh libosmocore '' ac_cv_path_DOXYGEN=false + mkdir -p /build/deps =============================== libosmocore =============================== + cd /build/deps + osmo-deps.sh libosmocore + project=libosmocore + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmocore + git clone git://git.osmocom.org/libosmocore libosmocore Cloning into 'libosmocore'... + cd libosmocore + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD Your branch is up-to-date with 'origin/master'. + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master Note: checking out 'origin/master'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b new_branch_name HEAD is now at 14f24c6... LCLS: update osmo_lcls struct + git rev-parse HEAD 14f24c678f122576849eb400c8e64f7f4f403f3f + cd libosmocore + mkdir -p /build/deps/install/stow + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' autom4te: cannot create /tmp/arEmPZbZ/am4t7946.628: No space left on device at /usr/bin/autom4te line 969. aclocal: error: echo failed with exit status: 28 autoreconf: aclocal failed with exit status: 28 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:44:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 14:44:00 +0000 Subject: Change in osmo-ci[master]: master-builds: set PUBLISH=0 temporarily In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12137 ) Change subject: master-builds: set PUBLISH=0 temporarily ...................................................................... Patch Set 1: Code-Review-1 Let's rather fix those jenkins bots. -- To view, visit https://gerrit.osmocom.org/12137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I946f2e17229d3c602bbe79a72cc37104745ea552 Gerrit-Change-Number: 12137 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 14:44:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:46:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 14:46:51 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: run "make distcheck" In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12132 ) Change subject: jenkins.sh: run "make distcheck" ...................................................................... Patch Set 1: > maybe in 'make distcheck', because that gets a separate set of > configure flags? ah but that doesn't run binaries, does it Yes that's probably the issue. It build the binaries without --enable-sanitize, but the libs it uses were built with --enable-sanitize. It does build the test binaries and executes them (that's why it's called distCHECK). -- To view, visit https://gerrit.osmocom.org/12132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d Gerrit-Change-Number: 12132 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 14:46:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:48:47 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 14:48:47 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: properly limit number of requests Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12139 Change subject: ctrl2cgi: properly limit number of requests ...................................................................... ctrl2cgi: properly limit number of requests Manual acquire()/release() of semaphore does not limit number of concurrent requests when combined with explicit yield. Fix this by using semaphore.run() and removing inilineCallbacks decorator. Change-Id: I47b8b9f5b726ca0905bb7c023d63b325c7f7d85f Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/39/12139/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 1d90ee0..676fc11 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -60,6 +60,12 @@ #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res +def make_async_req(dst, par, f_write, f_log): + d = post(dst, par) + d.addCallback(collect, partial(handle_reply, f_write, f_log)) # treq's collect helper is handy to get all reply content at once + d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, par['bsc_id'], dst))) # handle HTTP errors + return d + class Trap(CTRL): """ TRAP handler (agnostic to factory's client object) @@ -93,7 +99,6 @@ self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.addr_ctrl, self.factory.port_ctrl)) super(CTRL, self).connectionMade() - @defer.inlineCallbacks def handle_locationstate(self, net, bsc, bts, trx, data): """ Handle location-state TRAP: parse trap content, build CGI Request and use treq's routines to post it while setting up async handlers @@ -101,13 +106,8 @@ params = make_params(bsc, data) self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) params['h'] = gen_hash(params, self.factory.secret_key) - d = post(self.factory.location, params) - d.addCallback(collect, partial(handle_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once - d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors # Ensure that we run only limited number of requests in parallel: - yield self.factory.semaphore.acquire() - yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit - self.factory.semaphore.release() + self.factory.semaphore.run(make_async_req, self.factory.location, params, self.transport.write, self.factory.log) def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): """ @@ -121,7 +121,6 @@ Store CGI information so TRAP handler can use it for requests """ def __init__(self, proto, log): - self.semaphore = defer.DeferredSemaphore(self.num_max_conn) self.log = log level = self.log.getEffectiveLevel() self.log.setLevel(logging.WARNING) # we do not need excessive debug from lower levels @@ -155,6 +154,8 @@ T.num_max_conn = config['main'].getint('num_max_conn', T.num_max_conn) T.secret_key = config['main'].get('secret_key', T.secret_key) + T.semaphore = defer.DeferredSemaphore(T.num_max_conn) + log.info("CGI proxy v%s starting with PID %d:" % (__version__, os.getpid())) log.info("destination %s (concurrency %d)" % (T.location, T.num_max_conn)) log.info("connecting to %s:%d..." % (T.addr_ctrl, T.port_ctrl)) -- To view, visit https://gerrit.osmocom.org/12139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I47b8b9f5b726ca0905bb7c023d63b325c7f7d85f Gerrit-Change-Number: 12139 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:50:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 14:50:42 +0000 Subject: Change in osmo-msc[master]: make: prepare for adding transcript tests In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12126 ) Change subject: make: prepare for adding transcript tests ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12126/1/tests/Makefile.am File tests/Makefile.am: https://gerrit.osmocom.org/#/c/12126/1/tests/Makefile.am at 73 PS1, Line 73: if [ -z "$(PYTHON)" ]; then echo "ERROR: python not configured, for manual invocation use 'make PYTHON=/usr/bin/python'"; exit 1; fi > will do (interesting, I thought there were problems with python shebang on some systems so I figured [?] just make sure that if python 2 is to be used, the shebang contains "python2" and not "python", that's all. https://gerrit.osmocom.org/#/c/12126/1/tests/Makefile.am at 84 PS1, Line 84: $(MAKE) ctrl-python-test > yes, but like above: [?] Please do, otherwise somebody may end up changing it. -- To view, visit https://gerrit.osmocom.org/12126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 Gerrit-Change-Number: 12126 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 14:50:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:53:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 14:53:21 +0000 Subject: Change in osmo-msc[master]: python tests: use py shebang instead of $(PYTHON) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12138 ) Change subject: python tests: use py shebang instead of $(PYTHON) ...................................................................... Patch Set 1: Code-Review+2 Test is failing though "conn refused" -- To view, visit https://gerrit.osmocom.org/12138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie35dd78c42577109a6a3143221a9769e47d361a5 Gerrit-Change-Number: 12138 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 14:53:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 14:55:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 14:55:39 +0000 Subject: Change in osmo-msc[master]: msc_main: mncc: move mncc socket decision to after read_cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12129 ) Change subject: msc_main: mncc: move mncc socket decision to after read_cfg ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 Gerrit-Change-Number: 12129 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 14:55:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:05:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 15:05:25 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: properly limit number of requests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12139 to look at the new patch set (#2). Change subject: ctrl2cgi: properly limit number of requests ...................................................................... ctrl2cgi: properly limit number of requests Manual acquire()/release() of semaphore does not limit number of concurrent requests when combined with explicit yield. Fix this by using semaphore.run() and removing inilineCallbacks decorator. Change-Id: I47b8b9f5b726ca0905bb7c023d63b325c7f7d85f Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/39/12139/2 -- To view, visit https://gerrit.osmocom.org/12139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I47b8b9f5b726ca0905bb7c023d63b325c7f7d85f Gerrit-Change-Number: 12139 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:05:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 15:05:54 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix broken config override In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12134 ) Change subject: ctrl2cgi: fix broken config override ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I471b5a6497eadce6456e835233fdaba88a593324 Gerrit-Change-Number: 12134 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 15:05:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 15:10:08 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 15:10:08 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#328?= Message-ID: <726040561.1074.1544022608449.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.50 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:10:37 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 15:10:37 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: add config file example Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12140 Change subject: ctrl2cgi: add config file example ...................................................................... ctrl2cgi: add config file example Change-Id: I1e5c37a75cf21184d5bd3ef01b452d45c8f6d7ac --- A doc/examples/ctrl2cgi.ini 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/40/12140/1 diff --git a/doc/examples/ctrl2cgi.ini b/doc/examples/ctrl2cgi.ini new file mode 100644 index 0000000..e1feebc --- /dev/null +++ b/doc/examples/ctrl2cgi.ini @@ -0,0 +1,5 @@ +[main] +#location = http://httpbin.org/post +location = http://172.16.1.13:8080/dummy_position_handler.cgi +secret_key = MegaSecretl000000l +num_max_conn = 4 -- To view, visit https://gerrit.osmocom.org/12140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1e5c37a75cf21184d5bd3ef01b452d45c8f6d7ac Gerrit-Change-Number: 12140 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:10:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 15:10:55 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: properly limit number of requests In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12139 ) Change subject: ctrl2cgi: properly limit number of requests ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/12139/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12139/1//COMMIT_MSG at 9 PS1, Line 9: Manual acquire()/release() of semaphore does not limit number of How did you arrive to this conclusion? https://gerrit.osmocom.org/#/c/12139/1/scripts/ctrl2cgi.py File scripts/ctrl2cgi.py: https://gerrit.osmocom.org/#/c/12139/1/scripts/ctrl2cgi.py at a104 PS1, Line 104: Could the issue be that the POST request is sent over here? Can you try moving these 3 lines inside the semaphore.acquire() and release() block? https://gerrit.osmocom.org/#/c/12139/1/scripts/ctrl2cgi.py at a108 PS1, Line 108: The API use looks good to me, according to https://twistedmatrix.com/documents/9.0.0/api/twisted.internet.defer.DeferredSemaphore.html -- To view, visit https://gerrit.osmocom.org/12139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47b8b9f5b726ca0905bb7c023d63b325c7f7d85f Gerrit-Change-Number: 12139 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 05 Dec 2018 15:10:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:11:42 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 15:11:42 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: run "make distcheck" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12132 to look at the new patch set (#2). Change subject: jenkins.sh: run "make distcheck" ...................................................................... jenkins.sh: run "make distcheck" Run distcheck in CI to be consistent with other Osmocom projects. Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/32/12132/2 -- To view, visit https://gerrit.osmocom.org/12132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d Gerrit-Change-Number: 12132 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:15:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 15:15:44 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix broken config override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12134 ) Change subject: ctrl2cgi: fix broken config override ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I471b5a6497eadce6456e835233fdaba88a593324 Gerrit-Change-Number: 12134 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 05 Dec 2018 15:15:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:18:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 15:18:35 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: run "make distcheck" In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12132 ) Change subject: jenkins.sh: run "make distcheck" ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12132/2/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/12132/2/contrib/jenkins.sh at 102 PS2, Line 102: DISTCHECK_CONFIGURE_FLAGS="--enable-sanitize $CONFIG" $MAKE distcheck \ Fine, but we should enabl all flags we enable in normal configure, otherwise we don't check all features can be built during distcheck. -- To view, visit https://gerrit.osmocom.org/12132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d Gerrit-Change-Number: 12132 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 15:18:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:20:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 15:20:40 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: properly limit number of requests In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12139 ) Change subject: ctrl2cgi: properly limit number of requests ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/12139/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12139/1//COMMIT_MSG at 9 PS1, Line 9: Manual acquire()/release() of semaphore does not limit number of > How did you arrive to this conclusion? That's the result of testing - see related ticket. https://gerrit.osmocom.org/#/c/12139/1/scripts/ctrl2cgi.py File scripts/ctrl2cgi.py: https://gerrit.osmocom.org/#/c/12139/1/scripts/ctrl2cgi.py at a104 PS1, Line 104: > Could the issue be that the POST request is sent over here? Can you try moving these 3 lines inside [?] No, because "post" returns deferred object, it does not issue any requests - see https://treq.readthedocs.io/en/release-17.8.0/api.html#module-treq https://gerrit.osmocom.org/#/c/12139/1/scripts/ctrl2cgi.py at a108 PS1, Line 108: > The API use looks good to me, according to [?] I think the code using run() is much simpler to read and reason about. -- To view, visit https://gerrit.osmocom.org/12139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47b8b9f5b726ca0905bb7c023d63b325c7f7d85f Gerrit-Change-Number: 12139 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 05 Dec 2018 15:20:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:26:42 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 15:26:42 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: run "make distcheck" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12132 to look at the new patch set (#3). Change subject: jenkins.sh: run "make distcheck" ...................................................................... jenkins.sh: run "make distcheck" Run distcheck in CI to be consistent with other Osmocom projects. Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d --- M contrib/jenkins.sh 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/32/12132/3 -- To view, visit https://gerrit.osmocom.org/12132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d Gerrit-Change-Number: 12132 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:27:12 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 15:27:12 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: run "make distcheck" In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12132 ) Change subject: jenkins.sh: run "make distcheck" ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12132/2/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/12132/2/contrib/jenkins.sh at 102 PS2, Line 102: DISTCHECK_CONFIGURE_FLAGS="--enable-sanitize $CONFIG" $MAKE distcheck \ > Fine, but we should enabl all flags we enable in normal configure, otherwise we don't check all feat [?] Updated. Like this? -- To view, visit https://gerrit.osmocom.org/12132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d Gerrit-Change-Number: 12132 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 15:27:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:35:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 15:35:44 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: run "make distcheck" In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12132 ) Change subject: jenkins.sh: run "make distcheck" ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d Gerrit-Change-Number: 12132 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Wed, 05 Dec 2018 15:35:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:38:31 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 15:38:31 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: run "make distcheck" In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12132 ) Change subject: jenkins.sh: run "make distcheck" ...................................................................... jenkins.sh: run "make distcheck" Run distcheck in CI to be consistent with other Osmocom projects. Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d --- M contrib/jenkins.sh 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 4523a5a..dedec81 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -78,11 +78,12 @@ export LD_LIBRARY_PATH="$inst/lib" export PATH="$inst/bin:$PATH" +CONFIG="--enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR" + # Additional configure options and depends -CONFIG="" if [ "$WITH_MANUALS" = "1" ]; then osmo-build-dep.sh osmo-gsm-manuals - CONFIG="--enable-manuals" + CONFIG="$CONFIG --enable-manuals" fi set +x @@ -95,10 +96,12 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR $CONFIG +./configure $CONFIG $MAKE $PARALLEL_MAKE $MAKE check \ || cat-testlogs.sh +DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck \ + || cat-testlogs.sh if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then make -C "$base/doc/manuals" publish -- To view, visit https://gerrit.osmocom.org/12132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7d3fa0fe12e13ca13d3330158425718e5c34d00d Gerrit-Change-Number: 12132 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:41:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 15:41:55 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: always log to stdout In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12135 ) Change subject: Trap handlers: always log to stdout ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifcad1877d45d43b3a2e617775a1c9b256e190591 Gerrit-Change-Number: 12135 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 05 Dec 2018 15:41:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:42:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 15:42:28 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: properly limit number of requests In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12139 ) Change subject: ctrl2cgi: properly limit number of requests ...................................................................... Patch Set 2: Code-Review+2 This fix doesn't make sense to me (I cannot explain how it fixes the issue), but if you say it fixes the issue, here we go. -- To view, visit https://gerrit.osmocom.org/12139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47b8b9f5b726ca0905bb7c023d63b325c7f7d85f Gerrit-Change-Number: 12139 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 05 Dec 2018 15:42:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:42:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 15:42:58 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: add config file example In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12140 ) Change subject: ctrl2cgi: add config file example ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1e5c37a75cf21184d5bd3ef01b452d45c8f6d7ac Gerrit-Change-Number: 12140 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 05 Dec 2018 15:42:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:43:10 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 15:43:10 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: always log to stdout In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12135 ) Change subject: Trap handlers: always log to stdout ...................................................................... Trap handlers: always log to stdout Since the scripts are intended to be used as systemd services, there's no need in separate logging via syslog: systemd will take care of properly collecting and storing script output. Hence we can drop extra options and function parameters. Change-Id: Ifcad1877d45d43b3a2e617775a1c9b256e190591 Related: SYS#4399 --- M contrib/systemd/osmo-ctrl2cgi.service M osmopy/trap_helper.py M scripts/ctrl2cgi.py M scripts/soap.py 4 files changed, 5 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/systemd/osmo-ctrl2cgi.service b/contrib/systemd/osmo-ctrl2cgi.service index 8563c66..f82e1e9 100644 --- a/contrib/systemd/osmo-ctrl2cgi.service +++ b/contrib/systemd/osmo-ctrl2cgi.service @@ -4,7 +4,7 @@ [Service] Type=simple Restart=always -ExecStart=/usr/bin/ctrl2cgi.py -o -d -c /etc/osmocom/ctrl2cgi.ini +ExecStart=/usr/bin/ctrl2cgi.py -d -c /etc/osmocom/ctrl2cgi.ini RestartSec=2 [Install] diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index d4a3b75..45dc527 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -95,7 +95,7 @@ sys.argv.remove(dbg2) os.execl(path, script, *sys.argv[1:]) -def debug_init(name, is_debug, output): +def debug_init(name, is_debug): """ Initialize signal handlers and logging """ @@ -104,9 +104,7 @@ log.setLevel(logging.DEBUG) else: log.setLevel(logging.INFO) - log.addHandler(logging.handlers.SysLogHandler('/dev/log')) - if output: - log.addHandler(logging.StreamHandler(sys.stdout)) + log.addHandler(logging.StreamHandler(sys.stdout)) reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with caller's add_argument() signal.signal(signal.SIGHUP, reboot) diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 1d6813d..0551520 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -148,13 +148,12 @@ p.add_argument('-p', '--port-ctrl', type=int, default=4250, help="Port to use for CTRL interface, defaults to 4250") p.add_argument('-n', '--num-max-conn', type=int, default=5, help="Max number of concurrent HTTP requests to CGI server") p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") # keep in sync with debug_init call below - p.add_argument('-o', '--output', action='store_true', help="Log to STDOUT in addition to SYSLOG") p.add_argument('-l', '--location', help="Location URL of the CGI server") p.add_argument('-s', '--secret-key', help="Secret key used to generate verification token") p.add_argument('-c', '--config-file', help="Path Config file. Cmd line args override values in config file") args = p.parse_args() - log = debug_init('CTRL2CGI', args.debug, args.output) + log = debug_init('CTRL2CGI', args.debug) location_cfgfile = None secret_key_cfgfile = None diff --git a/scripts/soap.py b/scripts/soap.py index 267b4d8..0534000 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -136,11 +136,10 @@ p.add_argument('-w', '--wsdl', required=True, help="WSDL URL for SOAP") p.add_argument('-n', '--num', type=int, default=5, help="Max number of concurrent HTTP requests to SOAP server") p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") # keep in sync with debug_init call below - p.add_argument('-o', '--output', action='store_true', help="Log to STDOUT in addition to SYSLOG") p.add_argument('-l', '--location', help="Override location found in WSDL file (don't use unless you know what you're doing)") args = p.parse_args() - log = debug_init('CTRL2SOAP', args.debug, args.output) + log = debug_init('CTRL2SOAP', args.debug) log.info("SOAP proxy %s starting with PID %d ..." % (__version__, os.getpid())) reactor.connectTCP(args.ctrl, args.port, TrapFactory(args.ctrl, args.port, Trap, defer.DeferredSemaphore(args.num), log, args.wsdl, args.location)) -- To view, visit https://gerrit.osmocom.org/12135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifcad1877d45d43b3a2e617775a1c9b256e190591 Gerrit-Change-Number: 12135 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:43:10 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 15:43:10 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix broken config override In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12134 ) Change subject: ctrl2cgi: fix broken config override ...................................................................... ctrl2cgi: fix broken config override Previously command-line arguments without defaults took precedence over config file variables while values from config file which had command-line counterparts with default value were silently ignored. Let's fix this by making config file option mandatory values and removing overlap between command-line and config file parameters. Change-Id: I471b5a6497eadce6456e835233fdaba88a593324 Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 20 insertions(+), 44 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 0551520..f694fd6 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.0.4" # bump this on every non-trivial change +__version__ = "0.0.5" # bump this on every non-trivial change import argparse, os, logging, logging.handlers import hashlib @@ -90,7 +90,7 @@ """ Logging wrapper, calling super() is necessary not to break reconnection logic """ - self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) + self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.addr_ctrl, self.factory.port_ctrl)) super(CTRL, self).connectionMade() @defer.inlineCallbacks @@ -120,61 +120,37 @@ """ Store CGI information so TRAP handler can use it for requests """ - location = None - log = None - semaphore = None - client = None - host = None - port = None - secret_key = None - def __init__(self, host, port, proto, semaphore, log, location, secret_key): - self.host = host # for logging only, - self.port = port # seems to be no way to get it from ReconnectingClientFactory + def __init__(self, proto, log): self.log = log - self.semaphore = semaphore - self.location = location - self.secret_key = secret_key level = self.log.getEffectiveLevel() self.log.setLevel(logging.WARNING) # we do not need excessive debug from lower levels super(TrapFactory, self).__init__(proto, self.log) self.log.setLevel(level) - self.log.debug("Using IPA %s, CGI server: %s" % (Ctrl.version, self.location)) + self.log.debug("Using Osmocom IPA library v%s" % Ctrl.version) if __name__ == '__main__': p = argparse.ArgumentParser(description='Proxy between given GCI service and Osmocom CTRL protocol.') p.add_argument('-v', '--version', action='version', version=("%(prog)s v" + __version__)) - p.add_argument('-a', '--addr-ctrl', default='localhost', help="Adress to use for CTRL interface, defaults to localhost") - p.add_argument('-p', '--port-ctrl', type=int, default=4250, help="Port to use for CTRL interface, defaults to 4250") - p.add_argument('-n', '--num-max-conn', type=int, default=5, help="Max number of concurrent HTTP requests to CGI server") p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") # keep in sync with debug_init call below - p.add_argument('-l', '--location', help="Location URL of the CGI server") - p.add_argument('-s', '--secret-key', help="Secret key used to generate verification token") - p.add_argument('-c', '--config-file', help="Path Config file. Cmd line args override values in config file") - args = p.parse_args() + p.add_argument('-c', '--config-file', required=True, help="Path to mandatory config file (in INI format).") + args = p.parse_args(namespace=TrapFactory) log = debug_init('CTRL2CGI', args.debug) - location_cfgfile = None - secret_key_cfgfile = None - port_ctrl_cfgfile = None - addr_ctrl_cfgfile = None - num_max_conn_cfgfile = None - if args.config_file: - config = configparser.ConfigParser() - config.read(args.config_file) - if 'main' in config: - location_cfgfile = config['main'].get('location', None) - secret_key_cfgfile = config['main'].get('secret_key', None) - addr_ctrl_cfgfile = config['main'].get('addr_ctrl', None) - port_ctrl_cfgfile = config['main'].get('port_ctrl', None) - num_max_conn_cfgfile = config['main'].get('num_max_conn', None) - location = args.location if args.location is not None else location_cfgfile - secret_key = args.secret_key if args.secret_key is not None else secret_key_cfgfile - addr_ctrl = args.addr_ctrl if args.addr_ctrl is not None else addr_ctrl_cfgfile - port_ctrl = args.port_ctrl if args.port_ctrl is not None else port_ctrl_cfgfile - num_max_conn = args.num_max_conn if args.num_max_conn is not None else num_max_conn_cfgfile + T = TrapFactory(Trap, log) - log.info("CGI proxy %s starting with PID %d ..." % (__version__, os.getpid())) - reactor.connectTCP(addr_ctrl, port_ctrl, TrapFactory(addr_ctrl, port_ctrl, Trap, defer.DeferredSemaphore(num_max_conn), log, location, secret_key)) + config = configparser.ConfigParser(interpolation=None) + config.read(args.config_file) + + T.addr_ctrl = config['main'].get('addr_ctrl', 'localhost') + T.port_ctrl = config['main'].getint('port_ctrl', 4250) + T.semaphore = defer.DeferredSemaphore(config['main'].getint('num_max_conn', 5)) + T.location = config['main'].get('location') + T.secret_key = config['main'].get('secret_key') + + log.info("CGI proxy v%s starting with PID %d:" % (__version__, os.getpid())) + log.info("destination %s (concurrency %d)" % (T.location, T.semaphore.limit)) + log.info("connecting to %s:%d..." % (T.addr_ctrl, T.port_ctrl)) + reactor.connectTCP(T.addr_ctrl, T.port_ctrl, T) reactor.run() -- To view, visit https://gerrit.osmocom.org/12134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I471b5a6497eadce6456e835233fdaba88a593324 Gerrit-Change-Number: 12134 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:46:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 15:46:25 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: properly limit number of requests In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12139 ) Change subject: ctrl2cgi: properly limit number of requests ...................................................................... ctrl2cgi: properly limit number of requests Manual acquire()/release() of semaphore does not limit number of concurrent requests when combined with explicit yield. Fix this by using semaphore.run() and removing inilineCallbacks decorator. Change-Id: I47b8b9f5b726ca0905bb7c023d63b325c7f7d85f Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index f694fd6..cd59209 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.0.5" # bump this on every non-trivial change +__version__ = "0.0.6" # bump this on every non-trivial change import argparse, os, logging, logging.handlers import hashlib @@ -60,6 +60,12 @@ #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res +def make_async_req(dst, par, f_write, f_log): + d = post(dst, par) + d.addCallback(collect, partial(handle_reply, f_write, f_log)) # treq's collect helper is handy to get all reply content at once + d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, par['bsc_id'], dst))) # handle HTTP errors + return d + class Trap(CTRL): """ TRAP handler (agnostic to factory's client object) @@ -93,7 +99,6 @@ self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.addr_ctrl, self.factory.port_ctrl)) super(CTRL, self).connectionMade() - @defer.inlineCallbacks def handle_locationstate(self, net, bsc, bts, trx, data): """ Handle location-state TRAP: parse trap content, build CGI Request and use treq's routines to post it while setting up async handlers @@ -101,13 +106,8 @@ params = make_params(bsc, data) self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) params['h'] = gen_hash(params, self.factory.secret_key) - d = post(self.factory.location, params) - d.addCallback(collect, partial(handle_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once - d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors # Ensure that we run only limited number of requests in parallel: - yield self.factory.semaphore.acquire() - yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit - self.factory.semaphore.release() + self.factory.semaphore.run(make_async_req, self.factory.location, params, self.transport.write, self.factory.log) def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): """ -- To view, visit https://gerrit.osmocom.org/12139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I47b8b9f5b726ca0905bb7c023d63b325c7f7d85f Gerrit-Change-Number: 12139 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:46:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 15:46:25 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: add config file example In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12140 ) Change subject: ctrl2cgi: add config file example ...................................................................... ctrl2cgi: add config file example Change-Id: I1e5c37a75cf21184d5bd3ef01b452d45c8f6d7ac --- A doc/examples/ctrl2cgi.ini 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/doc/examples/ctrl2cgi.ini b/doc/examples/ctrl2cgi.ini new file mode 100644 index 0000000..e1feebc --- /dev/null +++ b/doc/examples/ctrl2cgi.ini @@ -0,0 +1,5 @@ +[main] +#location = http://httpbin.org/post +location = http://172.16.1.13:8080/dummy_position_handler.cgi +secret_key = MegaSecretl000000l +num_max_conn = 4 -- To view, visit https://gerrit.osmocom.org/12140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1e5c37a75cf21184d5bd3ef01b452d45c8f6d7ac Gerrit-Change-Number: 12140 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:46:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 15:46:53 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 13: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12020/13/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/13/tests/gsm0808/gsm0808_test.c at 615 PS13, Line 615: if (p.net_len != g.net_len) I asked it already I think: if anything fails during test, abort or at least return in order to avoid printing lots of errors which don't make sense. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 13 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 15:46:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:48:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 15:48:58 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11954 ) Change subject: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan ...................................................................... Patch Set 8: Code-Review+2 ok then don't split it! -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 8 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 05 Dec 2018 15:48:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:52:00 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 5 Dec 2018 15:52:00 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add build-discarder Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12141 Change subject: jobs/ttcn3-testsuites.yml: add build-discarder ...................................................................... jobs/ttcn3-testsuites.yml: add build-discarder Add the same build discarder as we have in master-builds.yml. This should help with the disk space problems. Change-Id: Ib7f01751ca5f6fb3e29a436982e2891d9cab0488 --- M jobs/ttcn3-testsuites.yml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/41/12141/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index a5c5fe4..ba0ce2a 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -109,5 +109,10 @@ use-build-blocker: true blocking-jobs: - "^{job-name}.*" + - build-discarder: + days-to-keep: 30 + num-to-keep: 120 + artifact-days-to-keep: -1 + artifact-num-to-keep: -1 # vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/12141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7f01751ca5f6fb3e29a436982e2891d9cab0488 Gerrit-Change-Number: 12141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:52:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 15:52:50 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 6: Code-Review+1 i'm not sure whether the dynamic semantics are correct. I would +2 if you kept the previous behavior as default. But since you're using the new code by default, someone needs to approve because I don't fully know this stuff. Why are you changing the default behavior though? Another item on the list of things I don't like. -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 15:52:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:55:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 15:55:57 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 3: @laforge: now that it's here, ok to commit this? (pinging because this is starting to grow a beard) -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 15:55:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:57:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 15:57:39 +0000 Subject: Change in osmo-bsc[master]: Add VTY option to avoid sending empty Full BCCH Info for disabled SI In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12133 to look at the new patch set (#2). Change subject: Add VTY option to avoid sending empty Full BCCH Info for disabled SI ...................................................................... Add VTY option to avoid sending empty Full BCCH Info for disabled SI According to 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION: "If the Full BCCH information element is not included this indicates that transmission of the indicated SYSTEM INFORMATION message shall be stopped." However, some ipaccess nanoBTS firmware versions are known to not support some SI elements and also to dislike receiving BCCH Information for those SI, even if received with empty BCCH Information meaning they should not be used. Upon receival of this kind of message, nanoBTS sends a Failure Report with following text: Type=processing failure, Severity=critical failure, Probable cause=Manufacturer specific values: Fatal software error, Additional Text=l2_bch.c:1149 **** ** l2_bch.c#1149:BCHbcchSItypeValid( prim_p->infoType ) ** IPA_SW_FATAL_ERROR ** In task "TRX Proc:L2_BCH" @ (325). **** This kind of issue only appears with some fw versions, since it's known to work fine in other ones, so let's not disable this kind of mesage by default on all BTs of type "nanobts". Instead, add a VTY command that allows disabling this kind of message in order to be able to operate those nanoBTS units. Fixes: OS#3707 Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_data.c 4 files changed, 50 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/12133/2 -- To view, visit https://gerrit.osmocom.org/12133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 Gerrit-Change-Number: 12133 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:59:09 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 5 Dec 2018 15:59:09 +0000 Subject: Change in osmo-msc[master]: gsm_subscriber: make function msc_paging_request() static Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12142 Change subject: gsm_subscriber: make function msc_paging_request() static ...................................................................... gsm_subscriber: make function msc_paging_request() static The function msc_paging_request() is only called from within gsm_subscriber.c but never from outside. Lets make it static. Change-Id: I2efc8eac01a4dd8733118067eecf566c13062106 --- M src/libmsc/gsm_subscriber.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/12142/1 diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c index c3b8a95..188807e 100644 --- a/src/libmsc/gsm_subscriber.c +++ b/src/libmsc/gsm_subscriber.c @@ -109,7 +109,7 @@ return 0; } -int msc_paging_request(struct vlr_subscr *vsub) +static int msc_paging_request(struct vlr_subscr *vsub) { /* The subscriber was last seen in subscr->lac. Find out which * BSCs/RNCs are responsible and send them a paging request via open -- To view, visit https://gerrit.osmocom.org/12142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2efc8eac01a4dd8733118067eecf566c13062106 Gerrit-Change-Number: 12142 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 15:59:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 15:59:31 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 6: > Why are you changing the default behavior though? Another item on > the list of things I don't like. Because it's expected to provide better experience than static one. I can move enabling it by default to another commit if wished. -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 15:59:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 16:04:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 16:04:52 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norm?= =?UTF-8?Q?al_:_master-osmo-sgsn_=C2=BB_--disa?= =?UTF-8?Q?ble-iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7251?= In-Reply-To: <1774758261.1072.1544020077667.JavaMail.jenkins@jenkins.osmocom.org> References: <1774758261.1072.1544020077667.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <665892755.1076.1544025892975.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:05:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:05:51 +0000 Subject: Change in osmo-msc[master]: gsm_subscriber: make function msc_paging_request() static In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12142 ) Change subject: gsm_subscriber: make function msc_paging_request() static ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2efc8eac01a4dd8733118067eecf566c13062106 Gerrit-Change-Number: 12142 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 05 Dec 2018 16:05:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:06:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 16:06:14 +0000 Subject: Change in osmo-msc[master]: add test_nodes.vty transcript test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12127 to look at the new patch set (#3). Change subject: add test_nodes.vty transcript test ...................................................................... add test_nodes.vty transcript test It needs to work whether SMPP,Iu are enable or disabled, hence a bit more wildcarding than one might expect. Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 107 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/27/12127/3 -- To view, visit https://gerrit.osmocom.org/12127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 Gerrit-Change-Number: 12127 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:06:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:06:47 +0000 Subject: Change in osmo-bsc[master]: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11980 ) Change subject: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init ...................................................................... bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init It will be used further in follow-up patches. It also provides a place to document its (intricate) logic around it and its possible uses. Change-Id: Ia1d4bdbfca6b9719f54ee609b6bfadf7f3a4bb43 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/timeslot_fsm.c 2 files changed, 14 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 2f60e4d..0b472a4 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -478,6 +478,19 @@ */ #define ts_for_each_lchan(lchan, ts) ts_as_pchan_for_each_lchan(lchan, ts, (ts)->pchan_is) +/* Iterate over all possible lchans available that have an FSM allocated based + * on PCHAN \ref ts (dynamic) configuration. + * Iterate all lchan instances set up by this \ref ts type, including those + * lchans currently disabled or in process of being enabled (e.g. due to dynamic + * timeslot in switchover). Compare ts_for_each_lchan(), which iterates only the + * enabled lchans. + * For example, it is useful in case dynamic timeslot \ref ts is in process of + * switching from configuration PDCH (no lchans) to TCH_F (1 lchan), where + * pchan_is is still set to PDCH but \ref ts may contain already an \ref lchan + * of type TCH_F which initiated the request to switch the \ts configuration. + */ +#define ts_for_each_potential_lchan(lchan, ts) ts_as_pchan_for_each_lchan(lchan, ts, (ts)->pchan_on_init) + enum lchan_activate_mode { FOR_NONE, FOR_MS_CHANNEL_REQUEST, diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 8351ff7..a39549b 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -550,7 +550,7 @@ ts->pdch_act_allowed = true; /* For static TS, check validity. For dyn TS, figure out which PCHAN this should become. */ - ts_as_pchan_for_each_lchan(lchan, ts, ts->pchan_on_init) { + ts_for_each_potential_lchan(lchan, ts) { if (lchan_state_is(lchan, LCHAN_ST_UNUSED)) continue; -- To view, visit https://gerrit.osmocom.org/11980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia1d4bdbfca6b9719f54ee609b6bfadf7f3a4bb43 Gerrit-Change-Number: 11980 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:06:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:06:48 +0000 Subject: Change in osmo-bsc[master]: bsc: Fix lchan iteration for dyn TS during PDCH Deact In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11957 ) Change subject: bsc: Fix lchan iteration for dyn TS during PDCH Deact ...................................................................... bsc: Fix lchan iteration for dyn TS during PDCH Deact In general PDCH channels are not handled as lchans in BSC (lchan_fsm.c), and so when a TS is in ts->pchan_is=GSM_PCHAN_PDCH, no lchan slot is being used. However, during Dynamic TS PDCH Deactivation being in progress (state WAIT_PDCH_DEACT in timeslot_fsm.c), ts->pchan_is =GSM_PCHAN_PDCH, but an lchan slot of that TS is actually already being used by a TCH lchan: it's the one who initiated the deactivate in order to be able to use the TS. While being in WAIT_PDCH_DEACT state and receiving a PDCH DEACT NACK, ts_fsm_error() was called in order to kill the TS and it was expected that it would kill any lchan using it (or willing to start using it). In order to do that, it calls ts_lchans_dispatch() which in turns iterates over all lchans attached to the TS using ts_for_each_lchan(). However, when the NACK arrived we still had ts->pchan_is=GSM_PCHAN_PDCH, ts_for_each_lchan ends up calling ts_as_pchan_for_each_lchan(GSM_PCHAN_PDCH), which in turns calls pchan_subslots(GSM_PCHAN_PDCH) which returns 0, because we don't manage lchans in that mode as explained in first paragraph. This means in this case ts_for_each_lchan() is actually an empty loop while still any of the TCH channels may be in use, and won't be advertised about the TS entering in a broken state. As a result, the lchan won't be released for a while, only after T23001 expires. Related: OS#3708 Change-Id: I9cedb77d6578597f1febab36c54b2ee427c7a4a2 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index a39549b..113ec36 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -123,7 +123,7 @@ { struct gsm_lchan *lchan; - ts_for_each_lchan(lchan, ts) { + ts_for_each_potential_lchan(lchan, ts) { if (lchan_state >= 0 && !lchan_state_is(lchan, lchan_state)) continue; -- To view, visit https://gerrit.osmocom.org/11957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9cedb77d6578597f1febab36c54b2ee427c7a4a2 Gerrit-Change-Number: 11957 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:06:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:06:48 +0000 Subject: Change in osmo-bsc[master]: bsc: timelost_fsm: Remove unneeded set of out variable on failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11981 ) Change subject: bsc: timelost_fsm: Remove unneeded set of out variable on failure ...................................................................... bsc: timelost_fsm: Remove unneeded set of out variable on failure Documentation of the function explicitly states that the out target_pchan param returns the "PCHAN waited for". If we return false, then no PCHAN is being waited for. The 2 callers of this function only use this out param if function returns true, so let's simplify the code. Change-Id: Ib8f9b7e1f584dee885d6823dc043682577572bd8 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 113ec36..1450491 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -864,9 +864,6 @@ return true; } } - - if (target_pchan) - *target_pchan = ts->pchan_is; return false; } -- To view, visit https://gerrit.osmocom.org/11981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib8f9b7e1f584dee885d6823dc043682577572bd8 Gerrit-Change-Number: 11981 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:06:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:06:49 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11954 ) Change subject: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan ...................................................................... bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan If ts_is_lchan_waiting_for_pchan() wasn't accounting for TCH lchans waiting for TS to deactive PDCH in order to setup the TS as TCH. Since now TCH lchan is catched by ts_is_lchan_waiting_for_pchan() when TS state is TS_ST_WAIT_PDCH_DEACT, there's no need to check for that case in caller ts_is_pchan_switching(), since it will never hit because the callee returns true in that case now. See osmo-bsc I9cedb77d6578597f1febab36c54b2ee427c7a4a2 for similar extensive explanation. Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 1450491..269fcd5 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -857,7 +857,7 @@ bool ts_is_lchan_waiting_for_pchan(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config *target_pchan) { struct gsm_lchan *lchan; - ts_for_each_lchan(lchan, ts) { + ts_for_each_potential_lchan(lchan, ts) { if (lchan->fi->state == LCHAN_ST_WAIT_TS_READY) { if (target_pchan) *target_pchan = gsm_pchan_by_lchan_type(lchan->type); @@ -887,13 +887,15 @@ switch (ts->fi->state) { case TS_ST_WAIT_PDCH_ACT: + /* When switching to PDCH, there are no lchans and we are + * telling the PCU to take over the timeslot. */ if (target_pchan) *target_pchan = GSM_PCHAN_PDCH; return true; case TS_ST_WAIT_PDCH_DEACT: - /* If we were switching to a specific pchan kind, an lchan would be waiting. So this must - * be NONE then. */ + /* If lchan started a PDCH deact but got somehow released while + * waiting for PDCH DEACT (N)ACK */ if (target_pchan) *target_pchan = GSM_PCHAN_NONE; return true; -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 9 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:06:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:06:49 +0000 Subject: Change in osmo-bsc[master]: bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12050 ) Change subject: bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan ...................................................................... bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan Change-Id: Ie438b4efaa9832c44009a92c3df698875f1fa9ae --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 269fcd5..d784289 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -896,8 +896,21 @@ case TS_ST_WAIT_PDCH_DEACT: /* If lchan started a PDCH deact but got somehow released while * waiting for PDCH DEACT (N)ACK */ - if (target_pchan) - *target_pchan = GSM_PCHAN_NONE; + if (target_pchan) { + switch (ts->pchan_on_init) { + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + if (target_pchan) + *target_pchan = GSM_PCHAN_NONE; + break; + case GSM_PCHAN_TCH_F_PDCH: + if (target_pchan) + *target_pchan = GSM_PCHAN_TCH_F; + break; + default: + /* Can't be in this state and be a non dyn TS */ + OSMO_ASSERT(false); + } + } return true; default: -- To view, visit https://gerrit.osmocom.org/12050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie438b4efaa9832c44009a92c3df698875f1fa9ae Gerrit-Change-Number: 12050 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:06:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:06:50 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_l... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11982 ) Change subject: bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_lchan_fsms ...................................................................... bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_lchan_fsms If TS is in state changing from PDCH->TCH, the TCH lchan provoking the switch would be skipped and not terminated before this patch. See osmo-bsc I9cedb77d6578597f1febab36c54b2ee427c7a4a2 for similar extensive explanation. Change-Id: I9dc2a6e5b15376d049bd2ac5ddfa24340771b5c8 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index d784289..88a8f27 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -135,7 +135,7 @@ { struct gsm_lchan *lchan; - ts_for_each_lchan(lchan, ts) { + ts_for_each_potential_lchan(lchan, ts) { osmo_fsm_inst_term(lchan->fi, OSMO_FSM_TERM_REQUEST, NULL); } } -- To view, visit https://gerrit.osmocom.org/11982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9dc2a6e5b15376d049bd2ac5ddfa24340771b5c8 Gerrit-Change-Number: 11982 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:06:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:06:50 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix count in ts_lchans_waiting In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11983 ) Change subject: bsc: timeslot_fsm: Fix count in ts_lchans_waiting ...................................................................... bsc: timeslot_fsm: Fix count in ts_lchans_waiting Before this patch, TCH lchans waiting for dynamic TS to switch PDCH->TCH wouldn't be counted. See osmo-bsc I9cedb77d6578597f1febab36c54b2ee427c7a4a2 for similar extensive explanation. Change-Id: I32008859cc23cd2afddd79daae21497d0945fed0 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 88a8f27..1b77ab2 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -144,7 +144,7 @@ { struct gsm_lchan *lchan; int count = 0; - ts_for_each_lchan(lchan, ts) + ts_for_each_potential_lchan(lchan, ts) if (lchan->fi->state == LCHAN_ST_WAIT_TS_READY) count++; return count; -- To view, visit https://gerrit.osmocom.org/11983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I32008859cc23cd2afddd79daae21497d0945fed0 Gerrit-Change-Number: 11983 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:06:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:06:51 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11993 ) Change subject: bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event ...................................................................... bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event When lchan_rtp_fsm instance is allcoated with osmo_fsm_inst_alloc_child(..., LCHAN_EV_RTP_RELEASED) we already let fsm code to take care of sending that event ito the parent when the fsm is terminated (but only if freeing cause is not OSMO_FSM_TERM_PARENT). The lchan_rtp_fsm cleanup() callback, which is called immediatelly before sending to the parent the event defined during osmo_gsm_install_alloc_child(), currently also sends that same event, which ends up in a duplicated event being sent as shown in log files below. Let's only send the event in cleanup() if we are in the cause=OSMO_FSM_TERM_PARENT scenario, to make sure parent always receives the event, but only once. 20181128193707326 DAS osmo-bsc/assignment_fsm.c:127 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: (bts=0,trx=0,ts=6,ss=0) Assignment failed 20181128193707326 DAS osmo-bsc/assignment_fsm.c:128 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Terminating (cause = OSMO_FSM_TERM_ERROR) 20181128193707326 DAS osmo-bsc/assignment_fsm.c:128 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Removing from parent SUBSCR_CONN(conn4)[0x612000002920] 20181128193707326 DCHAN osmo-bsc/lchan_fsm.c:1333 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Received Event LCHAN_RTP_EV_ROLLBACK 20181128193707326 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Terminating (cause = OSMO_FSM_TERM_REQUEST) 20181128193707326 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Removing from parent lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0] 20181128193707326 DRSL osmo-bsc/mgw_endpoint_fsm.c:441 mgw-endpoint(conn4)[0x6120000021a0]{WAIT_MGW_RESPONSE}: (rtpbridge/*@mgw) CI[0] to-BTS: DLCX :0: notify=NULL 20181128193707326 DRSL osmo-bsc/mgw_endpoint_fsm.c:482 mgw-endpoint(conn4)[0x6120000021a0]{WAIT_MGW_RESPONSE}: (rtpbridge/*@mgw) CI[0] to-BTS: DLCX :0: Scheduling 20181128193707326 DCHAN osmo-bsc/lchan_rtp_fsm.c:742 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: Received Event LCHAN_EV_RTP_RELEASED 20181128193707326 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Freeing instance 20181128193707327 DCHAN fsm.c:381 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Deallocated 20181128193707327 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: Received Event LCHAN_EV_RTP_RELEASED 20181128193707330 DCHAN osmo-bsc/lchan_fsm.c:1347 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: transition to state WAIT_RLL_RTP_RELEASED not permitted! 20181128193707330 DAS osmo-bsc/assignment_fsm.c:128 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Freeing instance 20181128193707330 DAS fsm.c:381 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Deallocated Change-Id: I3e95a21e5a5ec6c35b1ab20b7a642fd7eb81e556 --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index aaba563..6ab3da4 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -738,7 +738,11 @@ lchan->mgw_endpoint_ci_bts = NULL; } lchan->fi_rtp = NULL; - if (lchan->fi) + + /* In all other cause, FSM already takes care of sending the event we + * configured at osmo_fsm_inst_alloc_child() time immediately after + * returning here. */ + if (lchan->fi && cause == OSMO_FSM_TERM_PARENT) osmo_fsm_inst_dispatch(lchan->fi, LCHAN_EV_RTP_RELEASED, 0); } -- To view, visit https://gerrit.osmocom.org/11993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3e95a21e5a5ec6c35b1ab20b7a642fd7eb81e556 Gerrit-Change-Number: 11993 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:06:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:06:51 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RE... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11994 ) Change subject: bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RELEASED ...................................................................... bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RELEASED 20181128193707326 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Freeing instance 20181128193707327 DCHAN fsm.c:381 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Deallocated 20181128193707327 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: Received Event LCHAN_EV_RTP_RELEASED 20181128193707330 DCHAN osmo-bsc/lchan_fsm.c:1347 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: transition to state WAIT_RLL_RTP_RELEASED not permitted! Change-Id: I43aab5ed8ac369869b191b3b7c938ce4985ab849 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 742836c..6b632d6 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1131,6 +1131,7 @@ .out_state_mask = 0 | S(LCHAN_ST_UNUSED) | S(LCHAN_ST_WAIT_ACTIV_ACK) + | S(LCHAN_ST_WAIT_RLL_RTP_RELEASED) , }, [LCHAN_ST_WAIT_ACTIV_ACK] = { -- To view, visit https://gerrit.osmocom.org/11994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I43aab5ed8ac369869b191b3b7c938ce4985ab849 Gerrit-Change-Number: 11994 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:06:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:06:51 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH D... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11995 ) Change subject: bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH DEACT ...................................................................... bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH DEACT lchan sends TS_EV_LCHAN_UNUSED to its parent (ts) during release time. It was experimentally found that it can happen that an lchan can be terminated while waiting for a PDCH DEACT (N)ACK response. The fsm definition actually states that this event can be received in state TS_ST_WAIT_PDCH_DEACT, but it was not handled before and as a result the process aborted due to the default switch case. Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 1b77ab2..91b6b54 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -534,6 +534,10 @@ } } + case TS_EV_LCHAN_UNUSED: + /* ignored */ + return; + default: OSMO_ASSERT(false); } -- To view, visit https://gerrit.osmocom.org/11995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac Gerrit-Change-Number: 11995 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:06:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:06:52 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_fsm: Fix invalid duplicated transition In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11996 ) Change subject: bsc: lchan_fsm: Fix invalid duplicated transition ...................................................................... bsc: lchan_fsm: Fix invalid duplicated transition When we enter WAIT_RLL_RTP_RELEASED (lchan_fsm_wait_rll_rtp_released_onenter), we call lchan_do_release() which in turn dispatches LCHAN_RTP_EV_RELEASE to lchan_rtp_fsm.c, which will dispatch back an LCHAN_EV_RTP_RELEASED event, which will be handled by lchan_fsm_wait_rll_rtp_released(), which will change state to WAIT_BEFORE_RF_RELEASE. When going back the stack (return), we are still in lchan_fsm_wait_rll_rtp_released_onenter() which again triggers a change state to WAIT_BEFORE_RF_RELEASE because it checks same conditions than first one. 20181128203727051 DCHAN osmo-bsc/lchan_fsm.c:1388 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{ESTABLISHED}: lchan detaches from conn SUBSCR_CONN(conn3)[0x612000002da0] 20181128203727051 DMSC osmo-bsc/lchan_fsm.c:1391 SUBSCR_CONN(conn3)[0x612000002da0]{CLEARING}: lchan lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0] detaches from conn 20181128203727051 DCHAN osmo-bsc/lchan_fsm.c:1359 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{ESTABLISHED}: state_chg to WAIT_RLL_RTP_RELEASED 20181128203727052 DCHAN osmo-bsc/lchan_fsm.c:959 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_RLL_RTP_RELEASED}: (type=TCH_F) SAPI[0] = 1 20181128203727052 DRR osmo-bsc/gsm_04_08_rr.c:254 Sending Channel Release: Chan: Number: 0 Type: 2 20181128203727052 DCHAN osmo-bsc/lchan_fsm.c:945 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Received Event LCHAN_RTP_EV_RELEASE 20181128203727052 DCHAN osmo-bsc/lchan_rtp_fsm.c:572 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) 20181128203727052 DCHAN osmo-bsc/lchan_rtp_fsm.c:572 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Removing from parent lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0] 20181128203727052 DCHAN osmo-bsc/lchan_rtp_fsm.c:572 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Freeing instance 20181128203727052 DCHAN fsm.c:381 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Deallocated 20181128203727052 DCHAN osmo-bsc/lchan_rtp_fsm.c:572 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_RLL_RTP_RELEASED}: Received Event LCHAN_EV_RTP_RELEASED 20181128203727052 DCHAN osmo-bsc/lchan_fsm.c:856 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_RLL_RTP_RELEASED}: (type=TCH_F) Still active SAPIs: 0 20181128203727052 DCHAN osmo-bsc/lchan_fsm.c:1011 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_RLL_RTP_RELEASED}: state_chg to WAIT_BEFORE_RF_RELEASE 20181128203727052 DRSL osmo-bsc/abis_rsl.c:633 (bts=0,trx=0,ts=6,ss=0) DEACTivate SACCH CMD 20181128203727052 DCHAN osmo-bsc/lchan_fsm.c:986 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_BEFORE_RF_RELEASE}: transition to state WAIT_BEFORE_RF_RELEASE not permitted! Change-Id: I5d95bbd8244cc8e9c1cfb6fe0f76148332386a3d --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 6b632d6..c873025 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -956,6 +956,9 @@ if (lchan->sapis[sapi]) LOG_LCHAN(lchan, LOGL_DEBUG, "SAPI[%d] = %d\n", sapi, lchan->sapis[sapi]); + /* It could be that we receive LCHAN_EV_RTP_RELEASED synchronously and + as a result we may end up in state WAIT_BEFORE_RF_RELEASE after + lchan_do_release has returned */ lchan_do_release(lchan); sapis = 0; @@ -980,7 +983,7 @@ sapis = 0; } - if (!sapis && !lchan->fi_rtp) + if (!sapis && !lchan->fi_rtp && fi->state == LCHAN_ST_WAIT_RLL_RTP_RELEASED) lchan_fsm_state_chg(LCHAN_ST_WAIT_BEFORE_RF_RELEASE); } -- To view, visit https://gerrit.osmocom.org/11996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5d95bbd8244cc8e9c1cfb6fe0f76148332386a3d Gerrit-Change-Number: 11996 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:07:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 16:07:03 +0000 Subject: Change in osmo-msc[master]: make: prepare for adding transcript tests In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12126 to look at the new patch set (#3). Change subject: make: prepare for adding transcript tests ...................................................................... make: prepare for adding transcript tests Separate 'make python-test' into separate make targets, to sensibly add VTY transcript tests in an upcoming commit. Feature: even though ./configure was called without --enable-external-tests, each of the {ctrl,vty}x{python,transcript} tests can be invoked individually by e.g. 'make vty-python-test'. Both 'vty-transcript-test' and 'ctrl-transcript-test' are still empty, a subsequent patch adds a vty-transcript-test. All of this in preparation of tweaking the 'mncc' vty configuration, to be able to track it in a vty transcript test. Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 --- M tests/Makefile.am 1 file changed, 41 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/12126/3 -- To view, visit https://gerrit.osmocom.org/12126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 Gerrit-Change-Number: 12126 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:07:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 16:07:03 +0000 Subject: Change in osmo-msc[master]: add test_nodes.vty transcript test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12127 to look at the new patch set (#4). Change subject: add test_nodes.vty transcript test ...................................................................... add test_nodes.vty transcript test It needs to work whether SMPP,Iu are enable or disabled, hence a bit more wildcarding than one might expect. Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 107 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/27/12127/4 -- To view, visit https://gerrit.osmocom.org/12127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 Gerrit-Change-Number: 12127 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:07:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 16:07:03 +0000 Subject: Change in osmo-msc[master]: cosmetic: msc_main.c: default args definition style In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12128 to look at the new patch set (#4). Change subject: cosmetic: msc_main.c: default args definition style ...................................................................... cosmetic: msc_main.c: default args definition style Explicitly name each arg with its default value, omit zero values, end last item in comma. Change-Id: I0e0f1e2c8722768b6c61fd6544911b20fe1af212 --- M src/osmo-msc/msc_main.c 1 file changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/28/12128/4 -- To view, visit https://gerrit.osmocom.org/12128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0e0f1e2c8722768b6c61fd6544911b20fe1af212 Gerrit-Change-Number: 12128 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:07:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 16:07:03 +0000 Subject: Change in osmo-msc[master]: msc_main: mncc: move mncc socket decision to after read_cfg In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12129 to look at the new patch set (#5). Change subject: msc_main: mncc: move mncc socket decision to after read_cfg ...................................................................... msc_main: mncc: move mncc socket decision to after read_cfg First step towards allowing to configure the MNCC socket path by config file. Rationale: see I2ec59d5eba407f83295528b51b93678d446b9cee Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 --- M src/osmo-msc/msc_main.c 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/12129/5 -- To view, visit https://gerrit.osmocom.org/12129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 Gerrit-Change-Number: 12129 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:07:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 16:07:03 +0000 Subject: Change in osmo-msc[master]: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12130 to look at the new patch set (#5). Change subject: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' ...................................................................... vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' I want to add 'mncc internal' and 'mncc external' commands, and IMHO makes most sense to have a common 'mncc' keyword to start MNCC config commands with. To put it in terms of VTY online help: OsmoMSC(config-msc)# mncc ? internal Use internal MNCC handler external Use internal MNCC handler guard-timeout Set global guard timeout So far only the 'guard-timeout' exists, I want to add 'internal' and 'external' in a subsequent commit. Keep the old command 'mncc-guard-timeout' as deprecated alias. That means it still works from old config files, but online documentation will omit it. On 'write', write back the new format instead. Rationale: see I2ec59d5eba407f83295528b51b93678d446b9cee Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/30/12130/5 -- To view, visit https://gerrit.osmocom.org/12130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe Gerrit-Change-Number: 12130 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:07:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 16:07:03 +0000 Subject: Change in osmo-msc[master]: add VTY commands: mncc internal / external (== -M) In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12131 to look at the new patch set (#5). Change subject: add VTY commands: mncc internal / external (== -M) ...................................................................... add VTY commands: mncc internal / external (== -M) So far the only way to use external MNCC is to pass the -M cmdline arg: osmo-msc -M /path/to/socket However, the osmo-msc.service file for systemd is installed by 'make install', and hence it is quite impractical to depend on such a config item to be required in the service file: - It defies any scheme an operator may have in place to compose the osmo-msc.cfg file -- this option doesn't go in the .cfg file but needs separate action to add to the installed service file. - After a make install or package upgrades / re-installations, this option will be plain overwritten silently, or lead to the need for resolving file conflicts. The initial spark for this came from configuring the 35c3 GSM from cfg templates. Change-Id: I2ec59d5eba407f83295528b51b93678d446b9cee --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/msc_common.h M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 6 files changed, 68 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/31/12131/5 -- To view, visit https://gerrit.osmocom.org/12131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2ec59d5eba407f83295528b51b93678d446b9cee Gerrit-Change-Number: 12131 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:07:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 16:07:34 +0000 Subject: Change in osmo-msc[master]: make: prepare for adding transcript tests In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12126 ) Change subject: make: prepare for adding transcript tests ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 Gerrit-Change-Number: 12126 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 16:07:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:08:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 16:08:06 +0000 Subject: Change in osmo-msc[master]: make: prepare for adding transcript tests In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12126 ) Change subject: make: prepare for adding transcript tests ...................................................................... Patch Set 3: -Code-Review whoops -- To view, visit https://gerrit.osmocom.org/12126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 Gerrit-Change-Number: 12126 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 16:08:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:09:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:09:09 +0000 Subject: Change in osmo-msc[master]: make: prepare for adding transcript tests In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12126 ) Change subject: make: prepare for adding transcript tests ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 Gerrit-Change-Number: 12126 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 16:09:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 16:09:17 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 16:09:17 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--disa?= =?UTF-8?Q?ble-iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7255?= In-Reply-To: <1803962329.1073.1544020083357.JavaMail.jenkins@jenkins.osmocom.org> References: <1803962329.1073.1544020083357.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1209404390.1077.1544026157162.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:10:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 16:10:38 +0000 Subject: Change in osmo-msc[master]: add test_nodes.vty transcript test In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12127 ) Change subject: add test_nodes.vty transcript test ...................................................................... Patch Set 4: Code-Review+2 I don't know much how these VTY tests work, but I know you do and jenkins is happy, so +2 -- To view, visit https://gerrit.osmocom.org/12127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 Gerrit-Change-Number: 12127 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 16:10:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:11:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 16:11:01 +0000 Subject: Change in osmo-msc[master]: python tests: use py shebang instead of $(PYTHON) In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12138 to look at the new patch set (#2). Change subject: python tests: use py shebang instead of $(PYTHON) ...................................................................... python tests: use py shebang instead of $(PYTHON) I'm going to make the external tests manually launchable. For that I first had an error message if $(PYTHON) was empty. But Pau says I should just use shebang instead and ignore the autoconf python stuff, since that often fails anyway. Change-Id: Ie35dd78c42577109a6a3143221a9769e47d361a5 --- M tests/Makefile.am M tests/ctrl_test_runner.py M tests/smpp_test_runner.py M tests/vty_test_runner.py 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/12138/2 -- To view, visit https://gerrit.osmocom.org/12138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie35dd78c42577109a6a3143221a9769e47d361a5 Gerrit-Change-Number: 12138 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 16:12:40 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 16:12:40 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4379?= In-Reply-To: <617489772.1071.1544020070294.JavaMail.jenkins@jenkins.osmocom.org> References: <617489772.1071.1544020070294.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <88463567.1078.1544026360968.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.13 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.257-ab9a2/_build' if test -d "osmo-bsc-1.3.0.257-ab9a2"; then find "osmo-bsc-1.3.0.257-ab9a2" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.257-ab9a2" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.257-ab9a2"; }; else :; fi ========================================================== osmo-bsc-1.3.0.257-ab9a2 archives ready for distribution: osmo-bsc-1.3.0.257-ab9a2.tar.gz osmo-bsc-1.3.0.257-ab9a2.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:14:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 16:14:03 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 6: would suffice if someone else agrees that the new way should be the new default -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 16:14:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 16:18:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 16:18:30 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-iuh_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#2596?= In-Reply-To: <1251190668.1070.1544020042452.JavaMail.jenkins@jenkins.osmocom.org> References: <1251190668.1070.1544020042452.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1561172322.1079.1544026710609.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Dec 5 16:19:35 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 5 Dec 2018 16:19:35 +0000 Subject: Change in osmo-msc[master]: gsm_subscriber: make function msc_paging_request() static In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/12142 ) Change subject: gsm_subscriber: make function msc_paging_request() static ...................................................................... gsm_subscriber: make function msc_paging_request() static The function msc_paging_request() is only called from within gsm_subscriber.c but never from outside. Lets make it static. Change-Id: I2efc8eac01a4dd8733118067eecf566c13062106 --- M src/libmsc/gsm_subscriber.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c index c3b8a95..188807e 100644 --- a/src/libmsc/gsm_subscriber.c +++ b/src/libmsc/gsm_subscriber.c @@ -109,7 +109,7 @@ return 0; } -int msc_paging_request(struct vlr_subscr *vsub) +static int msc_paging_request(struct vlr_subscr *vsub) { /* The subscriber was last seen in subscr->lac. Find out which * BSCs/RNCs are responsible and send them a paging request via open -- To view, visit https://gerrit.osmocom.org/12142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2efc8eac01a4dd8733118067eecf566c13062106 Gerrit-Change-Number: 12142 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 16:25:55 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 16:25:55 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4380?= In-Reply-To: <88463567.1078.1544026360968.JavaMail.jenkins@jenkins.osmocom.org> References: <88463567.1078.1544026360968.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <359272418.1080.1544027155147.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Pau Espin Pedrol] bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init [Pau Espin Pedrol] bsc: Fix lchan iteration for dyn TS during PDCH Deact [Pau Espin Pedrol] bsc: timelost_fsm: Remove unneeded set of out variable on failure [Pau Espin Pedrol] bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan [Pau Espin Pedrol] bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan [Pau Espin Pedrol] bsc: timeslot_fsm: Fix possible skip of some lchans in [Pau Espin Pedrol] bsc: timeslot_fsm: Fix count in ts_lchans_waiting [Pau Espin Pedrol] bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event [Pau Espin Pedrol] bsc: lchan_fsm: Add missing transition [Pau Espin Pedrol] bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH [Pau Espin Pedrol] bsc: lchan_fsm: Fix invalid duplicated transition ------------------------------------------ [...truncated 1.13 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build' if test -d "osmo-bsc-1.3.0.268-4af2d"; then find "osmo-bsc-1.3.0.268-4af2d" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.268-4af2d" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.268-4af2d"; }; else :; fi ========================================================== osmo-bsc-1.3.0.268-4af2d archives ready for distribution: osmo-bsc-1.3.0.268-4af2d.tar.gz osmo-bsc-1.3.0.268-4af2d.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 16:26:51 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 16:26:51 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-libosmo-sccp_=C2=BB_a1=3Ddefault,a?= =?UTF-8?Q?2=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1888?= Message-ID: <1804104371.1081.1544027211392.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 36.68 KB...] ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC gsm690.lo CC gsm660.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH=":/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC comp128.lo CC rxlev_stat.lo CC tlv_parser.lo CC gsm_utils.lo CC gsm48.lo CC comp128v23.lo CC rsl.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC gprs_gea.lo CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo CC milenage/aes-encblock.lo CCLD libgsmint.la ar: `u' modifier ignored since `D' is the default (see `U') CCLD libosmogsm.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la ' libtool: warning: relinking 'libosmogsm.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogsm.map -version-info 10:0:0 -no-undefined -o libosmogsm.la -rpath libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so.10 || { rm -f libosmogsm.so.10 && ln -s libosmogsm.so.10.0.0 libosmogsm.so.10; }; }) libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so || { rm -f libosmogsm.so && ln -s libosmogsm.so.10.0.0 libosmogsm.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogsm.lai libtool: finish: PATH=":/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/coding make[2]: Entering directory ' CC gsm0503_interleaving.lo CC gsm0503_tables.lo CC gsm0503_mapping.lo CC gsm0503_coding.lo CC gsm0503_parity.lo CCLD libosmocoding.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la ' libtool: warning: relinking 'libosmocoding.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -o libosmocoding.la -rpath gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la ) libtool: install: /usr/bin/install -c .libs/libosmocoding.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so.0 || { rm -f libosmocoding.so.0 && ln -s libosmocoding.so.0.1.1 libosmocoding.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so || { rm -f libosmocoding.so && ln -s libosmocoding.so.0.1.1 libosmocoding.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocoding.lai libtool: finish: PATH=":/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gb make[2]: Entering directory ' CC gprs_ns_frgre.lo CC gprs_ns.lo CC gprs_bssgp.lo CC gprs_ns_vty.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CC common_vty.lo /bin/bash: line 2: 1175 Illegal instruction /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -DBUILDING_LIBOSMOCORE -Wall -Wall -fno-strict-aliasing -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gprs_bssgp_vty.lo -MD -MP -MF $depbase.Tpo -c -o gprs_bssgp_vty.lo gprs_bssgp_vty.c Makefile:496: recipe for target 'gprs_bssgp_vty.lo' failed make[2]: *** [gprs_bssgp_vty.lo] Error 132 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 16:56:08 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 16:56:08 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4381?= In-Reply-To: <359272418.1080.1544027155147.JavaMail.jenkins@jenkins.osmocom.org> References: <359272418.1080.1544027155147.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <644743570.1083.1544028968539.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.13 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.268-4af2d/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.268-4af2d/_build' if test -d "osmo-bsc-1.3.0.268-4af2d"; then find "osmo-bsc-1.3.0.268-4af2d" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.268-4af2d" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.268-4af2d"; }; else :; fi ========================================================== osmo-bsc-1.3.0.268-4af2d archives ready for distribution: osmo-bsc-1.3.0.268-4af2d.tar.gz osmo-bsc-1.3.0.268-4af2d.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:06:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 17:06:08 +0000 Subject: Change in osmo-gsm-tester[master]: test: cs_paging_gprs_active: Make sure gprs data (TBF) is ongoing Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12143 Change subject: test: cs_paging_gprs_active: Make sure gprs data (TBF) is ongoing ...................................................................... test: cs_paging_gprs_active: Make sure gprs data (TBF) is ongoing PACCH is used for paging only if the MS is actively using a PDCH, and the only way to be sure that's happening is to place some data through the GPRS path so MS has TBF in use when the call is placed. Change-Id: Id29391d75101d94e2cd58f444b383f4c5217ab6a --- M suites/gprs/cs_paging_gprs_active.py M suites/gprs/lib/testlib.py 2 files changed, 30 insertions(+), 73 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/43/12143/1 diff --git a/suites/gprs/cs_paging_gprs_active.py b/suites/gprs/cs_paging_gprs_active.py index fc0e160..b7dead2 100755 --- a/suites/gprs/cs_paging_gprs_active.py +++ b/suites/gprs/cs_paging_gprs_active.py @@ -5,79 +5,34 @@ from osmo_gsm_tester.testenv import * -hlr = suite.hlr() -bts = suite.bts() -pcu = bts.pcu() -mgw_msc = suite.mgw() -mgw_bsc = suite.mgw() -stp = suite.stp() -ggsn = suite.ggsn() -sgsn = suite.sgsn(hlr, ggsn) -msc = suite.msc(hlr, mgw_msc, stp) -bsc = suite.bsc(msc, mgw_bsc, stp) -ms_mo = suite.modem() -ms_mt = suite.modem() +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import setup_run_iperf3_test_parallel -bsc.bts_add(bts) -sgsn.bts_add(bts) +def ready_cb_place_voicecall(ms_li): + print('waiting a few secs to make sure iperf3 test is running') + sleep(2) + # At this point in time, TBF should be enabled on both MS since they are sending/receiving data. + print('iperf3 running, let\'s place a call') + ms_mo = ms_li[0] + ms_mt = ms_li[1] + assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 + mo_cid = ms_mo.call_dial(ms_mt) + mt_cid = ms_mt.call_wait_incoming(ms_mo) + print('dial success') -print('start network...') -hlr.start() -stp.start() -ggsn.start() -sgsn.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() -bsc.start() + assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) + ms_mt.call_answer(mt_cid) + wait(ms_mo.call_is_active, mo_cid) + wait(ms_mt.call_is_active, mt_cid) + print('answer success, call established and ongoing') -bts.start() -wait(bsc.bts_is_connected, bts) -print('Waiting for bts to be ready...') -wait(bts.ready_for_pcu) -pcu.start() + sleep(5) # maintain the call active for 5 seconds -hlr.subscriber_add(ms_mo) -hlr.subscriber_add(ms_mt) + assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) + ms_mt.call_hangup(mt_cid) + wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) + print('hangup success') -ms_mo.connect(msc.mcc_mnc()) -ms_mt.connect(msc.mcc_mnc()) -ms_mo.attach() -ms_mt.attach() -ms_mo.log_info() -ms_mt.log_info() - -print('waiting for modems to attach...') -wait(ms_mo.is_connected, msc.mcc_mnc()) -wait(ms_mt.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms_mo, ms_mt) - -print('waiting for modems to attach to data services...') -wait(ms_mo.is_attached) -wait(ms_mt.is_attached) - -# We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) -ctx_id_v4_mo = ms_mo.activate_context(apn='inet46', protocol=ms_mo.CTX_PROT_IPv4) -ctx_id_v4_mt = ms_mt.activate_context(apn='inet46', protocol=ms_mt.CTX_PROT_IPv4) - -assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 -mo_cid = ms_mo.call_dial(ms_mt) -mt_cid = ms_mt.call_wait_incoming(ms_mo) -print('dial success') - -assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) -ms_mt.call_answer(mt_cid) -wait(ms_mo.call_is_active, mo_cid) -wait(ms_mt.call_is_active, mt_cid) -print('answer success, call established and ongoing') - -sleep(5) # maintain the call active for 5 seconds - -assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) -ms_mt.call_hangup(mt_cid) -wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) -print('hangup success') - -ms_mo.deactivate_context(ctx_id_v4_mo) -ms_mt.deactivate_context(ctx_id_v4_mt) +setup_run_iperf3_test_parallel(2, ready_cb=ready_cb_place_voicecall) diff --git a/suites/gprs/lib/testlib.py b/suites/gprs/lib/testlib.py index 13a6671..ac3a847 100644 --- a/suites/gprs/lib/testlib.py +++ b/suites/gprs/lib/testlib.py @@ -11,7 +11,7 @@ print("\tSEND: %d KB, %d kbps, %d seconds" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'])) print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) -def run_iperf3_cli_parallel(iperf3clients, ms_li): +def run_iperf3_cli_parallel(iperf3clients, ms_li, ready_cb): assert len(iperf3clients) == len(ms_li) procs = [] for i in range(len(iperf3clients)): @@ -20,6 +20,8 @@ try: for proc in procs: proc.launch() + if ready_cb: + ready_cb(ms_li) for proc in procs: proc.wait() except Exception as e: @@ -28,7 +30,7 @@ raise e -def setup_run_iperf3_test_parallel(num_ms): +def setup_run_iperf3_test_parallel(num_ms, ready_cb=None): hlr = suite.hlr() bts = suite.bts() pcu = bts.pcu() @@ -98,7 +100,7 @@ ms.setup_context_data_plane(ctx_id_v4) setattr(ms, 'tmp_ctx_id', ctx_id_v4) - run_iperf3_cli_parallel(clients, ms_li) + run_iperf3_cli_parallel(clients, ms_li, ready_cb) for i in range(num_ms): servers[i].stop() -- To view, visit https://gerrit.osmocom.org/12143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id29391d75101d94e2cd58f444b383f4c5217ab6a Gerrit-Change-Number: 12143 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:21:16 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 5 Dec 2018 17:21:16 +0000 Subject: Change in osmo-hlr[master]: introduce osmo_gsup_client_create2() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12098 ) Change subject: introduce osmo_gsup_client_create2() ...................................................................... Patch Set 2: Thanks for the review. Should be all good in next patch set. -- To view, visit https://gerrit.osmocom.org/12098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ief09677e07d6e977247185b72c605f109aa091f5 Gerrit-Change-Number: 12098 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 17:21:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:21:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 5 Dec 2018 17:21:41 +0000 Subject: Change in osmo-hlr[master]: introduce osmo_gsup_client_create2() In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12098 to look at the new patch set (#3). Change subject: introduce osmo_gsup_client_create2() ...................................................................... introduce osmo_gsup_client_create2() Add a new API which allows creating a GSUP client connection with more identification information than just a unit name. Instead of being selective about which idenfifiers callers may use, allow callers to pass a full-blown struct ipaccess_unit. This allows applications to use entirely custom identifiers on GSUP client connections. This change is a prerequisite for inter-MSC handover because MSCs will need to use unique identifiers towards the HLR, which isn't very easy to do with the old osmo_gsup_client_create() API. While it's always been possible to pass a unique unit_name, this is not as flexible as we would like. The old API remains for backwards compatibility. struct osmo_gsup_client grows in size but is allocated internally by the library; old calling code won't notice the difference. Change-Id: Ief09677e07d6e977247185b72c605f109aa091f5 Related: OS#3355 --- M include/osmocom/gsupclient/gsup_client.h M src/gsupclient/gsup_client.c 2 files changed, 49 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/98/12098/3 -- To view, visit https://gerrit.osmocom.org/12098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ief09677e07d6e977247185b72c605f109aa091f5 Gerrit-Change-Number: 12098 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:30:07 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 5 Dec 2018 17:30:07 +0000 Subject: Change in osmo-msc[master]: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12130 ) Change subject: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe Gerrit-Change-Number: 12130 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 05 Dec 2018 17:30:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:34:12 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 5 Dec 2018 17:34:12 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 17:34:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:36:13 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 5 Dec 2018 17:36:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 05 Dec 2018 17:36:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:38:15 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 5 Dec 2018 17:38:15 +0000 Subject: Change in libosmocore[master]: gsm_29_118: add missing extern for struct value_string decl. Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12144 Change subject: gsm_29_118: add missing extern for struct value_string decl. ...................................................................... gsm_29_118: add missing extern for struct value_string decl. The value string arrays in the header file (gsm_29_118.h) are not declared as extern. Lets add it now. Change-Id: Ib6c4cbea649f790fa4db1ed2fe2b7e76a60291b4 Related: OS#3615 --- M include/osmocom/gsm/protocol/gsm_29_118.h 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/12144/1 diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h index bf210ad..97a9c43 100644 --- a/include/osmocom/gsm/protocol/gsm_29_118.h +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -35,7 +35,7 @@ /* unassigned */ SGSAP_MSGT_UE_UNREACHABLE = 0x1f, }; -const struct value_string sgsap_msg_type_names[]; +extern const struct value_string sgsap_msg_type_names[]; static inline const char *sgsap_msg_type_name(enum sgsap_msg_type msgt) { return get_value_string(sgsap_msg_type_names, msgt); } @@ -74,7 +74,7 @@ SGSAP_IE_ADDL_PAGING_INDICATORS = 0x26, SGSAP_IE_TMSI_BASED_NRI_CONT = 0x27, }; -const struct value_string sgsap_iei_names[]; +extern const struct value_string sgsap_iei_names[]; static inline const char *sgsap_iei_name(enum sgsap_iei iei) { return get_value_string(sgsap_iei_names, iei); } @@ -84,7 +84,7 @@ SGSAP_EPS_LUT_IMSI_ATTACH = 0x01, SGSAP_EPS_LUT_NORMAL = 0x02, }; -const struct value_string sgsap_eps_lu_type_names[]; +extern const struct value_string sgsap_eps_lu_type_names[]; static inline const char *sgsap_eps_lu_type_name(enum sgsap_eps_lu_type lut) { return get_value_string(sgsap_eps_lu_type_names, lut); } @@ -95,7 +95,7 @@ SGSAP_ID_EPS_T_UE_INITIATED = 0x02, SGSAP_ID_EPS_T_EPS_NOT_ALLOWED = 0x03, }; -const struct value_string sgsap_ismi_det_eps_type_names[]; +extern const struct value_string sgsap_ismi_det_eps_type_names[]; static inline const char *sgsap_imsi_det_eps_type_name(enum sgsap_imsi_det_eps_type idt) { return get_value_string(sgsap_ismi_det_eps_type_names, idt); } @@ -106,7 +106,7 @@ SGSAP_ID_NONEPS_T_COMBINED_UE_EPS_NONEPS = 0x02, SGSAP_ID_NONEPS_T_IMPLICIT_UE_EPS_NONEPS = 0x03, }; -const struct value_string sgsap_ismi_det_noneps_type_names[]; +extern const struct value_string sgsap_ismi_det_noneps_type_names[]; static inline const char *sgsap_imsi_det_noneps_type_name(enum sgsap_imsi_det_noneps_type idt) { return get_value_string(sgsap_ismi_det_noneps_type_names, idt); } @@ -116,7 +116,7 @@ SGSAP_SERV_IND_CS_CALL = 0x01, SGSAP_SERV_IND_SMS = 0x02, }; -const struct value_string sgsap_service_ind_names[]; +extern const struct value_string sgsap_service_ind_names[]; static inline const char *sgsap_service_ind_name(enum sgsap_service_ind si) { return get_value_string(sgsap_service_ind_names, si); } @@ -138,7 +138,7 @@ SGSAP_SGS_CAUSE_MT_CSFB_REJ_USER = 0x0d, SGSAP_SGS_CAUSE_UE_TEMP_UNREACHABLE = 0x0e, }; -const struct value_string sgsap_sgs_cause_names[]; +extern const struct value_string sgsap_sgs_cause_names[]; static inline const char *sgsap_sgs_cause_name(enum sgsap_sgs_cause cause) { return get_value_string(sgsap_sgs_cause_names, cause); } @@ -148,7 +148,7 @@ SGSAP_UE_EMM_MODE_IDLE = 0x00, SGSAP_UE_EMM_MODE_CONNECTED = 0x01, }; -const struct value_string sgsap_ue_emm_mode_names[]; +extern const struct value_string sgsap_ue_emm_mode_names[]; static inline const char *sgsap_ue_emm_mode_name(enum sgsap_ue_emm_mode mode) { return get_value_string(sgsap_ue_emm_mode_names, mode); } -- To view, visit https://gerrit.osmocom.org/12144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6c4cbea649f790fa4db1ed2fe2b7e76a60291b4 Gerrit-Change-Number: 12144 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:39:04 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 5 Dec 2018 17:39:04 +0000 Subject: Change in osmo-msc[master]: cosmetic: msc_main.c: default args definition style In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12128 ) Change subject: cosmetic: msc_main.c: default args definition style ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0e0f1e2c8722768b6c61fd6544911b20fe1af212 Gerrit-Change-Number: 12128 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 17:39:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:51:46 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 5 Dec 2018 17:51:46 +0000 Subject: Change in osmo-msc[master]: add test_nodes.vty transcript test In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12127 ) Change subject: add test_nodes.vty transcript test ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 Gerrit-Change-Number: 12127 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 17:51:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:53:08 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 5 Dec 2018 17:53:08 +0000 Subject: Change in osmo-msc[master]: python tests: use py shebang instead of $(PYTHON) In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12138 ) Change subject: python tests: use py shebang instead of $(PYTHON) ...................................................................... Patch Set 2: Code-Review+1 Fine with me. -- To view, visit https://gerrit.osmocom.org/12138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie35dd78c42577109a6a3143221a9769e47d361a5 Gerrit-Change-Number: 12138 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 17:53:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:54:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 17:54:00 +0000 Subject: Change in osmo-msc[master]: python tests: use py shebang instead of $(PYTHON) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12138 ) Change subject: python tests: use py shebang instead of $(PYTHON) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie35dd78c42577109a6a3143221a9769e47d361a5 Gerrit-Change-Number: 12138 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 17:54:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:55:18 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 5 Dec 2018 17:55:18 +0000 Subject: Change in osmo-msc[master]: msc_main: mncc: move mncc socket decision to after read_cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12129 ) Change subject: msc_main: mncc: move mncc socket decision to after read_cfg ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 Gerrit-Change-Number: 12129 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 17:55:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 17:58:46 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 5 Dec 2018 17:58:46 +0000 Subject: Change in osmo-msc[master]: make: prepare for adding transcript tests In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12126 ) Change subject: make: prepare for adding transcript tests ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 Gerrit-Change-Number: 12126 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 17:58:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 18:08:29 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 18:08:29 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: propagate expected BSC id to command processor Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12145 Change subject: Trap handlers: propagate expected BSC id to command processor ...................................................................... Trap handlers: propagate expected BSC id to command processor When receiving commands for particular BSC, log BSC id known at the time when request was made, not the one which is part of the reply. Change-Id: I6acdfddb9a1132f978f2b55c769559b0c29eb3e8 --- M osmopy/trap_helper.py M scripts/ctrl2cgi.py M scripts/soap.py 3 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/45/12145/1 diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index 45dc527..b7202ac 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -55,12 +55,12 @@ loc = split_type(v) return loc[-1] -def comm_proc(comm, f, log): +def comm_proc(comm, bid, f, log): """ Command processor: takes function f to run for each command """ bsc_id = comm[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format - log.debug("BSC %s commands: %r" % (bsc_id, comm)) + log.debug("BSC %s commands: %r" % (bid, comm)) for t in comm: (_, m) = Ctrl().cmd(*t.split()) f(m) diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index cd59209..addca2f 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -40,12 +40,12 @@ assert V(twisted_ipa_version) > V('0.4') -def handle_reply(f, log, resp): +def handle_reply(bid, f, log, resp): """ Reply handler: process raw CGI server response, function f to run for each command """ decoded = json.loads(resp.decode('utf-8')) - comm_proc(decoded.get('commands'), f, log) + comm_proc(decoded.get('commands'), bid, f, log) def gen_hash(params, skey): inp = '' @@ -62,7 +62,7 @@ def make_async_req(dst, par, f_write, f_log): d = post(dst, par) - d.addCallback(collect, partial(handle_reply, f_write, f_log)) # treq's collect helper is handy to get all reply content at once + d.addCallback(collect, partial(handle_reply, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, par['bsc_id'], dst))) # handle HTTP errors return d diff --git a/scripts/soap.py b/scripts/soap.py index 0534000..f771530 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -38,12 +38,12 @@ assert V(twisted_ipa_version) > V('0.4') -def handle_reply(p, f, log, r): +def handle_reply(p, bid, f, log, r): """ Reply handler: takes function p to process raw SOAP server reply r, function f to run for each command """ repl = p(r) # result is expected to have both commands[] array and error string (could be None) - bsc_id = comm_proc(repl.commands, f, log) + bsc_id = comm_proc(repl.commands, bid, f, log) log.info("Received SOAP response for BSC %s with %d commands, error status: %s" % (bsc_id, len(repl.commands), repl.error)) @@ -89,7 +89,7 @@ self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) ctx = self.factory.client.registerSiteLocation(bsc, float(params['lon']), float(params['lat']), params['position_validity'], params['time_stamp'], params['oper_status'], params['admin_status'], params['policy_status']) d = post(self.factory.location, ctx.envelope) - d.addCallback(collect, partial(handle_reply, ctx.process_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx + d.addCallback(collect, partial(handle_reply, ctx.process_reply, params['bsc_id'], self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors # Ensure that we run only limited number of requests in parallel: yield self.factory.semaphore.acquire() -- To view, visit https://gerrit.osmocom.org/12145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6acdfddb9a1132f978f2b55c769559b0c29eb3e8 Gerrit-Change-Number: 12145 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 18:08:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 18:08:30 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: log request/reply as info level Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12146 Change subject: Trap handlers: log request/reply as info level ...................................................................... Trap handlers: log request/reply as info level Log the basic location-state trap triggering request and command reply as info level - that way we can receive useful information without turning on full debug output. Change-Id: If8eae9f36292930571954becf6613fada43d301c --- M osmopy/trap_helper.py M scripts/ctrl2cgi.py M scripts/soap.py 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/46/12146/1 diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index b7202ac..3e80c6d 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -60,7 +60,7 @@ Command processor: takes function f to run for each command """ bsc_id = comm[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format - log.debug("BSC %s commands: %r" % (bid, comm)) + log.info("BSC %s commands: %r" % (bid, comm)) for t in comm: (_, m) = Ctrl().cmd(*t.split()) f(m) diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index addca2f..5c675bc 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -104,7 +104,7 @@ Handle location-state TRAP: parse trap content, build CGI Request and use treq's routines to post it while setting up async handlers """ params = make_params(bsc, data) - self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) + self.factory.log.info('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) params['h'] = gen_hash(params, self.factory.secret_key) # Ensure that we run only limited number of requests in parallel: self.factory.semaphore.run(make_async_req, self.factory.location, params, self.transport.write, self.factory.log) diff --git a/scripts/soap.py b/scripts/soap.py index f771530..5817988 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -86,7 +86,7 @@ Handle location-state TRAP: parse trap content, build SOAP context and use treq's routines to post it while setting up async handlers """ params = make_params(bsc, data) - self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) + self.factory.log.info('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) ctx = self.factory.client.registerSiteLocation(bsc, float(params['lon']), float(params['lat']), params['position_validity'], params['time_stamp'], params['oper_status'], params['admin_status'], params['policy_status']) d = post(self.factory.location, ctx.envelope) d.addCallback(collect, partial(handle_reply, ctx.process_reply, params['bsc_id'], self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx -- To view, visit https://gerrit.osmocom.org/12146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If8eae9f36292930571954becf6613fada43d301c Gerrit-Change-Number: 12146 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 18:08:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 18:08:30 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: log request time Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12147 Change subject: ctrl2cgi: log request time ...................................................................... ctrl2cgi: log request time Log http request timestamp and duration on debug loglevel. This is especially helpful while troubleshooting issues with multiple concurrent requests under significant load while network issues are present. Change-Id: I11c8ac67a2730a9c6912694e5b83bbdf08fe357d Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/47/12147/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 5c675bc..e11e6e6 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,9 +22,9 @@ */ """ -__version__ = "0.0.6" # bump this on every non-trivial change +__version__ = "0.0.7" # bump this on every non-trivial change -import argparse, os, logging, logging.handlers +import argparse, os, logging, logging.handlers, datetime import hashlib import json import configparser @@ -40,11 +40,12 @@ assert V(twisted_ipa_version) > V('0.4') -def handle_reply(bid, f, log, resp): +def handle_reply(ts, bid, f, log, resp): """ Reply handler: process raw CGI server response, function f to run for each command """ decoded = json.loads(resp.decode('utf-8')) + log.debug('request for BSC %s took %d seconds' % (bid, (datetime.datetime.now() - ts).total_seconds())) comm_proc(decoded.get('commands'), bid, f, log) def gen_hash(params, skey): @@ -60,9 +61,9 @@ #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res -def make_async_req(dst, par, f_write, f_log): +def make_async_req(ts, dst, par, f_write, f_log): d = post(dst, par) - d.addCallback(collect, partial(handle_reply, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once + d.addCallback(collect, partial(handle_reply, ts, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, par['bsc_id'], dst))) # handle HTTP errors return d @@ -106,8 +107,10 @@ params = make_params(bsc, data) self.factory.log.info('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) params['h'] = gen_hash(params, self.factory.secret_key) + t = datetime.datetime.now() + self.factory.log.debug('Preparing request for BSC %s @ %s...' % (params['bsc_id'], t)) # Ensure that we run only limited number of requests in parallel: - self.factory.semaphore.run(make_async_req, self.factory.location, params, self.transport.write, self.factory.log) + self.factory.semaphore.run(make_async_req, t, self.factory.location, params, self.transport.write, self.factory.log) def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): """ -- To view, visit https://gerrit.osmocom.org/12147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I11c8ac67a2730a9c6912694e5b83bbdf08fe357d Gerrit-Change-Number: 12147 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 18:08:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 18:08:31 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: make http request timeout configurable Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12148 Change subject: ctrl2cgi: make http request timeout configurable ...................................................................... ctrl2cgi: make http request timeout configurable Change-Id: I7839121da831aeab0be7e599049bf79471f845fd Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/48/12148/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index e11e6e6..81674d8 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.0.7" # bump this on every non-trivial change +__version__ = "0.0.8" # bump this on every non-trivial change import argparse, os, logging, logging.handlers, datetime import hashlib @@ -61,10 +61,10 @@ #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res -def make_async_req(ts, dst, par, f_write, f_log): - d = post(dst, par) +def make_async_req(ts, dst, par, f_write, f_log, tout): + d = post(dst, par, timeout=tout) d.addCallback(collect, partial(handle_reply, ts, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once - d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, par['bsc_id'], dst))) # handle HTTP errors + d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s (timeout %d)" % (e, par['bsc_id'], dst, tout))) # handle HTTP errors return d class Trap(CTRL): @@ -110,7 +110,7 @@ t = datetime.datetime.now() self.factory.log.debug('Preparing request for BSC %s @ %s...' % (params['bsc_id'], t)) # Ensure that we run only limited number of requests in parallel: - self.factory.semaphore.run(make_async_req, t, self.factory.location, params, self.transport.write, self.factory.log) + self.factory.semaphore.run(make_async_req, t, self.factory.location, params, self.transport.write, self.factory.log, self.factory.timeout) def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): """ @@ -148,6 +148,7 @@ T.addr_ctrl = config['main'].get('addr_ctrl', 'localhost') T.port_ctrl = config['main'].getint('port_ctrl', 4250) + T.timeout = config['main'].getint('timeout', 30) T.semaphore = defer.DeferredSemaphore(config['main'].getint('num_max_conn', 5)) T.location = config['main'].get('location') T.secret_key = config['main'].get('secret_key') -- To view, visit https://gerrit.osmocom.org/12148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7839121da831aeab0be7e599049bf79471f845fd Gerrit-Change-Number: 12148 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 18:08:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 18:08:31 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: adjust http error log Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12149 Change subject: Trap handlers: adjust http error log ...................................................................... Trap handlers: adjust http error log Log repr() of error because it's more conscience which makes it easier to read the logs. Change-Id: I39870b83cacee9a589636974d04e356ef0d32345 --- M scripts/ctrl2cgi.py M scripts/soap.py 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/49/12149/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 81674d8..28a7c3b 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -64,7 +64,7 @@ def make_async_req(ts, dst, par, f_write, f_log, tout): d = post(dst, par, timeout=tout) d.addCallback(collect, partial(handle_reply, ts, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once - d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s (timeout %d)" % (e, par['bsc_id'], dst, tout))) # handle HTTP errors + d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s (timeout %d)" % (repr(e), par['bsc_id'], dst, tout))) # handle HTTP errors return d class Trap(CTRL): diff --git a/scripts/soap.py b/scripts/soap.py index 5817988..0cb2184 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -90,7 +90,7 @@ ctx = self.factory.client.registerSiteLocation(bsc, float(params['lon']), float(params['lat']), params['position_validity'], params['time_stamp'], params['oper_status'], params['admin_status'], params['policy_status']) d = post(self.factory.location, ctx.envelope) d.addCallback(collect, partial(handle_reply, ctx.process_reply, params['bsc_id'], self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx - d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors + d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (repr(e), bsc, self.factory.location)), bsc) # handle HTTP errors # Ensure that we run only limited number of requests in parallel: yield self.factory.semaphore.acquire() yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit -- To view, visit https://gerrit.osmocom.org/12149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I39870b83cacee9a589636974d04e356ef0d32345 Gerrit-Change-Number: 12149 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 18:08:32 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 18:08:32 +0000 Subject: Change in python/osmo-python-tests[master]: twisted: disable low-level logging in dispatchers Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12150 Change subject: twisted: disable low-level logging in dispatchers ...................................................................... twisted: disable low-level logging in dispatchers The same messages are better handled in derived classes using message-specific functions instead of generic dispatchers. Change-Id: I4a054eec9ef7ab39e15ac0cd64834a251d4fb2d7 --- M osmopy/twisted_ipa.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/50/12150/1 diff --git a/osmopy/twisted_ipa.py b/osmopy/twisted_ipa.py index 70c1ef0..5b60d28 100755 --- a/osmopy/twisted_ipa.py +++ b/osmopy/twisted_ipa.py @@ -146,7 +146,7 @@ """ (_, proto, extension, content) = IPA().del_header(data) if content is not None: - self.dbg('IPA received %s::%s [%d/%d] %s' % (IPA().proto(proto), IPA().ext_name(proto, extension), len(data), len(content), content)) + #self.dbg('IPA received %s::%s [%d/%d] %s' % (IPA().proto(proto), IPA().ext_name(proto, extension), len(data), len(content), content)) method = getattr(self, 'handle_' + IPA().proto(proto), lambda: "protocol dispatch failure") method(content, proto, extension) @@ -249,7 +249,7 @@ OSMO CTRL message dispatcher, lambda default should never happen For basic tests only, appropriate handling routines should be replaced: see CtrlServer for example """ - self.dbg('OSMO CTRL received %s::%s' % Ctrl().parse_kv(data)) + #self.dbg('OSMO CTRL received %s::%s' % Ctrl().parse_kv(data)) (cmd, op_id, v) = data.decode('utf-8').split(' ', 2) method = getattr(self, 'ctrl_' + cmd, lambda: "CTRL unknown command") method(data, op_id, v) -- To view, visit https://gerrit.osmocom.org/12150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4a054eec9ef7ab39e15ac0cd64834a251d4fb2d7 Gerrit-Change-Number: 12150 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 18:25:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 5 Dec 2018 18:25:55 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 13: (1 comment) I thought I've already answered it but can't find it now. https://gerrit.osmocom.org/#/c/12020/13/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/13/tests/gsm0808/gsm0808_test.c at 615 PS13, Line 615: if (p.net_len != g.net_len) > I asked it already I think: if anything fails during test, abort or at least return in order to avoi [?] In case where errors won't make sense we already abort() - see above. Here it's better to print all possible errors at once so we don't have to waste time checking them one by one. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 13 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 18:25:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 18:33:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 5 Dec 2018 18:33:12 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 13: (1 comment) https://gerrit.osmocom.org/#/c/12020/13/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/13/tests/gsm0808/gsm0808_test.c at 615 PS13, Line 615: if (p.net_len != g.net_len) > In case where errors won't make sense we already abort() - see above. [?] If decoding failed (gsm0808_dec_gcr returned <0), it makes no sense using p and printing related p stuff. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 13 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 18:33:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:31:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Dec 2018 19:31:17 +0000 Subject: Change in osmo-msc[master]: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12130 ) Change subject: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' ...................................................................... Patch Set 6: Code-Review+1 +3 finally ;) -- To view, visit https://gerrit.osmocom.org/12130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe Gerrit-Change-Number: 12130 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 05 Dec 2018 19:31:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:34:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:34:33 +0000 Subject: Change in osmo-msc[master]: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12130 ) Change subject: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe Gerrit-Change-Number: 12130 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 05 Dec 2018 19:34:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:35:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:35:12 +0000 Subject: Change in osmo-msc[master]: python tests: use py shebang instead of $(PYTHON) In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12138 ) Change subject: python tests: use py shebang instead of $(PYTHON) ...................................................................... python tests: use py shebang instead of $(PYTHON) I'm going to make the external tests manually launchable. For that I first had an error message if $(PYTHON) was empty. But Pau says I should just use shebang instead and ignore the autoconf python stuff, since that often fails anyway. Change-Id: Ie35dd78c42577109a6a3143221a9769e47d361a5 --- M tests/Makefile.am M tests/ctrl_test_runner.py M tests/smpp_test_runner.py M tests/vty_test_runner.py 4 files changed, 6 insertions(+), 6 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/Makefile.am b/tests/Makefile.am index c225afa..f6b33fc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -46,10 +46,10 @@ python-tests: $(BUILT_SOURCES) osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - $(PYTHON) $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v - $(PYTHON) $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v + $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v + $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v if BUILD_SMPP - $(PYTHON) $(srcdir)/smpp_test_runner.py -w $(abs_top_builddir) -v + $(srcdir)/smpp_test_runner.py -w $(abs_top_builddir) -v endif rm -f $(top_builddir)/sms.db else diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py old mode 100644 new mode 100755 index 05d3e30..f652a67 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # (C) 2013 by Jacob Erlbeck # (C) 2014 by Holger Hans Peter Freyther diff --git a/tests/smpp_test_runner.py b/tests/smpp_test_runner.py old mode 100644 new mode 100755 index 7a3a342..f6567d9 --- a/tests/smpp_test_runner.py +++ b/tests/smpp_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # (C) 2014 by Holger Hans Peter Freyther # based on vty_test_runner.py: diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py old mode 100644 new mode 100755 index 6d8ca6f..471ecf6 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # (C) 2013 by Katerina Barone-Adesi # (C) 2013 by Holger Hans Peter Freyther -- To view, visit https://gerrit.osmocom.org/12138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie35dd78c42577109a6a3143221a9769e47d361a5 Gerrit-Change-Number: 12138 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:35:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:35:13 +0000 Subject: Change in osmo-msc[master]: make: prepare for adding transcript tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12126 ) Change subject: make: prepare for adding transcript tests ...................................................................... make: prepare for adding transcript tests Separate 'make python-test' into separate make targets, to sensibly add VTY transcript tests in an upcoming commit. Feature: even though ./configure was called without --enable-external-tests, each of the {ctrl,vty}x{python,transcript} tests can be invoked individually by e.g. 'make vty-python-test'. Both 'vty-transcript-test' and 'ctrl-transcript-test' are still empty, a subsequent patch adds a vty-transcript-test. All of this in preparation of tweaking the 'mncc' vty configuration, to be able to track it in a vty transcript test. Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 --- M tests/Makefile.am 1 file changed, 41 insertions(+), 6 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/Makefile.am b/tests/Makefile.am index f6b33fc..a6a4011 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -43,20 +43,55 @@ $(NULL) if ENABLE_EXT_TESTS +# don't run multiple tests concurrently so that the ports don't conflict python-tests: $(BUILT_SOURCES) - osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v - $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v + $(MAKE) vty-test + $(MAKE) ctrl-test if BUILD_SMPP - $(srcdir)/smpp_test_runner.py -w $(abs_top_builddir) -v + $(MAKE) smpp-test endif - rm -f $(top_builddir)/sms.db + else python-tests: $(BUILT_SOURCES) echo "Not running python-based tests (determined at configure-time)" endif +vty-python-test: $(BUILT_SOURCES) + osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v + rm -f $(top_builddir)/sms.db + +# To update the VTY script from current application behavior, +# pass -u to vty_script_runner.py by doing: +# make vty-transcript-test U=-u +vty-transcript-test: + echo "No vty-transcript-test exists yet" + +# don't run multiple tests concurrently so that the ports don't conflict +vty-test: + $(MAKE) vty-python-test + $(MAKE) vty-transcript-test + +ctrl-python-test: $(BUILT_SOURCES) + $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v + rm -f $(top_builddir)/sms.db + +# To update the CTRL script from current application behavior, +# pass -u to ctrl_script_runner.py by doing: +# make ctrl-transcript-test U=-u +ctrl-transcript-test: + echo "No ctrl-transcript-test exists yet" + +# don't run multiple tests concurrently so that the ports don't conflict +ctrl-test: + $(MAKE) ctrl-python-test + $(MAKE) ctrl-transcript-test + +smpp-test: + $(srcdir)/smpp_test_runner.py -w $(abs_top_builddir) -v + rm -f $(top_builddir)/sms.db + check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) $(MAKE) $(AM_MAKEFLAGS) python-tests -- To view, visit https://gerrit.osmocom.org/12126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I688657e56ae469c07b9f25ba37275d38dbd457e2 Gerrit-Change-Number: 12126 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:35:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:35:14 +0000 Subject: Change in osmo-msc[master]: add test_nodes.vty transcript test In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12127 ) Change subject: add test_nodes.vty transcript test ...................................................................... add test_nodes.vty transcript test It needs to work whether SMPP,Iu are enable or disabled, hence a bit more wildcarding than one might expect. Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 107 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/Makefile.am b/tests/Makefile.am index a6a4011..dc5194c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -34,6 +34,7 @@ vty_test_runner.py \ ctrl_test_runner.py \ smpp_test_runner.py \ + test_nodes.vty \ $(NULL) TESTSUITE = $(srcdir)/testsuite @@ -66,7 +67,11 @@ # pass -u to vty_script_runner.py by doing: # make vty-transcript-test U=-u vty-transcript-test: - echo "No vty-transcript-test exists yet" + osmo_verify_transcript_vty.py -v \ + -n OsmoMSC -p 4254 \ + -r "$(top_builddir)/src/osmo-msc/osmo-msc -c $(top_srcdir)/doc/examples/osmo-msc/osmo-msc.cfg" \ + $(U) $(srcdir)/*.vty + rm -f $(builddir)/sms.db # don't run multiple tests concurrently so that the ports don't conflict vty-test: diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty new file mode 100644 index 0000000..e03ed00 --- /dev/null +++ b/tests/test_nodes.vty @@ -0,0 +1,101 @@ +OsmoMSC> enable +OsmoMSC# configure terminal +OsmoMSC(config)# list +... + network + msc + mncc-int + hlr +... + +OsmoMSC(config)# network +OsmoMSC(config-net)# list +... + network country code <1-999> + mobile network code <0-999> + short name NAME + long name NAME + encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] + authentication (optional|required) + rrlp mode (none|ms-based|ms-preferred|ass-preferred) + mm info (0|1) + timezone <-19-19> (0|15|30|45) + timezone <-19-19> (0|15|30|45) <0-2> + no timezone + periodic location update <6-1530> + no periodic location update + +OsmoMSC(config-net)# exit +OsmoMSC(config)# msc +OsmoMSC(config-msc)# list +... + assign-tmsi + mncc-guard-timeout <0-255> + no assign-tmsi + auth-tuple-max-reuse-count <-1-2147483647> + auth-tuple-reuse-on-error (0|1) + cs7-instance-a <0-15> + cs7-instance-iu <0-15> + paging response-timer (default|<1-65535>) + emergency-call route-to-msisdn MSISDN + mgw local-ip A.B.C.D + mgw local-port <0-65535> + mgw remote-ip A.B.C.D + mgw remote-port <0-65535> + mgw endpoint-range <1-65534> <1-65534> + mgw bts-base <0-65534> +... + +OsmoMSC(config-msc)# exit +OsmoMSC(config)# mncc-int +OsmoMSC(config-mncc-int)# list +... + default-codec tch-f (fr|efr|amr) + default-codec tch-h (hr|amr) + +OsmoMSC(config-mncc-int)# exit +OsmoMSC(config)# hlr +OsmoMSC(config-hlr)# list +... + remote-ip A.B.C.D + remote-port <1-65535> + +OsmoMSC(config-hlr)# exit +OsmoMSC(config)# exit +OsmoMSC# configure terminal +OsmoMSC(config)# network +OsmoMSC(config-net)# end +OsmoMSC# disable +OsmoMSC> enable + +OsmoMSC# ! Punching some '...' holes because of optional SMPP, Iu +OsmoMSC# show running-config +... +network + network country code 001 + mobile network code 01 + short name OsmoMSC + long name OsmoMSC + encryption a5 0 + authentication optional + rrlp mode none + mm info 1 + periodic location update 30 +msc + mncc-guard-timeout 180 + assign-tmsi + cs7-instance-a 0 +... + auth-tuple-max-reuse-count 3 + auth-tuple-reuse-on-error 1 + mgw local-port 2728 + mgw remote-ip 10.23.24.1 + mgw remote-port 2427 +mncc-int + default-codec tch-f fr + default-codec tch-h hr +... +hlr + remote-ip 127.0.0.1 + remote-port 4222 +end -- To view, visit https://gerrit.osmocom.org/12127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3a8c50d8d555b6b948d97d6412e17594ee439de0 Gerrit-Change-Number: 12127 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:35:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:35:15 +0000 Subject: Change in osmo-msc[master]: cosmetic: msc_main.c: default args definition style In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12128 ) Change subject: cosmetic: msc_main.c: default args definition style ...................................................................... cosmetic: msc_main.c: default args definition style Explicitly name each arg with its default value, omit zero values, end last item in comma. Change-Id: I0e0f1e2c8722768b6c61fd6544911b20fe1af212 --- M src/osmo-msc/msc_main.c 1 file changed, 3 insertions(+), 5 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index afab417..07e4c8b 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -96,11 +96,9 @@ const char *mncc_sock_path; int use_db_counter; } msc_cmdline_config = { - "sms.db", - "osmo-msc.cfg", - 0, - 0, - 1 + .database_name = "sms.db", + .config_file = "osmo-msc.cfg", + .use_db_counter = 1, }; /* timer to store statistics */ -- To view, visit https://gerrit.osmocom.org/12128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0e0f1e2c8722768b6c61fd6544911b20fe1af212 Gerrit-Change-Number: 12128 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:35:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:35:16 +0000 Subject: Change in osmo-msc[master]: msc_main: mncc: move mncc socket decision to after read_cfg In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12129 ) Change subject: msc_main: mncc: move mncc socket decision to after read_cfg ...................................................................... msc_main: mncc: move mncc socket decision to after read_cfg First step towards allowing to configure the MNCC socket path by config file. Rationale: see I2ec59d5eba407f83295528b51b93678d446b9cee Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 --- M src/osmo-msc/msc_main.c 1 file changed, 4 insertions(+), 5 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 07e4c8b..157d5ae 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -545,11 +545,9 @@ /* Parse options */ handle_options(argc, argv); - /* Allocate global gsm_network struct; choose socket/internal MNCC */ - msc_network = msc_network_alloc(tall_msc_ctx, - msc_cmdline_config.mncc_sock_path? - mncc_sock_from_cc - : int_mncc_recv); + /* Allocate global gsm_network struct. + * At first set the internal MNCC as default, may be changed below according to cfg or cmdline option. */ + msc_network = msc_network_alloc(tall_msc_ctx, int_mncc_recv); if (!msc_network) return -ENOMEM; @@ -577,6 +575,7 @@ /* Initialize MNCC socket if appropriate */ if (msc_cmdline_config.mncc_sock_path) { + msc_network->mncc_recv = mncc_sock_from_cc; rc = mncc_sock_init(msc_network, msc_cmdline_config.mncc_sock_path); if (rc) { -- To view, visit https://gerrit.osmocom.org/12129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifc87c1cacaa809d04fc23e8ccd761bee4509c805 Gerrit-Change-Number: 12129 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:35:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:35:17 +0000 Subject: Change in osmo-msc[master]: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12130 ) Change subject: vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' ...................................................................... vty: mncc cfg: separate the 'mncc' from 'mncc-guard-timeout' I want to add 'mncc internal' and 'mncc external' commands, and IMHO makes most sense to have a common 'mncc' keyword to start MNCC config commands with. To put it in terms of VTY online help: OsmoMSC(config-msc)# mncc ? internal Use internal MNCC handler external Use internal MNCC handler guard-timeout Set global guard timeout So far only the 'guard-timeout' exists, I want to add 'internal' and 'external' in a subsequent commit. Keep the old command 'mncc-guard-timeout' as deprecated alias. That means it still works from old config files, but online documentation will omit it. On 'write', write back the new format instead. Rationale: see I2ec59d5eba407f83295528b51b93678d446b9cee Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 16 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index aaefb0b..d9e57a7 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -335,16 +335,25 @@ return CMD_SUCCESS; } +#define MNCC_STR "Configure Mobile Network Call Control\n" +#define MNCC_GUARD_TIMEOUT_STR "Set global guard timer for mncc interface activity\n" +#define MNCC_GUARD_TIMEOUT_VALUE_STR "guard timer value (sec.)\n" + DEFUN(cfg_msc_mncc_guard_timeout, cfg_msc_mncc_guard_timeout_cmd, - "mncc-guard-timeout <0-255>", - "Set global guard timer for mncc interface activity\n" - "guard timer value (sec.)") + "mncc guard-timeout <0-255>", + MNCC_STR + MNCC_GUARD_TIMEOUT_STR MNCC_GUARD_TIMEOUT_VALUE_STR) { gsmnet->mncc_guard_timeout = atoi(argv[0]); return CMD_SUCCESS; } +ALIAS_DEPRECATED(cfg_msc_mncc_guard_timeout, + cfg_msc_deprecated_mncc_guard_timeout_cmd, + "mncc-guard-timeout <0-255>", + MNCC_GUARD_TIMEOUT_STR MNCC_GUARD_TIMEOUT_VALUE_STR); + DEFUN(cfg_msc_assign_tmsi, cfg_msc_assign_tmsi_cmd, "assign-tmsi", "Assign TMSI during Location Updating.\n") @@ -433,7 +442,7 @@ static int config_write_msc(struct vty *vty) { vty_out(vty, "msc%s", VTY_NEWLINE); - vty_out(vty, " mncc-guard-timeout %i%s", + vty_out(vty, " mncc guard-timeout %i%s", gsmnet->mncc_guard_timeout, VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", gsmnet->vlr->cfg.assign_tmsi? "" : "no ", VTY_NEWLINE); @@ -1443,6 +1452,7 @@ install_node(&msc_node, config_write_msc); install_element(MSC_NODE, &cfg_msc_assign_tmsi_cmd); install_element(MSC_NODE, &cfg_msc_mncc_guard_timeout_cmd); + install_element(MSC_NODE, &cfg_msc_deprecated_mncc_guard_timeout_cmd); install_element(MSC_NODE, &cfg_msc_no_assign_tmsi_cmd); install_element(MSC_NODE, &cfg_msc_auth_tuple_max_reuse_count_cmd); install_element(MSC_NODE, &cfg_msc_auth_tuple_reuse_on_error_cmd); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index e03ed00..9fa9d2a 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -30,7 +30,7 @@ OsmoMSC(config-msc)# list ... assign-tmsi - mncc-guard-timeout <0-255> + mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) @@ -82,7 +82,7 @@ mm info 1 periodic location update 30 msc - mncc-guard-timeout 180 + mncc guard-timeout 180 assign-tmsi cs7-instance-a 0 ... -- To view, visit https://gerrit.osmocom.org/12130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I52d69af48e1ddc87b3fb54bf66a01b1b8cbf5abe Gerrit-Change-Number: 12130 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:35:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:35:18 +0000 Subject: Change in osmo-msc[master]: add VTY commands: mncc internal / external (== -M) In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12131 ) Change subject: add VTY commands: mncc internal / external (== -M) ...................................................................... add VTY commands: mncc internal / external (== -M) So far the only way to use external MNCC is to pass the -M cmdline arg: osmo-msc -M /path/to/socket However, the osmo-msc.service file for systemd is installed by 'make install', and hence it is quite impractical to depend on such a config item to be required in the service file: - It defies any scheme an operator may have in place to compose the osmo-msc.cfg file -- this option doesn't go in the .cfg file but needs separate action to add to the installed service file. - After a make install or package upgrades / re-installations, this option will be plain overwritten silently, or lead to the need for resolving file conflicts. The initial spark for this came from configuring the 35c3 GSM from cfg templates. Change-Id: I2ec59d5eba407f83295528b51b93678d446b9cee --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/msc_common.h M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 6 files changed, 68 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index d3cb7d8..63af3e7 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -140,6 +140,7 @@ struct osmo_counter *active_nc_ss; /* layer 4 */ + char *mncc_sock_path; struct mncc_sock_state *mncc_state; mncc_recv_cb_t mncc_recv; struct llist_head upqueue; diff --git a/include/osmocom/msc/msc_common.h b/include/osmocom/msc/msc_common.h index ffe8902..3ca3469 100644 --- a/include/osmocom/msc/msc_common.h +++ b/include/osmocom/msc/msc_common.h @@ -15,6 +15,7 @@ typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *); struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv); +void gsm_network_set_mncc_sock_path(struct gsm_network *net, const char *mncc_sock_path); int msc_vlr_alloc(struct gsm_network *net); int msc_vlr_start(struct gsm_network *net); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index d9e57a7..e1d1b40 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -339,6 +339,25 @@ #define MNCC_GUARD_TIMEOUT_STR "Set global guard timer for mncc interface activity\n" #define MNCC_GUARD_TIMEOUT_VALUE_STR "guard timer value (sec.)\n" +DEFUN(cfg_msc_mncc_internal, + cfg_msc_mncc_internal_cmd, + "mncc internal", + MNCC_STR "Use internal MNCC handler (default; changes need a program restart)\n") +{ + gsm_network_set_mncc_sock_path(gsmnet, NULL); + return CMD_SUCCESS; +} + +DEFUN(cfg_msc_mncc_external, + cfg_msc_mncc_external_cmd, + "mncc external MNCC_SOCKET_PATH", + MNCC_STR "Use external MNCC handler (changes need a program restart)\n" + "File system path to create the MNCC unix domain socket at\n") +{ + gsm_network_set_mncc_sock_path(gsmnet, argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_msc_mncc_guard_timeout, cfg_msc_mncc_guard_timeout_cmd, "mncc guard-timeout <0-255>", @@ -442,6 +461,8 @@ static int config_write_msc(struct vty *vty) { vty_out(vty, "msc%s", VTY_NEWLINE); + if (gsmnet->mncc_sock_path) + vty_out(vty, " mncc external %s%s", gsmnet->mncc_sock_path, VTY_NEWLINE); vty_out(vty, " mncc guard-timeout %i%s", gsmnet->mncc_guard_timeout, VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", @@ -1451,6 +1472,8 @@ install_element(CONFIG_NODE, &cfg_msc_cmd); install_node(&msc_node, config_write_msc); install_element(MSC_NODE, &cfg_msc_assign_tmsi_cmd); + install_element(MSC_NODE, &cfg_msc_mncc_internal_cmd); + install_element(MSC_NODE, &cfg_msc_mncc_external_cmd); install_element(MSC_NODE, &cfg_msc_mncc_guard_timeout_cmd); install_element(MSC_NODE, &cfg_msc_deprecated_mncc_guard_timeout_cmd); install_element(MSC_NODE, &cfg_msc_no_assign_tmsi_cmd); diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 52277b7..37c1d15 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -76,6 +76,13 @@ return net; } +void gsm_network_set_mncc_sock_path(struct gsm_network *net, const char *mncc_sock_path) +{ + if (net->mncc_sock_path) + talloc_free(net->mncc_sock_path); + net->mncc_sock_path = mncc_sock_path ? talloc_strdup(net, mncc_sock_path) : NULL; +} + /* Receive a SAPI-N-REJECT from BSC */ void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci) { diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 157d5ae..8500b97 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -573,11 +573,20 @@ return 1; } - /* Initialize MNCC socket if appropriate */ + /* Initialize MNCC socket if appropriate. If the cmdline option -M is present, it overrides the .cfg file + * setting 'msc' / 'mncc external MNCC_SOCKET_PATH'. Note that when -M is given, it "bleeds" back into the vty + * 'write' command and is reflected in the written out 'mncc external' cfg. */ if (msc_cmdline_config.mncc_sock_path) { + LOGP(DMNCC, LOGL_NOTICE, + "MNCC socket path is configured from commandline argument -M." + " This affects a written-back config file. Instead consider using the config file directly" + " ('msc' / 'mncc external MNCC_SOCKET_PATH').\n"); + gsm_network_set_mncc_sock_path(msc_network, msc_cmdline_config.mncc_sock_path); + } + if (msc_network->mncc_sock_path) { msc_network->mncc_recv = mncc_sock_from_cc; rc = mncc_sock_init(msc_network, - msc_cmdline_config.mncc_sock_path); + msc_network->mncc_sock_path); if (rc) { fprintf(stderr, "MNCC socket initialization failed. exiting.\n"); exit(1); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 9fa9d2a..c4ab387 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -30,6 +30,8 @@ OsmoMSC(config-msc)# list ... assign-tmsi + mncc internal + mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> @@ -46,6 +48,29 @@ mgw bts-base <0-65534> ... +OsmoMSC(config-msc)# mncc? + mncc Configure Mobile Network Call Control + +OsmoMSC(config-msc)# mncc ? + internal Use internal MNCC handler (default; changes need a program restart) + external Use external MNCC handler (changes need a program restart) + guard-timeout Set global guard timer for mncc interface activity + +OsmoMSC(config-msc)# mncc external ? + MNCC_SOCKET_PATH File system path to create the MNCC unix domain socket at + +OsmoMSC(config-msc)# mncc external /path/not/used +OsmoMSC(config-msc)# show running-config +... +msc +... + mncc external /path/not/used +... + +OsmoMSC(config-msc)# mncc internal +OsmoMSC(config-msc)# show running-config +... ! mncc external + OsmoMSC(config-msc)# exit OsmoMSC(config)# mncc-int OsmoMSC(config-mncc-int)# list -- To view, visit https://gerrit.osmocom.org/12131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2ec59d5eba407f83295528b51b93678d446b9cee Gerrit-Change-Number: 12131 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:35:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:35:44 +0000 Subject: Change in libosmocore[master]: gsm_29_118: add missing extern for struct value_string decl. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12144 ) Change subject: gsm_29_118: add missing extern for struct value_string decl. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6c4cbea649f790fa4db1ed2fe2b7e76a60291b4 Gerrit-Change-Number: 12144 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 05 Dec 2018 19:35:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:35:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:35:47 +0000 Subject: Change in libosmocore[master]: gsm_29_118: add missing extern for struct value_string decl. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12144 ) Change subject: gsm_29_118: add missing extern for struct value_string decl. ...................................................................... gsm_29_118: add missing extern for struct value_string decl. The value string arrays in the header file (gsm_29_118.h) are not declared as extern. Lets add it now. Change-Id: Ib6c4cbea649f790fa4db1ed2fe2b7e76a60291b4 Related: OS#3615 --- M include/osmocom/gsm/protocol/gsm_29_118.h 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h index bf210ad..97a9c43 100644 --- a/include/osmocom/gsm/protocol/gsm_29_118.h +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -35,7 +35,7 @@ /* unassigned */ SGSAP_MSGT_UE_UNREACHABLE = 0x1f, }; -const struct value_string sgsap_msg_type_names[]; +extern const struct value_string sgsap_msg_type_names[]; static inline const char *sgsap_msg_type_name(enum sgsap_msg_type msgt) { return get_value_string(sgsap_msg_type_names, msgt); } @@ -74,7 +74,7 @@ SGSAP_IE_ADDL_PAGING_INDICATORS = 0x26, SGSAP_IE_TMSI_BASED_NRI_CONT = 0x27, }; -const struct value_string sgsap_iei_names[]; +extern const struct value_string sgsap_iei_names[]; static inline const char *sgsap_iei_name(enum sgsap_iei iei) { return get_value_string(sgsap_iei_names, iei); } @@ -84,7 +84,7 @@ SGSAP_EPS_LUT_IMSI_ATTACH = 0x01, SGSAP_EPS_LUT_NORMAL = 0x02, }; -const struct value_string sgsap_eps_lu_type_names[]; +extern const struct value_string sgsap_eps_lu_type_names[]; static inline const char *sgsap_eps_lu_type_name(enum sgsap_eps_lu_type lut) { return get_value_string(sgsap_eps_lu_type_names, lut); } @@ -95,7 +95,7 @@ SGSAP_ID_EPS_T_UE_INITIATED = 0x02, SGSAP_ID_EPS_T_EPS_NOT_ALLOWED = 0x03, }; -const struct value_string sgsap_ismi_det_eps_type_names[]; +extern const struct value_string sgsap_ismi_det_eps_type_names[]; static inline const char *sgsap_imsi_det_eps_type_name(enum sgsap_imsi_det_eps_type idt) { return get_value_string(sgsap_ismi_det_eps_type_names, idt); } @@ -106,7 +106,7 @@ SGSAP_ID_NONEPS_T_COMBINED_UE_EPS_NONEPS = 0x02, SGSAP_ID_NONEPS_T_IMPLICIT_UE_EPS_NONEPS = 0x03, }; -const struct value_string sgsap_ismi_det_noneps_type_names[]; +extern const struct value_string sgsap_ismi_det_noneps_type_names[]; static inline const char *sgsap_imsi_det_noneps_type_name(enum sgsap_imsi_det_noneps_type idt) { return get_value_string(sgsap_ismi_det_noneps_type_names, idt); } @@ -116,7 +116,7 @@ SGSAP_SERV_IND_CS_CALL = 0x01, SGSAP_SERV_IND_SMS = 0x02, }; -const struct value_string sgsap_service_ind_names[]; +extern const struct value_string sgsap_service_ind_names[]; static inline const char *sgsap_service_ind_name(enum sgsap_service_ind si) { return get_value_string(sgsap_service_ind_names, si); } @@ -138,7 +138,7 @@ SGSAP_SGS_CAUSE_MT_CSFB_REJ_USER = 0x0d, SGSAP_SGS_CAUSE_UE_TEMP_UNREACHABLE = 0x0e, }; -const struct value_string sgsap_sgs_cause_names[]; +extern const struct value_string sgsap_sgs_cause_names[]; static inline const char *sgsap_sgs_cause_name(enum sgsap_sgs_cause cause) { return get_value_string(sgsap_sgs_cause_names, cause); } @@ -148,7 +148,7 @@ SGSAP_UE_EMM_MODE_IDLE = 0x00, SGSAP_UE_EMM_MODE_CONNECTED = 0x01, }; -const struct value_string sgsap_ue_emm_mode_names[]; +extern const struct value_string sgsap_ue_emm_mode_names[]; static inline const char *sgsap_ue_emm_mode_name(enum sgsap_ue_emm_mode mode) { return get_value_string(sgsap_ue_emm_mode_names, mode); } -- To view, visit https://gerrit.osmocom.org/12144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib6c4cbea649f790fa4db1ed2fe2b7e76a60291b4 Gerrit-Change-Number: 12144 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:39:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:39:32 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 19:39:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:40:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:40:23 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... paging: Add VTY options to calculate T3113 timeout dynamically The idea is to have a base static value which is set like before "timer t3113 [seconds]", but now have a part of this timeout calculated dynamically based on BTS channel configuration and channel load. This patch only implements initial support to calculate based on channel configuration, but doesn't include code to calculate based on channel load. To implement the later part, we probably need to keep track of BTS paging queues per paging group, which we don't do nowadays. Dynamic calculation is enabled by default, and default static base value is decreased accordingly. This way, in a typical setup were the default 10 seconds were used, now the calculated final value is 11 seconds. That's intended because it was observed experimentally in osmo-gsm-tester with a similar channel setup that sometimes paging response can arrive slightly later than 10 seconds. Related: OS#3680 Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/gsm_timers.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/gsm_timers_vty.c M src/osmo-bsc/net_init.c M src/osmo-bsc/paging.c 7 files changed, 86 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 0b472a4..e57da55 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1147,6 +1147,7 @@ /* BTS-specific overrides for timer values from struct gsm_network. */ uint8_t T3122; /* ASSIGMENT REJECT wait indication */ + bool T3113_dynamic; /* Calculate T3113 timeout dynamically based on BTS channel config and load */ /* Periodic channel load measurements are used to maintain T3122. */ struct load_counter chan_load_samples[7]; diff --git a/include/osmocom/bsc/gsm_timers.h b/include/osmocom/bsc/gsm_timers.h index 78f04ed..699c461 100644 --- a/include/osmocom/bsc/gsm_timers.h +++ b/include/osmocom/bsc/gsm_timers.h @@ -37,7 +37,7 @@ void T_defs_vty_init(struct T_def *T_defs, int cfg_parent_node); void T_defs_vty_write(struct vty *vty, const char *indent); - +struct T_def *parse_T_arg(struct vty *vty, const char *T_str); struct state_timeout { int T; diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 983dcb9..8c7d8e1 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3951,6 +3951,56 @@ return check_amr_config(vty); } +#define TNUM_STR "T-number, optionally preceded by 't' or 'T'\n" +DEFUN(cfg_bts_t3113_dynamic, cfg_bts_t3113_dynamic_cmd, + "timer-dynamic TNNNN", + "Calculate T3113 dynamically based on channel config and load\n" + TNUM_STR) +{ + struct T_def *d; + struct gsm_bts *bts = vty->index; + + d = parse_T_arg(vty, argv[0]); + if (!d) + return CMD_WARNING; + + switch (d->T) { + case 3113: + bts->T3113_dynamic = true; + break; + default: + vty_out(vty, "T%d cannot be set to dynamic%s", d->T, VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_bts_no_t3113_dynamic, cfg_bts_no_t3113_dynamic_cmd, + "no timer-dynamic TNNNN", + NO_STR + "Set given timer to non-dynamic and use the default or user provided fixed value\n" + TNUM_STR) +{ + struct T_def *d; + struct gsm_bts *bts = vty->index; + + d = parse_T_arg(vty, argv[0]); + if (!d) + return CMD_WARNING; + + switch (d->T) { + case 3113: + bts->T3113_dynamic = false; + break; + default: + vty_out(vty, "T%d already is non-dynamic%s", d->T, VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + #define TRX_TEXT "Radio Transceiver\n" /* per TRX configuration */ @@ -5129,6 +5179,8 @@ install_element(BTS_NODE, &cfg_bts_no_acc_ramping_cmd); install_element(BTS_NODE, &cfg_bts_acc_ramping_step_interval_cmd); install_element(BTS_NODE, &cfg_bts_acc_ramping_step_size_cmd); + install_element(BTS_NODE, &cfg_bts_t3113_dynamic_cmd); + install_element(BTS_NODE, &cfg_bts_no_t3113_dynamic_cmd); neighbor_ident_vty_init(network, network->neighbor_bss_cells); /* See also handover commands added on bts level from handover_vty.c */ diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 6d39642..0f76a27 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -849,6 +849,7 @@ /* timer overrides */ bts->T3122 = 0; /* not overriden by default */ + bts->T3113_dynamic = true; /* dynamic by default */ bts->dtxu = GSM48_DTX_SHALL_NOT_BE_USED; bts->dtxd = false; diff --git a/src/osmo-bsc/gsm_timers_vty.c b/src/osmo-bsc/gsm_timers_vty.c index de61e24..e744dfa 100644 --- a/src/osmo-bsc/gsm_timers_vty.c +++ b/src/osmo-bsc/gsm_timers_vty.c @@ -32,7 +32,7 @@ /* Parse an argument like "T1234", "t1234" or "1234" and return the corresponding T_def entry from * g_vty_T_defs, if any. */ -static struct T_def *parse_T_arg(struct vty *vty, const char *T_str) +struct T_def *parse_T_arg(struct vty *vty, const char *T_str) { int T; struct T_def *d; diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c index 1199bdc..5ea564d 100644 --- a/src/osmo-bsc/net_init.c +++ b/src/osmo-bsc/net_init.c @@ -37,7 +37,7 @@ { .T=3109, .default_val=5, .desc="RSL SACCH deactivation" }, { .T=3111, .default_val=2, .desc="Wait time before RSL RF Channel Release" }, { .T=993111, .default_val=4, .desc="Wait time after lchan was released in error (should be T3111 + 2s)" }, - { .T=3113, .default_val=10, .desc="Paging"}, + { .T=3113, .default_val=7, .desc="Paging"}, { .T=3115, .default_val=10, .desc="(unused)" }, { .T=3117, .default_val=10, .desc="(unused)" }, { .T=3119, .default_val=10, .desc="(unused)" }, diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index afe3245..246114f 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -287,6 +287,32 @@ paging_remove_request(&req->bts->paging, req); } +#define GSM_FRAME_DURATION_us 4615 +#define GSM51_MFRAME_DURATION_us (51 * GSM_FRAME_DURATION_us) /* 235365 us */ +static unsigned int calculate_timer_3113(struct gsm_bts *bts) +{ + unsigned int to_us, to; + struct T_def *d = T_def_get_entry(bts->network->T_defs, 3113); + + if (!bts->T3113_dynamic) + return d->val; + + /* TODO: take into account load of paging group for req->bsub */ + + /* MFRMS defines repeat interval of paging messages for MSs that belong + * to same paging group accross multiple 51 frame multiframes. + * MAXTRANS defines maximum number of RACH retransmissions. + */ + to_us = GSM51_MFRAME_DURATION_us * (bts->si_common.chan_desc.bs_pa_mfrms + 2) * + bts->si_common.rach_control.max_trans; + + /* ceiling in seconds + extra time */ + to = (to_us + 999999) / 1000000 + d->val; + LOGP(DPAG, LOGL_DEBUG, "(bts=%d) Paging request: T3113 expires in %u seconds\n", + bts->nr, to); + return to; +} + /*! Start paging + paging timer for given subscriber on given BTS * \param bts BTS on which to page * \param[in] bsub subscriber we want to page @@ -298,6 +324,7 @@ { struct gsm_bts_paging_state *bts_entry = &bts->paging; struct gsm_paging_request *req; + unsigned int t3113_timeout_s; rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_PAGING_ATTEMPTED]); @@ -317,7 +344,8 @@ req->chan_type = type; req->msc = msc; osmo_timer_setup(&req->T3113, paging_T3113_expired, req); - osmo_timer_schedule(&req->T3113, T_def_get(bts->network->T_defs, 3113, T_S, -1), 0); + t3113_timeout_s = calculate_timer_3113(bts); + osmo_timer_schedule(&req->T3113, t3113_timeout_s, 0); llist_add_tail(&req->entry, &bts_entry->pending_requests); paging_schedule_if_needed(bts_entry); -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 7 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:41:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:41:31 +0000 Subject: Change in osmo-trx[master]: SigProcLib: Improve Vector buffer allocation mess In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12085 ) Change subject: SigProcLib: Improve Vector buffer allocation mess ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie484a4762a7f77fe1b105188ea03a6f025730b82 Gerrit-Change-Number: 12085 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 05 Dec 2018 19:41:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:41:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:41:34 +0000 Subject: Change in osmo-trx[master]: SigProcLib: Improve Vector buffer allocation mess In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12085 ) Change subject: SigProcLib: Improve Vector buffer allocation mess ...................................................................... SigProcLib: Improve Vector buffer allocation mess Original issue: In order to use SSE instructions, 16-byte aligned memory chunks are needed, and C++ version < C++11 doesn't provide for a native new/delete store. For that reason, memalign() must be used in the implementation of convolve_h_alloc() for some buffers. On the other side, The C++ code relies on C++ "new T[]" operator to allocate a chunk of memory containing an array of class instances. As classes are complex types, they cannot be allocated through C structures (calling malloc). Experimentally can be seen too that it's unreliable and the process will crash during startup if malloc() is used and then a Complex<> deferred from it. Previous implementation allowed for use of convolve_h_alloc or new[] based on how the (signal)Vector is called, because then the buffer is not going to be managed internally. But that's unreliable since resize() calling resize() on it could use "delete" operator on a malloc'ed buffer, and end up having a new new[] allocated buffer. It was also found that some of the callers were actually leaking memory through ASan (because the buffer is not managed by the Vector instance). IMHO best option would be to rewrite all this code using C structures and malloc/free exclusively, since it would make all this cod eeasier to maintain. But for now, let's extend the Vector class to allow specifying an external alloc/free function and let the Vector instance take care of the ownership of the buffer in all scenarios. Change-Id: Ie484a4762a7f77fe1b105188ea03a6f025730b82 --- M CommonLibs/Vector.h M Transceiver52M/arch/common/convolve.h M Transceiver52M/arch/common/convolve_base.c M Transceiver52M/sigProcLib.cpp M Transceiver52M/signalVector.cpp M Transceiver52M/signalVector.h 6 files changed, 52 insertions(+), 47 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/Vector.h b/CommonLibs/Vector.h index 9119683..4c96b78 100644 --- a/CommonLibs/Vector.h +++ b/CommonLibs/Vector.h @@ -32,11 +32,14 @@ #include #include #include +#include + // We cant use Logger.h in this file... extern int gVectorDebug; #define BVDEBUG(msg) if (gVectorDebug) {std::cout << msg;} - +typedef void (*vector_free_func)(void* wData); +typedef void *(*vector_alloc_func)(size_t newSize); /** A simplified Vector template with aliases. @@ -60,6 +63,8 @@ T* mData; ///< allocated data block, if any T* mStart; ///< start of useful data T* mEnd; ///< end of useful data + 1 + vector_alloc_func mAllocFunc; ///< function used to alloc new mData during resize. + vector_free_func mFreeFunc; ///< function used to free mData. public: @@ -85,9 +90,19 @@ /** Change the size of the Vector, discarding content. */ void resize(size_t newSize) { - if (mData!=NULL) delete[] mData; + if (mData!=NULL) { + if (mFreeFunc) + mFreeFunc(mData); + else + delete[] mData; + } if (newSize==0) mData=NULL; - else mData = new T[newSize]; + else { + if (mAllocFunc) + mData = (T*) mAllocFunc(newSize); + else + mData = new T[newSize]; + } mStart = mData; mEnd = mStart + newSize; } @@ -116,29 +131,31 @@ //@{ /** Build an empty Vector of a given size. */ - Vector(size_t wSize=0):mData(NULL) { resize(wSize); } + Vector(size_t wSize=0, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL) + :mData(NULL), mAllocFunc(wAllocFunc), mFreeFunc(wFreeFunc) + { resize(wSize); } /** Build a Vector by moving another. */ Vector(Vector&& other) - :mData(other.mData),mStart(other.mStart),mEnd(other.mEnd) + :mData(other.mData),mStart(other.mStart),mEnd(other.mEnd), mAllocFunc(other.mAllocFunc), mFreeFunc(other.mFreeFunc) { other.mData=NULL; } /** Build a Vector by copying another. */ - Vector(const Vector& other):mData(NULL) { clone(other); } + Vector(const Vector& other):mData(NULL), mAllocFunc(other.mAllocFunc), mFreeFunc(other.mFreeFunc) { clone(other); } /** Build a Vector with explicit values. */ - Vector(T* wData, T* wStart, T* wEnd) - :mData(wData),mStart(wStart),mEnd(wEnd) + Vector(T* wData, T* wStart, T* wEnd, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL) + :mData(wData),mStart(wStart),mEnd(wEnd), mAllocFunc(wAllocFunc), mFreeFunc(wFreeFunc) { } /** Build a vector from an existing block, NOT to be deleted upon destruction. */ - Vector(T* wStart, size_t span) - :mData(NULL),mStart(wStart),mEnd(wStart+span) + Vector(T* wStart, size_t span, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL) + :mData(NULL),mStart(wStart),mEnd(wStart+span),mAllocFunc(wAllocFunc), mFreeFunc(wFreeFunc) { } /** Build a Vector by concatenation. */ - Vector(const Vector& other1, const Vector& other2) - :mData(NULL) + Vector(const Vector& other1, const Vector& other2, vector_alloc_func wAllocFunc=NULL, vector_free_func wFreeFunc=NULL) + :mData(NULL), mAllocFunc(wAllocFunc), mFreeFunc(wFreeFunc) { resize(other1.size()+other2.size()); memcpy(mStart, other1.mStart, other1.bytes()); @@ -162,6 +179,8 @@ mData=other.mData; mStart=other.mStart; mEnd=other.mEnd; + mAllocFunc=other.mAllocFunc; + mFreeFunc=other.mFreeFunc; other.mData=NULL; } diff --git a/Transceiver52M/arch/common/convolve.h b/Transceiver52M/arch/common/convolve.h index 43db577..095b04c 100644 --- a/Transceiver52M/arch/common/convolve.h +++ b/Transceiver52M/arch/common/convolve.h @@ -1,7 +1,7 @@ #ifndef _CONVOLVE_H_ #define _CONVOLVE_H_ -void *convolve_h_alloc(int num); +void *convolve_h_alloc(size_t num); int convolve_real(const float *x, int x_len, const float *h, int h_len, diff --git a/Transceiver52M/arch/common/convolve_base.c b/Transceiver52M/arch/common/convolve_base.c index 71453a1..2eb7124 100644 --- a/Transceiver52M/arch/common/convolve_base.c +++ b/Transceiver52M/arch/common/convolve_base.c @@ -146,7 +146,7 @@ } /* Aligned filter tap allocation */ -void *convolve_h_alloc(int len) +void *convolve_h_alloc(size_t len) { #ifdef HAVE_SSE3 return memalign(16, len * 2 * sizeof(float)); diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index 28c4ded..f720828 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -84,14 +84,13 @@ * perform 16-byte memory alignment required by many SSE instructions. */ struct CorrelationSequence { - CorrelationSequence() : sequence(NULL), buffer(NULL) + CorrelationSequence() : sequence(NULL) { } ~CorrelationSequence() { delete sequence; - free(buffer); } signalVector *sequence; @@ -106,8 +105,7 @@ * for SSE instructions. */ struct PulseSequence { - PulseSequence() : c0(NULL), c1(NULL), c0_inv(NULL), empty(NULL), - c0_buffer(NULL), c1_buffer(NULL), c0_inv_buffer(NULL) + PulseSequence() : c0(NULL), c1(NULL), c0_inv(NULL), empty(NULL) { } @@ -117,17 +115,12 @@ delete c1; delete c0_inv; delete empty; - free(c0_buffer); - free(c1_buffer); } signalVector *c0; signalVector *c1; signalVector *c0_inv; signalVector *empty; - void *c0_buffer; - void *c1_buffer; - void *c0_inv_buffer; }; static CorrelationSequence *gMidambles[] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; @@ -340,7 +333,7 @@ if (y && (len > y->size())) return NULL; if (!y) { - y = new signalVector(len); + y = new signalVector(len, convolve_h_alloc, free); alloc = true; } @@ -403,8 +396,7 @@ if (!pulse) return false; - pulse->c0_inv_buffer = convolve_h_alloc(5); - pulse->c0_inv = new signalVector((complex *) pulse->c0_inv_buffer, 0, 5); + pulse->c0_inv = new signalVector((complex *) convolve_h_alloc(5), 0, 5, convolve_h_alloc, free); pulse->c0_inv->isReal(true); pulse->c0_inv->setAligned(false); @@ -433,9 +425,7 @@ return false; } - pulse->c1_buffer = convolve_h_alloc(len); - pulse->c1 = new signalVector((complex *) - pulse->c1_buffer, 0, len); + pulse->c1 = new signalVector((complex *) convolve_h_alloc(len), 0, len, convolve_h_alloc, free); pulse->c1->isReal(true); /* Enable alignment for SSE usage */ @@ -489,8 +479,7 @@ len = 4; } - pulse->c0_buffer = convolve_h_alloc(len); - pulse->c0 = new signalVector((complex *) pulse->c0_buffer, 0, len); + pulse->c0 = new signalVector((complex *) convolve_h_alloc(len), 0, len, convolve_h_alloc, free); pulse->c0->isReal(true); /* Enable alingnment for SSE usage */ @@ -1019,7 +1008,7 @@ for (int i = 0; i < DELAYFILTS; i++) { data = (complex *) convolve_h_alloc(h_len); - h = new signalVector(data, 0, h_len); + h = new signalVector(data, 0, h_len, convolve_h_alloc, free); h->setAligned(true); h->isReal(true); @@ -1263,7 +1252,7 @@ /* For SSE alignment, reallocate the midamble sequence on 16-byte boundary */ data = (complex *) convolve_h_alloc(midMidamble->size()); - _midMidamble = new signalVector(data, 0, midMidamble->size()); + _midMidamble = new signalVector(data, 0, midMidamble->size(), convolve_h_alloc, free); _midMidamble->setAligned(true); midMidamble->copyTo(*_midMidamble); @@ -1274,7 +1263,6 @@ } gMidambles[tsc] = new CorrelationSequence; - gMidambles[tsc]->buffer = data; gMidambles[tsc]->sequence = _midMidamble; gMidambles[tsc]->gain = peakDetect(*autocorr, &toa, NULL); @@ -1319,13 +1307,12 @@ conjugateVector(*midamble); data = (complex *) convolve_h_alloc(midamble->size()); - _midamble = new signalVector(data, 0, midamble->size()); + _midamble = new signalVector(data, 0, midamble->size(), convolve_h_alloc, free); _midamble->setAligned(true); midamble->copyTo(*_midamble); /* Channel gain is an empirically measured value */ seq = new CorrelationSequence; - seq->buffer = data; seq->sequence = _midamble; seq->gain = Complex(-19.6432, 19.5006) / 1.18; seq->toa = 0; @@ -1360,7 +1347,7 @@ /* For SSE alignment, reallocate the midamble sequence on 16-byte boundary */ data = (complex *) convolve_h_alloc(seq1->size()); - _seq1 = new signalVector(data, 0, seq1->size()); + _seq1 = new signalVector(data, 0, seq1->size(), convolve_h_alloc, free); _seq1->setAligned(true); seq1->copyTo(*_seq1); @@ -1372,7 +1359,6 @@ *seq = new CorrelationSequence; (*seq)->sequence = _seq1; - (*seq)->buffer = data; (*seq)->gain = peakDetect(*autocorr, &toa, NULL); /* For 1 sps only diff --git a/Transceiver52M/signalVector.cpp b/Transceiver52M/signalVector.cpp index fc8157e..710eda5 100644 --- a/Transceiver52M/signalVector.cpp +++ b/Transceiver52M/signalVector.cpp @@ -1,20 +1,20 @@ #include "signalVector.h" -signalVector::signalVector(size_t size) - : Vector(size), +signalVector::signalVector(size_t size, vector_alloc_func wAllocFunc, vector_free_func wFreeFunc) + : Vector(size, wAllocFunc, wFreeFunc), real(false), aligned(false), symmetry(NONE) { } -signalVector::signalVector(size_t size, size_t start) - : Vector(size + start), +signalVector::signalVector(size_t size, size_t start, vector_alloc_func wAllocFunc, vector_free_func wFreeFunc) + : Vector(size + start, wAllocFunc, wFreeFunc), real(false), aligned(false), symmetry(NONE) { mStart = mData + start; } -signalVector::signalVector(complex *data, size_t start, size_t span) - : Vector(NULL, data + start, data + start + span), +signalVector::signalVector(complex *data, size_t start, size_t span, vector_alloc_func wAllocFunc, vector_free_func wFreeFunc) + : Vector(data, data + start, data + start + span, wAllocFunc, wFreeFunc), real(false), aligned(false), symmetry(NONE) { } diff --git a/Transceiver52M/signalVector.h b/Transceiver52M/signalVector.h index 83f141e..d9486af 100644 --- a/Transceiver52M/signalVector.h +++ b/Transceiver52M/signalVector.h @@ -13,13 +13,13 @@ class signalVector: public Vector { public: /** Default constructor */ - signalVector(size_t size = 0); + signalVector(size_t size = 0, vector_alloc_func wAllocFunc = NULL, vector_free_func wFreeFunc = NULL); /** Construct with head room */ - signalVector(size_t size, size_t start); + signalVector(size_t size, size_t start, vector_alloc_func wAllocFunc = NULL, vector_free_func wFreeFunc = NULL); /** Construct from existing buffer data (buffer not managed) */ - signalVector(complex *data, size_t start, size_t span); + signalVector(complex *data, size_t start, size_t span, vector_alloc_func wAllocFunc = NULL, vector_free_func wFreeFunc = NULL); /** Construct by from existing vector */ signalVector(const signalVector &vector); -- To view, visit https://gerrit.osmocom.org/12085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie484a4762a7f77fe1b105188ea03a6f025730b82 Gerrit-Change-Number: 12085 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:42:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:42:07 +0000 Subject: Change in osmo-gsm-tester[master]: test: cs_paging_gprs_active: Make sure gprs data (TBF) is ongoing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12143 ) Change subject: test: cs_paging_gprs_active: Make sure gprs data (TBF) is ongoing ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id29391d75101d94e2cd58f444b383f4c5217ab6a Gerrit-Change-Number: 12143 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 05 Dec 2018 19:42:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:43:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:43:11 +0000 Subject: Change in osmo-trx[master]: Add CTRL log category In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12120 ) Change subject: Add CTRL log category ...................................................................... Patch Set 2: Code-Review-1 > > Actually I would argue to log to DLCTRL in this case. Either you > > want to see logging of all CTRL related messages at a certain > lvel, > > or not... > > I don't really understand this comment. libosmocore IPA CTRL > interface has nothing to do with CTRL socket of the TRX, so for > sure I don't want them to be the same category. Don't call it CTRL if it's not CTRL. Please call it TRXCTRL or something else unambiguous. -- To view, visit https://gerrit.osmocom.org/12120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 Gerrit-Change-Number: 12120 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Wed, 05 Dec 2018 19:43:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:43:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:43:31 +0000 Subject: Change in osmo-trx[master]: lms: Allow setting Tx/RxGain for chan!=0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12096 ) Change subject: lms: Allow setting Tx/RxGain for chan!=0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5fae92a7ed5e2d92be12b9dfd33fc56195030c0b Gerrit-Change-Number: 12096 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 05 Dec 2018 19:43:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:43:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:43:35 +0000 Subject: Change in osmo-trx[master]: lms: Allow setting Tx/RxFreq for lchan!=0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12097 ) Change subject: lms: Allow setting Tx/RxFreq for lchan!=0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9dd0bb41d1863111d28947fc0d7c7e7ecfaf5fa8 Gerrit-Change-Number: 12097 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 19:43:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:43:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:43:47 +0000 Subject: Change in osmo-trx[master]: lms: Allow setting Tx/RxGain for chan!=0 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12096 ) Change subject: lms: Allow setting Tx/RxGain for chan!=0 ...................................................................... lms: Allow setting Tx/RxGain for chan!=0 Related: OS#3346 Change-Id: I5fae92a7ed5e2d92be12b9dfd33fc56195030c0b --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 0 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 712652a..21bcece 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -322,11 +322,6 @@ double LMSDevice::setTxGain(double dB, size_t chan) { - if (chan) { - LOGC(DDEV, ALERT) << "Invalid channel " << chan; - return 0.0; - } - if (dB > maxTxGain()) dB = maxTxGain(); if (dB < minTxGain()) @@ -342,11 +337,6 @@ double LMSDevice::setRxGain(double dB, size_t chan) { - if (chan) { - LOGC(DDEV, ALERT) << "Invalid channel " << chan; - return 0.0; - } - if (dB > maxRxGain()) dB = maxRxGain(); if (dB < minRxGain()) -- To view, visit https://gerrit.osmocom.org/12096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5fae92a7ed5e2d92be12b9dfd33fc56195030c0b Gerrit-Change-Number: 12096 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:43:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:43:47 +0000 Subject: Change in osmo-trx[master]: lms: Allow setting Tx/RxFreq for lchan!=0 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12097 ) Change subject: lms: Allow setting Tx/RxFreq for lchan!=0 ...................................................................... lms: Allow setting Tx/RxFreq for lchan!=0 Related: OS#3346 Change-Id: I9dd0bb41d1863111d28947fc0d7c7e7ecfaf5fa8 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 0 insertions(+), 11 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 21bcece..8f3d8e1 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -601,12 +601,6 @@ bool LMSDevice::setTxFreq(double wFreq, size_t chan) { - - if (chan) { - LOGC(DDEV, ALERT) << "Invalid channel " << chan; - return false; - } - if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_TX, chan, wFreq) < 0) { LOGC(DDEV, ALERT) << "set Tx: " << wFreq << " failed!"; return false; @@ -617,11 +611,6 @@ bool LMSDevice::setRxFreq(double wFreq, size_t chan) { - if (chan) { - LOGC(DDEV, ALERT) << "Invalid channel " << chan; - return false; - } - if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_RX, chan, wFreq) < 0) { LOGC(DDEV, ALERT) << "set Rx: " << wFreq << " failed!"; return false; -- To view, visit https://gerrit.osmocom.org/12097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9dd0bb41d1863111d28947fc0d7c7e7ecfaf5fa8 Gerrit-Change-Number: 12097 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:43:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:43:47 +0000 Subject: Change in osmo-trx[master]: lms: Improve Set{Rx, Tx}{Gain, Freq} logging In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12099 ) Change subject: lms: Improve Set{Rx,Tx}{Gain,Freq} logging ...................................................................... lms: Improve Set{Rx,Tx}{Gain,Freq} logging Change-Id: I6713a27c5f74beb7fcfdd712fcf695afccbc3d76 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 10 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 8f3d8e1..9804bbd 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -327,10 +327,10 @@ if (dB < minTxGain()) dB = minTxGain(); - LOGC(DDEV, NOTICE) << "Setting TX gain to " << dB << " dB."; + LOGC(DDEV, NOTICE) << "chan " << chan <<": Setting TX gain to " << dB << " dB"; if (LMS_SetGaindB(m_lms_dev, LMS_CH_TX, chan, dB) < 0) - LOGC(DDEV, ERR) << "Error setting TX gain"; + LOGC(DDEV, ERR) << "chan " << chan <<": Error setting TX gain to " << dB << " dB"; return dB; } @@ -342,10 +342,10 @@ if (dB < minRxGain()) dB = minRxGain(); - LOGC(DDEV, NOTICE) << "Setting RX gain to " << dB << " dB."; + LOGC(DDEV, NOTICE) << "chan "<< chan << ": Setting RX gain to " << dB << " dB"; if (LMS_SetGaindB(m_lms_dev, LMS_CH_RX, chan, dB) < 0) - LOGC(DDEV, ERR) << "Error setting RX gain"; + LOGC(DDEV, ERR) << "chan "<< chan << ": Error setting RX gain to " << dB << " dB"; return dB; } @@ -601,8 +601,10 @@ bool LMSDevice::setTxFreq(double wFreq, size_t chan) { + LOGC(DDEV, NOTICE) << "chan "<< chan << ": Setting Tx Freq to " << wFreq << " Hz"; + if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_TX, chan, wFreq) < 0) { - LOGC(DDEV, ALERT) << "set Tx: " << wFreq << " failed!"; + LOGC(DDEV, ERROR) << "chan "<< chan << ": Error setting Tx Freq to " << wFreq << " Hz"; return false; } @@ -611,8 +613,10 @@ bool LMSDevice::setRxFreq(double wFreq, size_t chan) { + LOGC(DDEV, NOTICE) << "chan "<< chan << ": Setting Rx Freq to " << wFreq << " Hz"; + if (LMS_SetLOFrequency(m_lms_dev, LMS_CH_RX, chan, wFreq) < 0) { - LOGC(DDEV, ALERT) << "set Rx: " << wFreq << " failed!"; + LOGC(DDEV, ERROR) << "chan "<< chan << ": Error setting Rx Freq to " << wFreq << " Hz"; return false; } -- To view, visit https://gerrit.osmocom.org/12099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6713a27c5f74beb7fcfdd712fcf695afccbc3d76 Gerrit-Change-Number: 12099 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:43:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:43:48 +0000 Subject: Change in osmo-trx[master]: transceiver: log chan on CTRL command received In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12100 ) Change subject: transceiver: log chan on CTRL command received ...................................................................... transceiver: log chan on CTRL command received Change-Id: Ia3b2a35e03a8aaddd6efebc8db2ccca872f51f20 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index d6ddce8..8702fb6 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -721,7 +721,7 @@ /* Set command pointer */ command = buffer + 4; - LOG(INFO) << "command is " << command; + LOG(INFO) << "chan " << chan << ": command is " << command; if (match_cmd(command, "POWEROFF", NULL)) { stop(); -- To view, visit https://gerrit.osmocom.org/12100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia3b2a35e03a8aaddd6efebc8db2ccca872f51f20 Gerrit-Change-Number: 12100 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:45:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:45:12 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: make NCSS session timeout configurable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12048 ) Change subject: SS/USSD: make NCSS session timeout configurable ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d Gerrit-Change-Number: 12048 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 05 Dec 2018 19:45:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:45:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:45:31 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: fix: properly (re)schedule NCSS session timeout In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12049 ) Change subject: SS/USSD: fix: properly (re)schedule NCSS session timeout ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11aeacf012b06d3d0b5cc6e64baecf857b645fda Gerrit-Change-Number: 12049 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 05 Dec 2018 19:45:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:45:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:45:34 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: release IUSE sessions immediately after response In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12023 ) Change subject: SS/USSD: release IUSE sessions immediately after response ...................................................................... SS/USSD: release IUSE sessions immediately after response At the moment, all available IUSE handlers do assume a single request-response operation, e.g. MS requests its MSISDN - IUSE responds. No further nor intermediate communications is required. Let's immediately terminate such SS sessions in order to avoid waiting for the session inactivity watchdog (i.e. timeout). Change-Id: Iaefe37512da79e10fbe92378236bfff0eae0f8b9 --- M src/hlr_ussd.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index ba373f3..b7aaba4 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -455,6 +455,8 @@ } else { /* Handle internally */ ss->u.iuse->handle_ussd(conn, ss, gsup, req); + /* Release session immediately */ + ss_session_free(ss); } } -- To view, visit https://gerrit.osmocom.org/12023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaefe37512da79e10fbe92378236bfff0eae0f8b9 Gerrit-Change-Number: 12023 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:45:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:45:34 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: make NCSS session timeout configurable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12048 ) Change subject: SS/USSD: make NCSS session timeout configurable ...................................................................... SS/USSD: make NCSS session timeout configurable It may happen that either the MS or an ESME would become unresponsive, e.g. due to a bug, or a dropped message. This is why we have SS session timeout, that prevents keeping 'stalled' sessions forever. Let's introduce a VTY option, which can be used to configure this timer (by default it's set to 30 seconds): hlr ... ! Use 0 to disable this timer ncss-guard-timeout 30 Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d Related: OS#3717 --- M src/hlr.c M src/hlr.h M src/hlr_ussd.c M src/hlr_ussd.h M src/hlr_vty.c M tests/test_nodes.vty 6 files changed, 29 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/hlr.c b/src/hlr.c index 14945b6..4873a66 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -611,6 +611,9 @@ INIT_LLIST_HEAD(&g_hlr->ss_sessions); INIT_LLIST_HEAD(&g_hlr->ussd_routes); + /* Init default (call independent) SS session guard timeout value */ + g_hlr->ncss_guard_timeout = NCSS_GUARD_TIMEOUT_DEFAULT; + rc = osmo_init_logging2(hlr_ctx, &hlr_log_info); if (rc < 0) { fprintf(stderr, "Error initializing logging\n"); diff --git a/src/hlr.h b/src/hlr.h index 315c3dd..e9cc747 100644 --- a/src/hlr.h +++ b/src/hlr.h @@ -45,6 +45,9 @@ struct hlr_euse *euse_default; struct llist_head iuse_list; + /* NCSS (call independent) session guard timeout value */ + int ncss_guard_timeout; + struct llist_head ussd_routes; struct llist_head ss_sessions; diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index b7aaba4..16a197c 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -209,10 +209,11 @@ OSMO_STRLCPY_ARRAY(ss->imsi, imsi); ss->session_id = session_id; osmo_timer_setup(&ss->timeout, ss_session_timeout, ss); - /* NOTE: The timeout is currently global and not refreshed with subsequent messages - * within the SS/USSD session. So 30s after the initial SS message, the session will - * timeout! */ - osmo_timer_schedule(&ss->timeout, 30, 0); + /* NOTE: The timeout is currently not refreshed with subsequent messages + * within the SS/USSD session. So X seconds after the initial SS message, + * the session will timeout! */ + if (g_hlr->ncss_guard_timeout > 0) + osmo_timer_schedule(&ss->timeout, g_hlr->ncss_guard_timeout, 0); llist_add_tail(&ss->list, &hlr->ss_sessions); return ss; diff --git a/src/hlr_ussd.h b/src/hlr_ussd.h index 0414924..393ca6c 100644 --- a/src/hlr_ussd.h +++ b/src/hlr_ussd.h @@ -7,6 +7,8 @@ #include "gsup_server.h" +#define NCSS_GUARD_TIMEOUT_DEFAULT 30 + struct hlr_ussd_route { /* g_hlr.routes */ struct llist_head list; diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 2d9b929..6706aa4 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -35,6 +35,7 @@ #include "hlr.h" #include "hlr_vty.h" #include "hlr_vty_subscr.h" +#include "hlr_ussd.h" #include "gsup_server.h" struct cmd_node hlr_node = { @@ -288,9 +289,22 @@ if (g_hlr->euse_default) vty_out(vty, " ussd default-route external %s%s", g_hlr->euse_default->name, VTY_NEWLINE); + if (g_hlr->ncss_guard_timeout != NCSS_GUARD_TIMEOUT_DEFAULT) + vty_out(vty, " ncss-guard-timeout %i%s", + g_hlr->ncss_guard_timeout, VTY_NEWLINE); + return 0; } +DEFUN(cfg_ncss_guard_timeout, cfg_ncss_guard_timeout_cmd, + "ncss-guard-timeout <0-255>", + "Set guard timer for NCSS (call independent SS) session activity\n" + "Guard timer value (sec.), or 0 to disable") +{ + g_hlr->ncss_guard_timeout = atoi(argv[0]); + return CMD_SUCCESS; +} + /*********************************************************************** * Common Code ***********************************************************************/ @@ -353,6 +367,7 @@ install_element(HLR_NODE, &cfg_ussd_no_route_pfx_cmd); install_element(HLR_NODE, &cfg_ussd_defaultroute_cmd); install_element(HLR_NODE, &cfg_ussd_no_defaultroute_cmd); + install_element(HLR_NODE, &cfg_ncss_guard_timeout_cmd); hlr_vty_subscriber_init(); } diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index e1f57a9..63d3da0 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -78,6 +78,7 @@ no ussd route prefix PREFIX ussd default-route external EUSE no ussd default-route + ncss-guard-timeout <0-255> OsmoHLR(config-hlr)# gsup OsmoHLR(config-hlr-gsup)# list -- To view, visit https://gerrit.osmocom.org/12048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d Gerrit-Change-Number: 12048 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:45:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:45:35 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: fix: properly (re)schedule NCSS session timeout In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12049 ) Change subject: SS/USSD: fix: properly (re)schedule NCSS session timeout ...................................................................... SS/USSD: fix: properly (re)schedule NCSS session timeout It may happen that either the MS or an ESME would become unresponsive, e.g. due to a bug, or a dropped message. This is why we have SS session timeout, that prevents keeping 'stalled' sessions forever. For some reason, it wasn't properly resceduled in case of subsequent SS/USSD activity, so the lifetime of a session was limited. Let's properly (re)schedule it. Change-Id: I11aeacf012b06d3d0b5cc6e64baecf857b645fda Related: OS#3717 --- M src/hlr_ussd.c 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index 16a197c..cc6aa8a 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -208,10 +208,9 @@ OSMO_STRLCPY_ARRAY(ss->imsi, imsi); ss->session_id = session_id; + + /* Schedule self-destruction timer */ osmo_timer_setup(&ss->timeout, ss_session_timeout, ss); - /* NOTE: The timeout is currently not refreshed with subsequent messages - * within the SS/USSD session. So X seconds after the initial SS message, - * the session will timeout! */ if (g_hlr->ncss_guard_timeout > 0) osmo_timer_schedule(&ss->timeout, g_hlr->ncss_guard_timeout, 0); @@ -538,6 +537,11 @@ gsup->imsi, gsup->session_id); goto out_err; } + + /* Reschedule self-destruction timer */ + if (g_hlr->ncss_guard_timeout > 0) + osmo_timer_schedule(&ss->timeout, g_hlr->ncss_guard_timeout, 0); + if (ss_op_is_ussd(req.opcode)) { /* dispatch unstructured SS to routing */ handle_ussd(conn, ss, gsup, &req); -- To view, visit https://gerrit.osmocom.org/12049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I11aeacf012b06d3d0b5cc6e64baecf857b645fda Gerrit-Change-Number: 12049 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 19:47:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 5 Dec 2018 19:47:42 +0000 Subject: Change in osmo-hlr[master]: introduce osmo_gsup_client_create2() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12098 ) Change subject: introduce osmo_gsup_client_create2() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ief09677e07d6e977247185b72c605f109aa091f5 Gerrit-Change-Number: 12098 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 05 Dec 2018 19:47:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 5 19:51:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 19:51:49 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4382?= In-Reply-To: <644743570.1083.1544028968539.JavaMail.jenkins@jenkins.osmocom.org> References: <644743570.1083.1544028968539.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1107886359.1088.1544039509545.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [laforge] paging: Add VTY options to calculate T3113 timeout dynamically ------------------------------------------ [...truncated 1.16 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' if test -d "osmo-bsc-1.3.0.269-1b963"; then find "osmo-bsc-1.3.0.269-1b963" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.269-1b963" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.269-1b963"; }; else :; fi ========================================================== osmo-bsc-1.3.0.269-1b963 archives ready for distribution: osmo-bsc-1.3.0.269-1b963.tar.gz osmo-bsc-1.3.0.269-1b963.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 19:51:58 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 19:51:58 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_?= =?UTF-8?Q?:_master-libosmo-sccp_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,a4=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#1889?= In-Reply-To: <1804104371.1081.1544027211392.JavaMail.jenkins@jenkins.osmocom.org> References: <1804104371.1081.1544027211392.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1867947636.1089.1544039518041.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Dec 5 20:08:10 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 20:08:10 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4384?= Message-ID: <1001498400.1090.1544040490272.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.16 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' if test -d "osmo-bsc-1.3.0.269-1b963"; then find "osmo-bsc-1.3.0.269-1b963" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.269-1b963" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.269-1b963"; }; else :; fi ========================================================== osmo-bsc-1.3.0.269-1b963 archives ready for distribution: osmo-bsc-1.3.0.269-1b963.tar.gz osmo-bsc-1.3.0.269-1b963.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 5 20:09:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 5 Dec 2018 20:09:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4383?= In-Reply-To: <1107886359.1088.1544039509545.JavaMail.jenkins@jenkins.osmocom.org> References: <1107886359.1088.1544039509545.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <42678943.1091.1544040546157.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.16 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' if test -d "osmo-bsc-1.3.0.269-1b963"; then find "osmo-bsc-1.3.0.269-1b963" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.269-1b963" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.269-1b963"; }; else :; fi ========================================================== osmo-bsc-1.3.0.269-1b963 archives ready for distribution: osmo-bsc-1.3.0.269-1b963.tar.gz osmo-bsc-1.3.0.269-1b963.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 5 20:11:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Dec 2018 20:11:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... Patch Set 6: (1 comment) Please also update 'expected-results.xml'. https://gerrit.osmocom.org/#/c/11897/6/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11897/6/msc/MSC_Tests.ttcn at 2000 PS6, Line 2000: timer T := 20.0; I think it's too much, ~5.0 seconds would be enough as there is no delay between Paging attempts in OsmoMSC. -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 05 Dec 2018 20:11:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 21:19:49 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Dec 2018 21:19:49 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11992 to look at the new patch set (#7). Change subject: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions ...................................................................... libmsc/gsm_09_11.c: implement guard timer for NCSS sessions It may happen that either the MS or an ESME would become unresponsive during a call independent SS session, e.g. due to a bug, or a dropped message. In such cases, the corresponding transaction would remain unfreed forever. This change introduces a guard timer, that prevents keeping 'stalled' NCSS sessions forever. As soon as it expires, both sides (i.e. MS and ESME) are getting notified, and the transaction is being released. By default, the timer expires after 30 seconds. As soon as either the MS, or an ESME initiates any activity, the timer is being rescheduled. The timeout value can be configured from the VTY: msc ... ! Use 0 to disable this timer ncss guard-timeout 30 Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Depends Change-Id: (OsmoHLR) I0589ff27933e9bca2bcf93b8259004935778db8f Related Change-Id: (TTCN) I3e1791773d56617172ae27a46889a1ae4d400e2f Related: OS#3655 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_09_11.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M tests/test_nodes.vty 6 files changed, 86 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/11992/7 -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 21:25:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 5 Dec 2018 21:25:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: correct VTY command in TC_lu_and_ss_session_timeout In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12057 ) Change subject: MSC_Tests.ttcn: correct VTY command in TC_lu_and_ss_session_timeout ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icd1133ca9f46bc2a9302deebb1e401862cf672cb Gerrit-Change-Number: 12057 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 05 Dec 2018 21:25:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 23:41:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 23:41:50 +0000 Subject: Change in libosmocore[master]: gsm0408_test: test encoding and decoding Mobile Identity Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12151 Change subject: gsm0408_test: test encoding and decoding Mobile Identity ...................................................................... gsm0408_test: test encoding and decoding Mobile Identity One would think by now we would solidly encode and decode Mobile Identities. Well, guess again. - rc is sometimes the amount of bytes written, sometimes actual strlen(). - on string truncation, rc is sometimes strlen() (assuming truncation), and sometimes snprintf()-style would-be strlen(). - returned string, when truncated by not enough buffer size, is sometimes nul terminated, sometimes not. - gsm48_mi_to_string() happily reads a byte from zero-length input buffer. - gsm48_mi_to_string() happily writes to zero length output buffer. - gsm48_mi_to_string() returns nonempty string for empty input. - encoding a MI type that still has the GSM_MI_ODD flag set results in encoding an even-length MI as odd-length (hence appending a stray 'F'). I am going to tweak the implementation of gsm48 mobile identity encoding / decoding, so first pinpoint the current behavior in a unit test, and show how perforated even such a seemingly trivial API can be. Change-Id: Iaae3af87f82f1a8f2e6273984c011b2813038cf7 --- M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 358 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/51/12151/1 diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 2a0e661..d38969b 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -352,11 +352,246 @@ printf("passed: [%u] %s\n", len, osmo_hexdump(buf, len)); } +struct test_mid_encode_decode_test { + uint8_t mi_type; + const char *mi_str; + size_t str_size; + const char *expect_mi_tlv_hex; + const char *expect_str; + int expect_rc; +}; + +static const struct test_mid_encode_decode_test test_mid_encode_decode_tests[] = { + { + .mi_type = GSM_MI_TYPE_IMSI, + .mi_str = "123456789012345", + .expect_mi_tlv_hex = "17081932547698103254", + }, + { + .mi_type = GSM_MI_TYPE_IMSI, + .mi_str = "12345678901234", + .expect_mi_tlv_hex = "170811325476981032f4", + }, + { + .mi_type = GSM_MI_TYPE_IMSI, + .mi_str = "423423", + .expect_mi_tlv_hex = "1704413224f3", + }, + { + .mi_type = GSM_MI_TYPE_IMSI | GSM_MI_ODD, + .mi_str = "423423", + .expect_mi_tlv_hex = "1704493224f3", /* encodes "odd" for even number of digits! */ + }, + { + .mi_type = GSM_MI_TYPE_IMSI, + .mi_str = "4234235", + .expect_mi_tlv_hex = "170449322453", + }, + { + .mi_type = GSM_MI_TYPE_IMSI, + .mi_str = "4234235", + .expect_mi_tlv_hex = "170449322453", + .str_size = 4, + .expect_str = "423", + .expect_rc = 3, /* exception: on truncation, gsm48_mi_to_string() returns strlen(), not bytes! */ + }, + { + .mi_type = GSM_MI_TYPE_IMEI, + .mi_str = "123456789012345", + .expect_mi_tlv_hex = "17081a32547698103254", + }, + { + .mi_type = GSM_MI_TYPE_IMEI, + .mi_str = "98765432109876", + .expect_mi_tlv_hex = "170892785634129078f6", + }, + { + .mi_type = GSM_MI_TYPE_IMEI, + .mi_str = "987654321098765", + .expect_mi_tlv_hex = "17089a78563412907856", + }, + { + .mi_type = GSM_MI_TYPE_IMEISV, + .mi_str = "987654321098765432", + .expect_mi_tlv_hex = "170a937856341290785634f2", + }, + { + .mi_type = GSM_MI_TYPE_IMEISV, + .mi_str = "987654321098765432", + .expect_mi_tlv_hex = "170a937856341290785634f2", + .str_size = 16, + .expect_str = "987654321098765", + .expect_rc = 15, /* exception: on truncation, gsm48_mi_to_string() returns strlen(), not bytes! */ + }, + { + /* gsm48 treats TMSI as decimal string */ + .mi_type = GSM_MI_TYPE_TMSI, + .mi_str = "305419896", /* 0x12345678 as decimal */ + .expect_mi_tlv_hex = "1705f412345678", + .expect_rc = 9, /* exception: gsm48_mi_to_string() for TMSI returns strlen(), not bytes! */ + }, + { + .mi_type = GSM_MI_TYPE_TMSI, + .mi_str = "12648430", /* 0xc0ffee as decimal */ + .expect_mi_tlv_hex = "1705f400c0ffee", + .expect_rc = 8, /* exception: gsm48_mi_to_string() for TMSI returns strlen(), not bytes! */ + }, + { + .mi_type = GSM_MI_TYPE_TMSI, + .mi_str = "0", + .expect_mi_tlv_hex = "1705f400000000", + .expect_rc = 1, /* exception: gsm48_mi_to_string() for TMSI returns strlen(), not bytes! */ + }, + { + /* gsm48 treats TMSI as decimal string */ + .mi_type = GSM_MI_TYPE_TMSI, + .mi_str = "305419896", /* 0x12345678 as decimal */ + .expect_mi_tlv_hex = "1705f412345678", + .str_size = 5, + .expect_str = "3054", + .expect_rc = 9, /* exception: gsm48_mi_to_string() for TMSI returns would-be strlen() like snprintf()! */ + }, + { + .mi_type = GSM_MI_TYPE_NONE, + .mi_str = "123", + .expect_mi_tlv_hex = "17021832", /* encoding nonsense! */ + .expect_str = "", + }, + { + .mi_type = GSM_MI_TYPE_NONE, + .mi_str = "1234", + .expect_mi_tlv_hex = "17031032f4", /* encoding nonsense! */ + .expect_str = "", + }, + { + .mi_type = GSM_MI_ODD, + .mi_str = "1234", + .expect_mi_tlv_hex = "17031832f4", /* encoding nonsense and encodes "odd" for an even number of digits! */ + .expect_str = "", + }, +}; + +static void test_mid_encode_decode(void) +{ + int i; + + printf("\nTesting Mobile Identity conversions\n"); + + for (i = 0; i < ARRAY_SIZE(test_mid_encode_decode_tests); i++) { + const struct test_mid_encode_decode_test *t = &test_mid_encode_decode_tests[i]; + uint8_t tlv_buf[64]; + uint8_t *mi_buf; + int tlv_len; + int mi_len; + const char *tlv_hex; + char str[64] = {}; + size_t str_size = t->str_size ? : sizeof(str); + const char *expect_str = t->expect_str ? : t->mi_str; + int expect_rc = t->expect_rc ? : strlen(expect_str)+1; + int rc; + int str_len; + + printf("- %s %s\n", gsm48_mi_type_name(t->mi_type), t->mi_str); + if (t->mi_type == GSM_MI_TYPE_TMSI) + tlv_len = gsm48_generate_mid_from_tmsi(tlv_buf, (uint32_t)atoll(t->mi_str)); + else + tlv_len = gsm48_generate_mid(tlv_buf, t->mi_str, t->mi_type); + tlv_hex = osmo_hexdump_nospc(tlv_buf, tlv_len); + + printf(" -> MI-TLV-hex='%s'\n", tlv_hex); + if (t->expect_mi_tlv_hex && strcmp(tlv_hex, t->expect_mi_tlv_hex)) { + printf(" ERROR: expected '%s'\n", t->expect_mi_tlv_hex); + } + + /* skip the GSM48_IE_MOBILE_ID tag and length */ + mi_buf = tlv_buf + 2; + mi_len = tlv_len - 2; + + rc = gsm48_mi_to_string(str, str_size, mi_buf, mi_len); + printf(" -> MI-str=%s rc=%d\n", osmo_quote_str(str, -1), rc); + if (strcmp(str, expect_str)) + printf(" ERROR: expected MI-str=%s\n", osmo_quote_str(expect_str, -1)); + if (rc != expect_rc) + printf(" ERROR: expected rc=%d\n", expect_rc); + + /* Now make sure the resulting string is always '\0' terminated. + * The above started out with a zeroed buffer, now repeat with a tainted one. */ + str_len = strlen(str); + str[str_len] = '!'; + gsm48_mi_to_string(str, str_size, mi_buf, mi_len); + if (strlen(str) != str_len) + printf(" ERROR: resulting string is not explicitly nul terminated\n"); + } +} + +static const uint8_t test_mid_decode_zero_length_types[] = { GSM_MI_TYPE_IMSI, GSM_MI_TYPE_TMSI, GSM_MI_TYPE_NONE }; + +static void test_mid_decode_zero_length(void) +{ + int odd; + uint8_t valid_mi[64]; + int valid_mi_len; + + printf("\nDecoding zero length Mobile Identities\n"); + + /* IMSI = 123456789012345 */ + valid_mi_len = osmo_hexparse("1932547698103254", valid_mi, sizeof(valid_mi)); + + for (odd = 0; odd <= 1; odd++) { + int i; + for (i = 0; i < ARRAY_SIZE(test_mid_decode_zero_length_types); i++) { + uint8_t mi_type = test_mid_decode_zero_length_types[i] | (odd ? GSM_MI_ODD : 0); + char str[8] = {}; + int rc; + + printf("- MI type: %s%s\n", gsm48_mi_type_name(mi_type & GSM_MI_TYPE_MASK), + odd ? " | GSM_MI_ODD":""); + valid_mi[0] = (valid_mi[0] & 0xf0) | mi_type; + + printf(" - writing to zero-length string:\n"); + memset(str, '!', sizeof(str) - 1); + rc = gsm48_mi_to_string(str, 0, valid_mi, valid_mi_len); + printf(" rc=%d\n", rc); + if (str[0] == '!') + printf(" nothing written\n"); + else + printf(" ERROR: Wrote to invalid memory!\n"); + + printf(" - writing to 1-byte-length string:\n"); + memset(str, '!', sizeof(str) - 1); + rc = gsm48_mi_to_string(str, 1, valid_mi, valid_mi_len); + printf(" rc=%d\n", rc); + if (str[0] == '\0') + printf(" returned empty string\n"); + else if (str[0] == '!') + printf(" ERROR: nothing written, expected nul-terminated empty string\n"); + else + printf(" ERROR: Wrote unexpected string %s\n", osmo_quote_str(str, 5)); + if (str[1] != '!') + printf(" ERROR: Wrote to invalid memory!\n"); + + printf(" - decode zero-length mi:\n"); + memset(str, '!', sizeof(str) - 1); + rc = gsm48_mi_to_string(str, sizeof(str), valid_mi, 0); + printf(" rc=%d\n", rc); + if (str[0] == '\0') + printf(" returned empty string\n"); + else if (str[0] == '!') + printf(" ERROR: nothing written, expected nul-terminated empty string\n"); + else + printf(" ERROR: expected empty string, got output string: %s\n", osmo_quote_str(str, -1)); + } + } + printf("\n"); +} + int main(int argc, char **argv) { test_bearer_cap(); test_mid_from_tmsi(); test_mid_from_imsi(); + test_mid_encode_decode(); + test_mid_decode_zero_length(); test_ra_cap(); test_lai_encode_decode(); diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index c1d6a70..1dc4249 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -2,6 +2,129 @@ Test `Speech, all codecs' passed Simple TMSI encoding test....passed Simple IMSI encoding test....passed: [10] 17 08 99 10 07 00 00 00 64 02 + +Testing Mobile Identity conversions +- IMSI 123456789012345 + -> MI-TLV-hex='17081932547698103254' + -> MI-str="123456789012345" rc=16 +- IMSI 12345678901234 + -> MI-TLV-hex='170811325476981032f4' + -> MI-str="12345678901234" rc=15 +- IMSI 423423 + -> MI-TLV-hex='1704413224f3' + -> MI-str="423423" rc=7 +- unknown 0x9 423423 + -> MI-TLV-hex='1704493224f3' + -> MI-str="423423F" rc=8 + ERROR: expected MI-str="423423" + ERROR: expected rc=7 +- IMSI 4234235 + -> MI-TLV-hex='170449322453' + -> MI-str="4234235" rc=8 +- IMSI 4234235 + -> MI-TLV-hex='170449322453' + -> MI-str="423" rc=3 + ERROR: resulting string is not explicitly nul terminated +- IMEI 123456789012345 + -> MI-TLV-hex='17081a32547698103254' + -> MI-str="123456789012345" rc=16 +- IMEI 98765432109876 + -> MI-TLV-hex='170892785634129078f6' + -> MI-str="98765432109876" rc=15 +- IMEI 987654321098765 + -> MI-TLV-hex='17089a78563412907856' + -> MI-str="987654321098765" rc=16 +- IMEI-SV 987654321098765432 + -> MI-TLV-hex='170a937856341290785634f2' + -> MI-str="987654321098765432" rc=19 +- IMEI-SV 987654321098765432 + -> MI-TLV-hex='170a937856341290785634f2' + -> MI-str="987654321098765" rc=15 + ERROR: resulting string is not explicitly nul terminated +- TMSI 305419896 + -> MI-TLV-hex='1705f412345678' + -> MI-str="305419896" rc=9 +- TMSI 12648430 + -> MI-TLV-hex='1705f400c0ffee' + -> MI-str="12648430" rc=8 +- TMSI 0 + -> MI-TLV-hex='1705f400000000' + -> MI-str="0" rc=1 +- TMSI 305419896 + -> MI-TLV-hex='1705f412345678' + -> MI-str="3054" rc=9 +- NONE 123 + -> MI-TLV-hex='17021832' + -> MI-str="" rc=1 +- NONE 1234 + -> MI-TLV-hex='17031032f4' + -> MI-str="" rc=1 +- unknown 0x8 1234 + -> MI-TLV-hex='17031832f4' + -> MI-str="" rc=1 + +Decoding zero length Mobile Identities +- MI type: IMSI + - writing to zero-length string: + rc=1 + ERROR: Wrote to invalid memory! + - writing to 1-byte-length string: + rc=1 + ERROR: Wrote unexpected string "1!!!!" + - decode zero-length mi: + rc=2 + ERROR: expected empty string, got output string: "1" +- MI type: TMSI + - writing to zero-length string: + rc=1 + ERROR: Wrote to invalid memory! + - writing to 1-byte-length string: + rc=1 + returned empty string + - decode zero-length mi: + rc=1 + returned empty string +- MI type: NONE + - writing to zero-length string: + rc=1 + ERROR: Wrote to invalid memory! + - writing to 1-byte-length string: + rc=1 + returned empty string + - decode zero-length mi: + rc=1 + returned empty string +- MI type: IMSI | GSM_MI_ODD + - writing to zero-length string: + rc=1 + ERROR: Wrote to invalid memory! + - writing to 1-byte-length string: + rc=1 + ERROR: Wrote unexpected string "1!!!!" + - decode zero-length mi: + rc=2 + ERROR: expected empty string, got output string: "1" +- MI type: TMSI | GSM_MI_ODD + - writing to zero-length string: + rc=1 + ERROR: Wrote to invalid memory! + - writing to 1-byte-length string: + rc=1 + returned empty string + - decode zero-length mi: + rc=1 + returned empty string +- MI type: NONE | GSM_MI_ODD + - writing to zero-length string: + rc=1 + ERROR: Wrote to invalid memory! + - writing to 1-byte-length string: + rc=1 + returned empty string + - decode zero-length mi: + rc=1 + returned empty string + Constructed RA: 077-121-666-5 MCC+MNC in BCD: 70 17 21 -- To view, visit https://gerrit.osmocom.org/12151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaae3af87f82f1a8f2e6273984c011b2813038cf7 Gerrit-Change-Number: 12151 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 23:41:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 23:41:51 +0000 Subject: Change in libosmocore[master]: api doc: gsm48_mi_to_string(): warn of return value implementation Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12152 Change subject: api doc: gsm48_mi_to_string(): warn of return value implementation ...................................................................... api doc: gsm48_mi_to_string(): warn of return value implementation Change-Id: If5e7abd15dddf39cdfad8071f4cd5ca8244eabe0 --- M src/gsm/gsm48.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/52/12152/1 diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index ae9a1cf..e684a3c 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -643,7 +643,10 @@ * \param[in] str_len Length of \a string in bytes * \param[in] mi Mobile Identity to be stringified * \param[in] mi_len Length of \a mi in bytes - * \returns length of string written to \a string */ + * \returns WARNING: the return value of this function is not well implemented. + * Depending on the MI type and amount of output buffer, this may return + * the nr of written bytes, or the written strlen(), or the snprintf() + * style strlen()-if-the-buffer-were-large-enough. */ int gsm48_mi_to_string(char *string, const int str_len, const uint8_t *mi, const int mi_len) { -- To view, visit https://gerrit.osmocom.org/12152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If5e7abd15dddf39cdfad8071f4cd5ca8244eabe0 Gerrit-Change-Number: 12152 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 23:41:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 23:41:51 +0000 Subject: Change in libosmocore[master]: add osmo_bsc2str() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12153 Change subject: add osmo_bsc2str() ...................................................................... add osmo_bsc2str() Add a standalone bcd-to-string conversion function with generic parameters. Add a regression test in utils_test.c. So far there is no single universal implementation that converts a BCD to a string. I could only find gsm48_mi_to_string(), which also interprets surrounding bytes, MI type and TMSI as non-BCD value. The idea is to use this function from gsm48_mi_to_string() and similar implementations in subsequent commits. Root cause: in osmo-msc, I want to have an alternative MI-to-string function for composing an FSM name, which needs the BCD part of gsm48_mi_to_string() but not the TMSI part. Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 --- M include/osmocom/core/utils.h M src/utils.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 4 files changed, 131 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/53/12153/1 diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 0b54c88..34e6a4a 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -49,6 +49,8 @@ /* only works for numbers in ascci */ uint8_t osmo_char2bcd(char c); +int osmo_bcd2str(char *dst, size_t dst_size, const uint8_t bcd[], int start_nibble, int end_nibble); + int osmo_hexparse(const char *str, uint8_t *b, int max_len); char *osmo_ubit_dump(const uint8_t *bits, unsigned int len); diff --git a/src/utils.c b/src/utils.c index e6adcf8..a86b0fb 100644 --- a/src/utils.c +++ b/src/utils.c @@ -129,6 +129,38 @@ return 0; } +/*! Convert BCD to string. + * The given nibble offsets are interpreted in BCD order, i.e. nibble 0 is bcd[0] & 0xf, nibble 1 is bcd[0] >> 4, nibble + * 3 is bcd[1] & 0xf, etc.. + * \param[out] dst Output string buffer, is always nul terminated when dst_size > 0. + * \param[in] dst_size sizeof() the output string buffer. + * \param[in] bcd Binary coded data buffer. + * \param[in] start_nibble Offset to start from, in nibbles, typically 1 to skip the first nibble. + * \param[in] end_nibble Offset to stop before, in nibbles, e.g. sizeof(bcd) - (bcd[0] & GSM_MI_ODD? 0:1). + * \returns The strlen that would be written if the output buffer is large enough, excluding nul byte (like + * snprintf()). + */ +int osmo_bcd2str(char *dst, size_t dst_size, const uint8_t bcd[], int start_nibble, int end_nibble) +{ + char *dst_end = dst + dst_size - 1; + int nibble_i; + + for (nibble_i = start_nibble; nibble_i < end_nibble && dst < dst_end; nibble_i++, dst++) { + uint8_t nibble = bcd[nibble_i >> 1]; + if ((nibble_i & 1)) + nibble >>= 4; + nibble &= 0xf; + + *dst = osmo_bcd2char(nibble); + } + + /* Always terminate, but guard against zero dst_size */ + if (dst <= dst_end) + *dst = '\0'; + + return OSMO_MAX(0, end_nibble - start_nibble); +} + /*! Parse a string containing hexadecimal digits * \param[in] str string containing ASCII encoded hexadecimal digits * \param[out] b output buffer diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index 2bb1f9c..f8ff105 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -383,6 +383,85 @@ } } +struct bcd2str_test { + const char *bcd_hex; + int start_nibble; + int end_nibble; + size_t str_size; + const char *expect_str; + int expect_rc; +}; + +static const struct bcd2str_test bcd2str_tests[] = { + { + .bcd_hex = "1a 32 54 76 98 f0", + .start_nibble = 1, + .end_nibble = 11, + .expect_str = "1234567890", + .expect_rc = 10, + }, + { + .bcd_hex = "1a 32 54 76 98 f0", + .start_nibble = 1, + .end_nibble = 12, + .expect_str = "1234567890F", + .expect_rc = 11, + }, + { + .bcd_hex = "1a 32 54 76 98 f0", + .start_nibble = 0, + .end_nibble = 12, + .expect_str = "A1234567890F", + .expect_rc = 12, + }, + { + .bcd_hex = "1a 32 54 76 98 f0", + .start_nibble = 1, + .end_nibble = 12, + .str_size = 5, + .expect_str = "1234", + .expect_rc = 11, + }, + { + .bcd_hex = "", + .start_nibble = 1, + .end_nibble = 1, + .expect_str = "", + .expect_rc = 0, + }, +}; + +static void bcd2str_test(void) +{ + int i; + + printf("\nTesting bcd to string conversion\n"); + + for (i = 0; i < ARRAY_SIZE(bcd2str_tests); i++) { + const struct bcd2str_test *t = &bcd2str_tests[i]; + uint8_t bcd[64]; + char str[64] = {}; + size_t str_size = t->str_size ? : sizeof(str); + int rc; + + osmo_hexparse(t->bcd_hex, bcd, sizeof(bcd)); + + printf("- BCD-input='%s' nibbles=[%d..%d[ str_size=%zu\n", t->bcd_hex, + t->start_nibble, t->end_nibble, str_size); + rc = osmo_bcd2str(str, str_size, bcd, t->start_nibble, t->end_nibble); + + printf(" rc=%d\n", rc); + + OSMO_ASSERT(str[str_size-1] == '\0'); + printf(" -> %s\n", osmo_quote_str(str, -1)); + + if (rc != t->expect_rc) + printf(" ERROR: expected rc=%d\n", t->expect_rc); + if (strcmp(str, t->expect_str)) + printf(" ERROR: expected result %s\n", osmo_quote_str(t->expect_str, -1)); + } +} + static void str_escape_test(void) { int i; @@ -810,6 +889,7 @@ test_ipa_ccm_id_resp_parsing(); test_is_hexstr(); bcd_test(); + bcd2str_test(); str_escape_test(); str_quote_test(); isqrt_test(); diff --git a/tests/utils/utils_test.ok b/tests/utils/utils_test.ok index 3ea8ec6..69cc690 100644 --- a/tests/utils/utils_test.ok +++ b/tests/utils/utils_test.ok @@ -80,6 +80,23 @@ val=0xe, expected=E, found=E val=0xf, expected=F, found=F +Testing bcd to string conversion +- BCD-input='1a 32 54 76 98 f0' nibbles=[1..11[ str_size=64 + rc=10 + -> "1234567890" +- BCD-input='1a 32 54 76 98 f0' nibbles=[1..12[ str_size=64 + rc=11 + -> "1234567890F" +- BCD-input='1a 32 54 76 98 f0' nibbles=[0..12[ str_size=64 + rc=12 + -> "A1234567890F" +- BCD-input='1a 32 54 76 98 f0' nibbles=[1..12[ str_size=5 + rc=11 + -> "1234" +- BCD-input='' nibbles=[1..1[ str_size=64 + rc=0 + -> "" + Testing string escaping - all chars from 0 to 255 in batches of 16: "\0\1\2\3\4\5\6\a\b\t\n\v\f\r\14\15" -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 23:41:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 23:41:51 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12154 Change subject: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases ...................................................................... gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases By using osmo_bcd2str(), ensure that the resulting string is always nul terminated, and always return strlen()+1 whether truncated or not. Still keep up the previous return value style, even if that isn't consistent at all. The difference between IMSI/IMEI and TMSI return values remains and is not part of this patch. Change-Id: I1b51b72a721e1cc9d69796b804ebda741ff0f36b --- M src/gsm/gsm48.c M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 3 files changed, 22 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/12154/1 diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index e684a3c..df4b4c1 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -650,7 +650,7 @@ int gsm48_mi_to_string(char *string, const int str_len, const uint8_t *mi, const int mi_len) { - int i; + int rc; uint8_t mi_type; char *str_cur = string; uint32_t tmsi; @@ -670,17 +670,15 @@ case GSM_MI_TYPE_IMSI: case GSM_MI_TYPE_IMEI: case GSM_MI_TYPE_IMEISV: - *str_cur++ = osmo_bcd2char(mi[0] >> 4); - - for (i = 1; i < mi_len; i++) { - if (str_cur + 2 >= string + str_len) - return str_cur - string; - *str_cur++ = osmo_bcd2char(mi[i] & 0xf); - /* skip last nibble in last input byte when GSM_EVEN */ - if( (i != mi_len-1) || (mi[0] & GSM_MI_ODD)) - *str_cur++ = osmo_bcd2char(mi[i] >> 4); - } - break; + rc = osmo_bcd2str(string, str_len, mi, + 1, mi_len * 2 - ((mi[0] & GSM_MI_ODD) ? 0 : 1)); + /* osmo_bcd2str() returns snprintf style strlen(), this returns bytes written. */ + if (rc < str_len) + return rc + 1; + else if (!str_len) + return 0; + else + return strlen(string) + 1; default: break; } diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index d38969b..7dbb97d 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -393,7 +393,6 @@ .expect_mi_tlv_hex = "170449322453", .str_size = 4, .expect_str = "423", - .expect_rc = 3, /* exception: on truncation, gsm48_mi_to_string() returns strlen(), not bytes! */ }, { .mi_type = GSM_MI_TYPE_IMEI, @@ -421,7 +420,6 @@ .expect_mi_tlv_hex = "170a937856341290785634f2", .str_size = 16, .expect_str = "987654321098765", - .expect_rc = 15, /* exception: on truncation, gsm48_mi_to_string() returns strlen(), not bytes! */ }, { /* gsm48 treats TMSI as decimal string */ diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 1dc4249..2db58de 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -23,8 +23,7 @@ -> MI-str="4234235" rc=8 - IMSI 4234235 -> MI-TLV-hex='170449322453' - -> MI-str="423" rc=3 - ERROR: resulting string is not explicitly nul terminated + -> MI-str="423" rc=4 - IMEI 123456789012345 -> MI-TLV-hex='17081a32547698103254' -> MI-str="123456789012345" rc=16 @@ -39,8 +38,7 @@ -> MI-str="987654321098765432" rc=19 - IMEI-SV 987654321098765432 -> MI-TLV-hex='170a937856341290785634f2' - -> MI-str="987654321098765" rc=15 - ERROR: resulting string is not explicitly nul terminated + -> MI-str="987654321098765" rc=16 - TMSI 305419896 -> MI-TLV-hex='1705f412345678' -> MI-str="305419896" rc=9 @@ -66,14 +64,14 @@ Decoding zero length Mobile Identities - MI type: IMSI - writing to zero-length string: - rc=1 - ERROR: Wrote to invalid memory! + rc=0 + nothing written - writing to 1-byte-length string: rc=1 - ERROR: Wrote unexpected string "1!!!!" + returned empty string - decode zero-length mi: - rc=2 - ERROR: expected empty string, got output string: "1" + rc=1 + returned empty string - MI type: TMSI - writing to zero-length string: rc=1 @@ -96,14 +94,14 @@ returned empty string - MI type: IMSI | GSM_MI_ODD - writing to zero-length string: - rc=1 - ERROR: Wrote to invalid memory! + rc=0 + nothing written - writing to 1-byte-length string: rc=1 - ERROR: Wrote unexpected string "1!!!!" + returned empty string - decode zero-length mi: - rc=2 - ERROR: expected empty string, got output string: "1" + rc=1 + returned empty string - MI type: TMSI | GSM_MI_ODD - writing to zero-length string: rc=1 -- To view, visit https://gerrit.osmocom.org/12154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1b51b72a721e1cc9d69796b804ebda741ff0f36b Gerrit-Change-Number: 12154 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 23:41:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 23:41:52 +0000 Subject: Change in libosmocore[master]: gsm48_generate_mid(): mask out ODD flag from mi_type Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12155 Change subject: gsm48_generate_mid(): mask out ODD flag from mi_type ...................................................................... gsm48_generate_mid(): mask out ODD flag from mi_type Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 --- M src/gsm/gsm48.c M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 3 files changed, 6 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/12155/1 diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index df4b4c1..3487ef7 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -611,7 +611,7 @@ uint8_t length = strnlen(id, 255), i, off = 0, odd = (length & 1) == 1; buf[0] = GSM48_IE_MOBILE_ID; - buf[2] = osmo_char2bcd(id[0]) << 4 | mi_type | (odd << 3); + buf[2] = osmo_char2bcd(id[0]) << 4 | (mi_type & GSM_MI_TYPE_MASK) | (odd << 3); /* if the length is even we will fill half of the last octet */ buf[1] = (length + (odd ? 1 : 2)) >> 1; diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 7dbb97d..c85d1fd 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -380,7 +380,7 @@ { .mi_type = GSM_MI_TYPE_IMSI | GSM_MI_ODD, .mi_str = "423423", - .expect_mi_tlv_hex = "1704493224f3", /* encodes "odd" for even number of digits! */ + .expect_mi_tlv_hex = "1704413224f3", }, { .mi_type = GSM_MI_TYPE_IMSI, @@ -464,7 +464,7 @@ { .mi_type = GSM_MI_ODD, .mi_str = "1234", - .expect_mi_tlv_hex = "17031832f4", /* encoding nonsense and encodes "odd" for an even number of digits! */ + .expect_mi_tlv_hex = "17031032f4", /* encoding nonsense! */ .expect_str = "", }, }; diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 2db58de..6e99f5b 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -14,10 +14,8 @@ -> MI-TLV-hex='1704413224f3' -> MI-str="423423" rc=7 - unknown 0x9 423423 - -> MI-TLV-hex='1704493224f3' - -> MI-str="423423F" rc=8 - ERROR: expected MI-str="423423" - ERROR: expected rc=7 + -> MI-TLV-hex='1704413224f3' + -> MI-str="423423" rc=7 - IMSI 4234235 -> MI-TLV-hex='170449322453' -> MI-str="4234235" rc=8 @@ -58,7 +56,7 @@ -> MI-TLV-hex='17031032f4' -> MI-str="" rc=1 - unknown 0x8 1234 - -> MI-TLV-hex='17031832f4' + -> MI-TLV-hex='17031032f4' -> MI-str="" rc=1 Decoding zero length Mobile Identities -- To view, visit https://gerrit.osmocom.org/12155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 Gerrit-Change-Number: 12155 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 23:41:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 23:41:52 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): guard against zero length output buffer Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12156 Change subject: gsm48_mi_to_string(): guard against zero length output buffer ...................................................................... gsm48_mi_to_string(): guard against zero length output buffer All successful cases already return from the switch(), so simply handle all errors below it by returning an empty string (if there is enough string buffer). Change-Id: I709ac3b9efb7b4258d8660715b10312e11b9b571 --- M src/gsm/gsm48.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 13 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/12156/1 diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 3487ef7..7517c09 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -658,8 +658,6 @@ mi_type = mi[0] & GSM_MI_TYPE_MASK; switch (mi_type) { - case GSM_MI_TYPE_NONE: - break; case GSM_MI_TYPE_TMSI: /* Table 10.5.4.3, reverse generate_mid_from_tmsi */ if (mi_len == GSM48_TMSI_LEN && mi[0] == (0xf0 | GSM_MI_TYPE_TMSI)) { @@ -679,12 +677,15 @@ return 0; else return strlen(string) + 1; + default: break; } - *str_cur++ = '\0'; - return str_cur - string; + if (str_len < 1) + return 0; + *string = '\0'; + return 1; } /*! Parse TS 04.08 Routing Area Identifier diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 6e99f5b..d6579e5 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -72,8 +72,8 @@ returned empty string - MI type: TMSI - writing to zero-length string: - rc=1 - ERROR: Wrote to invalid memory! + rc=0 + nothing written - writing to 1-byte-length string: rc=1 returned empty string @@ -82,8 +82,8 @@ returned empty string - MI type: NONE - writing to zero-length string: - rc=1 - ERROR: Wrote to invalid memory! + rc=0 + nothing written - writing to 1-byte-length string: rc=1 returned empty string @@ -102,8 +102,8 @@ returned empty string - MI type: TMSI | GSM_MI_ODD - writing to zero-length string: - rc=1 - ERROR: Wrote to invalid memory! + rc=0 + nothing written - writing to 1-byte-length string: rc=1 returned empty string @@ -112,8 +112,8 @@ returned empty string - MI type: NONE | GSM_MI_ODD - writing to zero-length string: - rc=1 - ERROR: Wrote to invalid memory! + rc=0 + nothing written - writing to 1-byte-length string: rc=1 returned empty string -- To view, visit https://gerrit.osmocom.org/12156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I709ac3b9efb7b4258d8660715b10312e11b9b571 Gerrit-Change-Number: 12156 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 5 23:41:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 5 Dec 2018 23:41:52 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): do not read from zero length input buffer Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12157 Change subject: gsm48_mi_to_string(): do not read from zero length input buffer ...................................................................... gsm48_mi_to_string(): do not read from zero length input buffer Change-Id: I12cada7c2c5187146ca5a33d1ebfefb4cad65632 --- M src/gsm/gsm48.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/57/12157/1 diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 7517c09..68cb567 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -655,7 +655,7 @@ char *str_cur = string; uint32_t tmsi; - mi_type = mi[0] & GSM_MI_TYPE_MASK; + mi_type = (mi && mi_len) ? (mi[0] & GSM_MI_TYPE_MASK) : GSM_MI_TYPE_NONE; switch (mi_type) { case GSM_MI_TYPE_TMSI: -- To view, visit https://gerrit.osmocom.org/12157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I12cada7c2c5187146ca5a33d1ebfefb4cad65632 Gerrit-Change-Number: 12157 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 6 00:18:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 00:18:25 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4385?= In-Reply-To: <1001498400.1090.1544040490272.JavaMail.jenkins@jenkins.osmocom.org> References: <1001498400.1090.1544040490272.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <440576063.1093.1544055505103.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.16 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' if test -d "osmo-bsc-1.3.0.269-1b963"; then find "osmo-bsc-1.3.0.269-1b963" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.269-1b963" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.269-1b963"; }; else :; fi ========================================================== osmo-bsc-1.3.0.269-1b963 archives ready for distribution: osmo-bsc-1.3.0.269-1b963.tar.gz osmo-bsc-1.3.0.269-1b963.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: error in rsync protocol data stream (code 12) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' make: *** [publish] Error 12 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 6 00:21:34 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 00:21:34 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4386?= In-Reply-To: <440576063.1093.1544055505103.JavaMail.jenkins@jenkins.osmocom.org> References: <440576063.1093.1544055505103.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1875999821.1094.1544055694632.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.13 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' if test -d "osmo-bsc-1.3.0.269-1b963"; then find "osmo-bsc-1.3.0.269-1b963" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.269-1b963" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.269-1b963"; }; else :; fi ========================================================== osmo-bsc-1.3.0.269-1b963 archives ready for distribution: osmo-bsc-1.3.0.269-1b963.tar.gz osmo-bsc-1.3.0.269-1b963.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Dec 6 00:59:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 00:59:49 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): guard against zero length output buffer In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12156 to look at the new patch set (#2). Change subject: gsm48_mi_to_string(): guard against zero length output buffer ...................................................................... gsm48_mi_to_string(): guard against zero length output buffer All successful cases already return from the switch(), so simply handle all errors below it by returning an empty string (if there is enough string buffer). Change-Id: I709ac3b9efb7b4258d8660715b10312e11b9b571 --- M src/gsm/gsm48.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/12156/2 -- To view, visit https://gerrit.osmocom.org/12156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I709ac3b9efb7b4258d8660715b10312e11b9b571 Gerrit-Change-Number: 12156 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 6 01:00:13 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 01:00:13 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4388?= Message-ID: <1985577898.1095.1544058013134.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.16 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' if test -d "osmo-bsc-1.3.0.269-1b963"; then find "osmo-bsc-1.3.0.269-1b963" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.269-1b963" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.269-1b963"; }; else :; fi ========================================================== osmo-bsc-1.3.0.269-1b963 archives ready for distribution: osmo-bsc-1.3.0.269-1b963.tar.gz osmo-bsc-1.3.0.269-1b963.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] make: *** [publish] Error 255 /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 6 01:00:44 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 01:00:44 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4387?= In-Reply-To: <1875999821.1094.1544055694632.JavaMail.jenkins@jenkins.osmocom.org> References: <1875999821.1094.1544055694632.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <229438206.1096.1544058044970.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.16 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' if test -d "osmo-bsc-1.3.0.269-1b963"; then find "osmo-bsc-1.3.0.269-1b963" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.269-1b963" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.269-1b963"; }; else :; fi ========================================================== osmo-bsc-1.3.0.269-1b963 archives ready for distribution: osmo-bsc-1.3.0.269-1b963.tar.gz osmo-bsc-1.3.0.269-1b963.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] make: *** [publish] Error 255 /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:02:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:02:10 +0000 Subject: Change in libosmocore[master]: gsm0408_test: test encoding and decoding Mobile Identity In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12151 to look at the new patch set (#2). Change subject: gsm0408_test: test encoding and decoding Mobile Identity ...................................................................... gsm0408_test: test encoding and decoding Mobile Identity One would think by now we would solidly encode and decode Mobile Identities. Well, guess again. - rc is sometimes the amount of bytes written, sometimes actual strlen(). - on string truncation, rc is sometimes strlen() (assuming nul terminated), and sometimes snprintf()-style would-be strlen(). - returned string, when truncated by not enough buffer size, is sometimes nul terminated, sometimes not. - gsm48_mi_to_string() happily reads a byte from zero-length input buffer. - gsm48_mi_to_string() happily writes to zero length output buffer. - gsm48_mi_to_string() returns nonempty string for empty input. - encoding a MI type that still has the GSM_MI_ODD flag set results in encoding an even-length MI as odd-length (hence appending a stray 'F'). I am going to tweak the implementation of gsm48 mobile identity encoding / decoding, so first pinpoint the current behavior in a unit test, and show how perforated even such a seemingly trivial API can be. Change-Id: Iaae3af87f82f1a8f2e6273984c011b2813038cf7 --- M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 358 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/51/12151/2 -- To view, visit https://gerrit.osmocom.org/12151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iaae3af87f82f1a8f2e6273984c011b2813038cf7 Gerrit-Change-Number: 12151 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:02:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:02:10 +0000 Subject: Change in libosmocore[master]: api doc: gsm48_mi_to_string(): warn of return value implementation In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12152 to look at the new patch set (#2). Change subject: api doc: gsm48_mi_to_string(): warn of return value implementation ...................................................................... api doc: gsm48_mi_to_string(): warn of return value implementation Change-Id: If5e7abd15dddf39cdfad8071f4cd5ca8244eabe0 --- M src/gsm/gsm48.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/52/12152/2 -- To view, visit https://gerrit.osmocom.org/12152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If5e7abd15dddf39cdfad8071f4cd5ca8244eabe0 Gerrit-Change-Number: 12152 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:02:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:02:10 +0000 Subject: Change in libosmocore[master]: add osmo_bsc2str() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12153 to look at the new patch set (#2). Change subject: add osmo_bsc2str() ...................................................................... add osmo_bsc2str() Add a standalone bcd-to-string conversion function with generic parameters. Add a regression test in utils_test.c. So far there is no single universal implementation that converts a BCD to a string. I could only find gsm48_mi_to_string(), which also interprets surrounding bytes, MI type and TMSI as non-BCD value. The idea is to use this function from gsm48_mi_to_string() and similar implementations in subsequent commits. Root cause: in osmo-msc, I want to have an alternative MI-to-string function for composing an FSM name, which needs the BCD part of gsm48_mi_to_string() but not the TMSI part. Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 --- M include/osmocom/core/utils.h M src/utils.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 4 files changed, 131 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/53/12153/2 -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:02:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:02:10 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12154 to look at the new patch set (#2). Change subject: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases ...................................................................... gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases By using osmo_bcd2str(), ensure that the resulting string is always nul terminated, and always return strlen()+1 whether truncated or not. Still keep up the previous return value style, even if that isn't consistent at all. The difference between IMSI/IMEI and TMSI return values remains and is not part of this patch. Change-Id: I1b51b72a721e1cc9d69796b804ebda741ff0f36b --- M src/gsm/gsm48.c M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 3 files changed, 22 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/12154/2 -- To view, visit https://gerrit.osmocom.org/12154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1b51b72a721e1cc9d69796b804ebda741ff0f36b Gerrit-Change-Number: 12154 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:02:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:02:10 +0000 Subject: Change in libosmocore[master]: gsm48_generate_mid(): mask out ODD flag from mi_type In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12155 to look at the new patch set (#2). Change subject: gsm48_generate_mid(): mask out ODD flag from mi_type ...................................................................... gsm48_generate_mid(): mask out ODD flag from mi_type Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 --- M src/gsm/gsm48.c M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 3 files changed, 6 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/12155/2 -- To view, visit https://gerrit.osmocom.org/12155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 Gerrit-Change-Number: 12155 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:02:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:02:10 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): guard against zero length output buffer In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12156 to look at the new patch set (#3). Change subject: gsm48_mi_to_string(): guard against zero length output buffer ...................................................................... gsm48_mi_to_string(): guard against zero length output buffer All successful cases already return from the switch(), so simply handle all errors below it by returning an empty string (if there is enough string buffer). Change-Id: I709ac3b9efb7b4258d8660715b10312e11b9b571 --- M src/gsm/gsm48.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/12156/3 -- To view, visit https://gerrit.osmocom.org/12156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I709ac3b9efb7b4258d8660715b10312e11b9b571 Gerrit-Change-Number: 12156 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:02:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:02:10 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): do not read from zero length input buffer In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12157 to look at the new patch set (#3). Change subject: gsm48_mi_to_string(): do not read from zero length input buffer ...................................................................... gsm48_mi_to_string(): do not read from zero length input buffer Change-Id: I12cada7c2c5187146ca5a33d1ebfefb4cad65632 --- M src/gsm/gsm48.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/57/12157/3 -- To view, visit https://gerrit.osmocom.org/12157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I12cada7c2c5187146ca5a33d1ebfefb4cad65632 Gerrit-Change-Number: 12157 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:14:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:14:23 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): style tweak: break on error first Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12158 Change subject: gsm48_mi_to_string(): style tweak: break on error first ...................................................................... gsm48_mi_to_string(): style tweak: break on error first In the TMSI case, use early-exit paradigm. It's debatable which way would be early exit, since the success case is also a 'return', but early-exit in the sense of: handle error paths in sub-clauses, with the success path below. Change-Id: Ic76bc5e84ad1278fa3b2db5f5e28cadf1d90a343 --- M src/gsm/gsm48.c 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/12158/1 diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 2d4b840..6568523 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -659,11 +659,12 @@ switch (mi_type) { case GSM_MI_TYPE_TMSI: /* Table 10.5.4.3, reverse generate_mid_from_tmsi */ - if (mi_len == GSM48_TMSI_LEN && mi[0] == (0xf0 | GSM_MI_TYPE_TMSI)) { - tmsi = osmo_load32be(&mi[1]); - return snprintf(string, str_len, "%"PRIu32, tmsi); - } - break; + if (mi_len != GSM48_TMSI_LEN + || mi[0] != (0xf0 | GSM_MI_TYPE_TMSI)) + break; + tmsi = osmo_load32be(&mi[1]); + return snprintf(string, str_len, "%"PRIu32, tmsi); + case GSM_MI_TYPE_IMSI: case GSM_MI_TYPE_IMEI: case GSM_MI_TYPE_IMEISV: -- To view, visit https://gerrit.osmocom.org/12158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic76bc5e84ad1278fa3b2db5f5e28cadf1d90a343 Gerrit-Change-Number: 12158 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:21:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:21:16 +0000 Subject: Change in libosmocore[master]: Add osmo_init_logging_std*() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12094 ) Change subject: Add osmo_init_logging_std*() ...................................................................... Patch Set 2: Code-Review-2 What Pau said. We already have various tests that verify stderr output. Each test also can individually configure logging categories (show only a set of categories) and achieve a reproducable format (hide timestamps, ...). If needed, the next best thing would be 2>&1 in the testsuite.at. For anything that is not a test, logging targets are configured by .cfg file. -- To view, visit https://gerrit.osmocom.org/12094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0fe8dc4a41aba4e4509540266e229700e8ec083c Gerrit-Change-Number: 12094 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 01:21:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:30:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:30:31 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add build-discarder In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12141 ) Change subject: jobs/ttcn3-testsuites.yml: add build-discarder ...................................................................... Patch Set 1: Code-Review+1 ok for me, maybe someone wants to keep more builds for the builds summary in jenkins? so waiting for someone else's +2 -- To view, visit https://gerrit.osmocom.org/12141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib7f01751ca5f6fb3e29a436982e2891d9cab0488 Gerrit-Change-Number: 12141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Dec 2018 01:30:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:32:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:32:02 +0000 Subject: Change in osmo-ci[master]: master-builds: set PUBLISH=0 temporarily In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12137 ) Change subject: master-builds: set PUBLISH=0 temporarily ...................................................................... Patch Set 1: Code-Review+2 yes, let's fix those, but just in case that stuff is breaking and we get failed builds even though the code is fine because of this, I will allow a temporary merge of this. If no jobs break sporadically, then assume I voted like Pau. -- To view, visit https://gerrit.osmocom.org/12137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I946f2e17229d3c602bbe79a72cc37104745ea552 Gerrit-Change-Number: 12137 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 01:32:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:47:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:47:41 +0000 Subject: Change in osmo-hlr[master]: gsupclient: add osmo_gsup_msg_enc_send() helper In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: add osmo_gsup_msg_enc_send() helper ...................................................................... Patch Set 2: Code-Review-1 (6 comments) https://gerrit.osmocom.org/#/c/11989/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11989/2//COMMIT_MSG at 7 PS2, Line 7: gsupclient: add osmo_gsup_msg_enc_send() helper ("helper" triggers a rant from me: it is a word like "framework" or "thing". All functions except main() are helpers.) https://gerrit.osmocom.org/#/c/11989/2//COMMIT_MSG at 10 PS2, Line 10: messages using a given abstract 'osmo_gsup_message' structure. what the function does should be documented at the new function. the commit log is more about understanding why and how the change came to be. And that is exactly what is missing here. All that I can tell is that you are adding dead code?? https://gerrit.osmocom.org/#/c/11989/2/src/gsupclient/gsup_client.c File src/gsupclient/gsup_client.c: https://gerrit.osmocom.org/#/c/11989/2/src/gsupclient/gsup_client.c at 342 PS2, Line 342: /* Helper for encoding and sending GSUP messages */ /* Encode and send a GSUP message. */ Though, that part is rather obvious from the function name, while e.g. the return value is not explained. https://gerrit.osmocom.org/#/c/11989/2/src/gsupclient/gsup_client.c at 349 PS2, Line 349: /* Allocate GSUP message buffer */ omit comments that merely restate the code https://gerrit.osmocom.org/#/c/11989/2/src/gsupclient/gsup_client.c at 356 PS2, Line 356: /* Encode GSUP message */ ditto https://gerrit.osmocom.org/#/c/11989/2/src/gsupclient/gsup_client.c at 363 PS2, Line 363: /* Finally send */ Do you know these API docs that go like: set_value(): Helper to set value. osmo_gsup_encode(): Encode an OsmoGSUP. osmo_gsup_client_send(): Send an OsmoGSUP client. ;) -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Dec 2018 01:47:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 01:49:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 01:49:34 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11991 ) Change subject: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11991/4/src/libmsc/gsm_04_80.c File src/libmsc/gsm_04_80.c: https://gerrit.osmocom.org/#/c/11991/4/src/libmsc/gsm_04_80.c at a83 PS4, Line 83: feel free to implement a gsm0480_create_ussd_release_complete2() in libosmocore -- To view, visit https://gerrit.osmocom.org/11991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I89727354385b40e18732e8fd1d6c93f4463ade37 Gerrit-Change-Number: 11991 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Dec 2018 01:49:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 6 06:24:32 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 06:24:32 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4389?= In-Reply-To: <1985577898.1095.1544058013134.JavaMail.jenkins@jenkins.osmocom.org> References: <1985577898.1095.1544058013134.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <819327985.1109.1544077472840.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.16 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' if test -d "osmo-bsc-1.3.0.269-1b963"; then find "osmo-bsc-1.3.0.269-1b963" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.269-1b963" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.269-1b963"; }; else :; fi ========================================================== osmo-bsc-1.3.0.269-1b963 archives ready for distribution: osmo-bsc-1.3.0.269-1b963.tar.gz osmo-bsc-1.3.0.269-1b963.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 6 06:36:18 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 06:36:18 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4390?= In-Reply-To: <819327985.1109.1544077472840.JavaMail.jenkins@jenkins.osmocom.org> References: <819327985.1109.1544077472840.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <579754052.1111.1544078178253.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.16 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' if test -d "osmo-bsc-1.3.0.269-1b963"; then find "osmo-bsc-1.3.0.269-1b963" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.269-1b963" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.269-1b963"; }; else :; fi ========================================================== osmo-bsc-1.3.0.269-1b963 archives ready for distribution: osmo-bsc-1.3.0.269-1b963.tar.gz osmo-bsc-1.3.0.269-1b963.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] make: *** [publish] Error 255 /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 6 06:53:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 06:53:42 +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_#211?= Message-ID: <126393615.1112.1544079222446.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 161.75 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 6 07:36:46 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 07:36:46 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-ggsn_=C2=BB_--disable-gtp-?= =?UTF-8?Q?linux,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#1196?= Message-ID: <806470406.1114.1544081806418.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 26.63 KB...] make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc8gen.c GEN crc16gen.c GEN crc32gen.c GEN crc64gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC timer_clockgettime.lo CC select.lo CC signal.lo CC msgb.lo CC bitvec.lo CC bits.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC vty.lo CC vector.lo CC utils.lo CC telnet_interface.lo CC stats_vty.lo CC logging_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm620.lo CC gsm610.lo CC gsm660.lo CC gsm690.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC comp128.lo CC tlv_parser.lo CC comp128v23.lo CC gsm_utils.lo CC rsl.lo CC gsm48.lo /bin/bash: line 2: 30057 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gsm48.lo -MD -MP -MF $depbase.Tpo -c -o gsm48.lo gsm48.c Makefile:594: recipe for target 'gsm48.lo' failed make[3]: *** [gsm48.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ make[3]: Leaving directory ' Makefile:699: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 6 07:36:59 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 07:36:59 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-ggsn_=C2=BB_--enable-gtp-?= =?UTF-8?Q?linux,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#1196?= Message-ID: <992955556.1115.1544081819179.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 44.59 KB...] CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC vty.lo CC utils.lo CC telnet_interface.lo CC logging_vty.lo CC vector.lo CC stats_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC ecu_fr.lo CC gsm660.lo CC gsm690.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC rxlev_stat.lo CC tlv_parser.lo CC gsm_utils.lo CC a5.lo CC rsl.lo CC comp128v23.lo CC comp128.lo CC gsm48.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo CC gprs_gea.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo CC milenage/aes-encblock.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo *** stack smashing detected ***: /bin/bash terminated /bin/bash: line 2: 7346 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT milenage/aes-encblock.lo -MD -MP -MF $depbase.Tpo -c -o milenage/aes-encblock.lo milenage/aes-encblock.c Makefile:594: recipe for target 'milenage/aes-encblock.lo' failed make[3]: *** [milenage/aes-encblock.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:699: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 6 08:40:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 08:40:04 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4391?= In-Reply-To: <579754052.1111.1544078178253.JavaMail.jenkins@jenkins.osmocom.org> References: <579754052.1111.1544078178253.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <609301097.1116.1544085604095.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.16 MB...] Making distclean in bsc make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom/bsc' make[4]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include/osmocom' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in libfilter make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' rm -rf .libs _libs test -z "libfilter.a " || rm -f libfilter.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libfilter" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/libfilter' Making distclean in osmo-bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' rm -f osmo-bsc rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/osmo-bsc' Making distclean in utils make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' rm -f bs11_config isdnsync meas_json osmo-meas-udp2db osmo-meas-pcap2db rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/utils" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/utils' Making distclean in ipaccess make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' rm -f abisip-find ipaccess-config ipaccess-proxy rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/ipaccess" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src/ipaccess' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in bsc make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' rm -rf .libs _libs rm -f bsc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/bsc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/bsc' Making distclean in codec_pref make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' rm -rf .libs _libs rm -f codec_pref_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/codec_pref" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/codec_pref' Making distclean in gsm0408 make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' rm -rf .libs _libs rm -f gsm0408_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/gsm0408" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/gsm0408' Making distclean in abis make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' rm -rf .libs _libs rm -f abis_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/abis" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/abis' Making distclean in subscr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' rm -rf .libs _libs rm -f bsc_subscr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/subscr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/subscr' Making distclean in nanobts_omlattr make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' rm -rf .libs _libs rm -f nanobts_omlattr_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/nanobts_omlattr" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/nanobts_omlattr' Making distclean in handover make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' rm -rf .libs _libs rm -f handover_test neighbor_ident_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/handover" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests/handover' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build/contrib' make[2]: Entering directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-bsc-1.3.0.269-1b963/_build' if test -d "osmo-bsc-1.3.0.269-1b963"; then find "osmo-bsc-1.3.0.269-1b963" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-bsc-1.3.0.269-1b963" || { sleep 5 && rm -rf "osmo-bsc-1.3.0.269-1b963"; }; else :; fi ========================================================== osmo-bsc-1.3.0.269-1b963 archives ready for distribution: osmo-bsc-1.3.0.269-1b963.tar.gz osmo-bsc-1.3.0.269-1b963.tar.bz2 ========================================================== + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:27:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 09:27:28 +0000 Subject: Change in libosmocore[master]: Allow log_init() with NULL log_info In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12092 to look at the new patch set (#3). Change subject: Allow log_init() with NULL log_info ...................................................................... Allow log_init() with NULL log_info Since we have library-internal categories we don't have to force application to supply its own categories. This is especially useful for testing code inside libosmocore which only use internal categories anyway. Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 --- M src/logging.c 1 file changed, 15 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/92/12092/3 -- To view, visit https://gerrit.osmocom.org/12092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 Gerrit-Change-Number: 12092 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:27:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 09:27:28 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11827 to look at the new patch set (#20). Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... LCLS, TS 29.205: add GCR routines Add functions to encode and decode Global Call Reference as per 3GPP TS 29.205 Table B 2.1.9.1 add corresponding tests. Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Related: OS#2487 --- M include/Makefile.am A include/osmocom/gsm/gsm29205.h M src/gsm/Makefile.am A src/gsm/gsm29205.c M src/gsm/libosmogsm.map M tests/Makefile.am A tests/gsm29205/gsm29205_test.c A tests/gsm29205/gsm29205_test.ok M tests/testsuite.at 9 files changed, 252 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/11827/20 -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 20 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:27:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 09:27:28 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12020 to look at the new patch set (#14). Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... LCLS, TS 48.008: add GCR IE encoding/decoding * add functions to encode Global Call. Ref. from TS 29.205 as 3GPP TS 48.008 ?3.2.2.115 information element * add corresponding tests Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 109 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/12020/14 -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 14 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:31:04 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 09:31:04 +0000 Subject: Change in osmo-ci[master]: master-builds: set PUBLISH=0 temporarily In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12137 to look at the new patch set (#2). Change subject: master-builds: set PUBLISH=0 temporarily ...................................................................... master-builds: set PUBLISH=0 temporarily Disable uploading PDFs, as the SSH keys of some Jenkins bots are not whitelisted for uploading yet. They get a permission denied error and this is currently failing builds on master. Related: OS#3385 Change-Id: I946f2e17229d3c602bbe79a72cc37104745ea552 --- M jobs/master-builds.yml 1 file changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/37/12137/2 -- To view, visit https://gerrit.osmocom.org/12137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I946f2e17229d3c602bbe79a72cc37104745ea552 Gerrit-Change-Number: 12137 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:35:30 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 09:35:30 +0000 Subject: Change in osmo-ci[master]: master-builds: set PUBLISH=0 temporarily In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12137 ) Change subject: master-builds: set PUBLISH=0 temporarily ...................................................................... Patch Set 2: I've missed osmo-bsc, updated the patch and pushed it to jenkins. > just in case that stuff is breaking and we get failed builds even though the code is fine because of this, I will allow a temporary merge of this. That's exactly what's happening with PUBLISH=1 currently. (But I have rolled out this patch to Jenkins yesterday, and today again with PUBLISH=0 also applied to osmo-bsc, to stop the jobs from breaking). -- To view, visit https://gerrit.osmocom.org/12137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I946f2e17229d3c602bbe79a72cc37104745ea552 Gerrit-Change-Number: 12137 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 06 Dec 2018 09:35:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:41:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 09:41:28 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 06 Dec 2018 09:41:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 6 09:43:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 09:43:22 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-bsc_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#4392?= In-Reply-To: <609301097.1116.1544085604095.JavaMail.jenkins@jenkins.osmocom.org> References: <609301097.1116.1544085604095.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <145932428.1118.1544089402185.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:45:10 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 6 Dec 2018 09:45:10 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: adjust http error log In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12149 ) Change subject: Trap handlers: adjust http error log ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12149/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12149/1//COMMIT_MSG at 10 PS1, Line 10: read the logs. Can you add the difference between e and repr(e) here so we can see what's better about it? -- To view, visit https://gerrit.osmocom.org/12149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39870b83cacee9a589636974d04e356ef0d32345 Gerrit-Change-Number: 12149 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 09:45:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:46:47 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 6 Dec 2018 09:46:47 +0000 Subject: Change in python/osmo-python-tests[master]: twisted: disable low-level logging in dispatchers In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12150 ) Change subject: twisted: disable low-level logging in dispatchers ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12150/1/osmopy/twisted_ipa.py File osmopy/twisted_ipa.py: https://gerrit.osmocom.org/#/c/12150/1/osmopy/twisted_ipa.py at 149 PS1, Line 149: #self.dbg('IPA received %s::%s [%d/%d] %s' % (IPA().proto(proto), IPA().ext_name(proto, extension), len(data), len(content), content)) Better just remove them completely -- To view, visit https://gerrit.osmocom.org/12150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a054eec9ef7ab39e15ac0cd64834a251d4fb2d7 Gerrit-Change-Number: 12150 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 09:46:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:50:27 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 6 Dec 2018 09:50:27 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: make http request timeout configurable In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12148 ) Change subject: ctrl2cgi: make http request timeout configurable ...................................................................... Patch Set 1: Code-Review+1 Looks good, though I know little about twisted -- To view, visit https://gerrit.osmocom.org/12148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7839121da831aeab0be7e599049bf79471f845fd Gerrit-Change-Number: 12148 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 09:50:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:53:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 09:53:50 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: propagate expected BSC id to command processor In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12145 ) Change subject: Trap handlers: propagate expected BSC id to command processor ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6acdfddb9a1132f978f2b55c769559b0c29eb3e8 Gerrit-Change-Number: 12145 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 09:53:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:54:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 09:54:06 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: log request/reply as info level In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12146 ) Change subject: Trap handlers: log request/reply as info level ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If8eae9f36292930571954becf6613fada43d301c Gerrit-Change-Number: 12146 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 09:54:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:54:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 09:54:22 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: log request time In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12147 ) Change subject: ctrl2cgi: log request time ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11c8ac67a2730a9c6912694e5b83bbdf08fe357d Gerrit-Change-Number: 12147 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 09:54:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:54:31 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 6 Dec 2018 09:54:31 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: log request time In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12147 ) Change subject: ctrl2cgi: log request time ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12147/1/scripts/ctrl2cgi.py File scripts/ctrl2cgi.py: https://gerrit.osmocom.org/#/c/12147/1/scripts/ctrl2cgi.py at 64 PS1, Line 64: def make_async_req(ts, dst, par, f_write, f_log): I think we want to know: 1. How long between preparing request and sending it 2. How long between sending a request and receiving an answer So maybe add a log statement here with the difference between ts and datetime.now and pass a new datetime.now into the callback? -- To view, visit https://gerrit.osmocom.org/12147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11c8ac67a2730a9c6912694e5b83bbdf08fe357d Gerrit-Change-Number: 12147 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 09:54:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:54:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 09:54:36 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: make http request timeout configurable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12148 ) Change subject: ctrl2cgi: make http request timeout configurable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7839121da831aeab0be7e599049bf79471f845fd Gerrit-Change-Number: 12148 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 09:54:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:54:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 09:54:46 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: propagate expected BSC id to command processor In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12145 ) Change subject: Trap handlers: propagate expected BSC id to command processor ...................................................................... Trap handlers: propagate expected BSC id to command processor When receiving commands for particular BSC, log BSC id known at the time when request was made, not the one which is part of the reply. Change-Id: I6acdfddb9a1132f978f2b55c769559b0c29eb3e8 --- M osmopy/trap_helper.py M scripts/ctrl2cgi.py M scripts/soap.py 3 files changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index 45dc527..b7202ac 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -55,12 +55,12 @@ loc = split_type(v) return loc[-1] -def comm_proc(comm, f, log): +def comm_proc(comm, bid, f, log): """ Command processor: takes function f to run for each command """ bsc_id = comm[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format - log.debug("BSC %s commands: %r" % (bsc_id, comm)) + log.debug("BSC %s commands: %r" % (bid, comm)) for t in comm: (_, m) = Ctrl().cmd(*t.split()) f(m) diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index cd59209..addca2f 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -40,12 +40,12 @@ assert V(twisted_ipa_version) > V('0.4') -def handle_reply(f, log, resp): +def handle_reply(bid, f, log, resp): """ Reply handler: process raw CGI server response, function f to run for each command """ decoded = json.loads(resp.decode('utf-8')) - comm_proc(decoded.get('commands'), f, log) + comm_proc(decoded.get('commands'), bid, f, log) def gen_hash(params, skey): inp = '' @@ -62,7 +62,7 @@ def make_async_req(dst, par, f_write, f_log): d = post(dst, par) - d.addCallback(collect, partial(handle_reply, f_write, f_log)) # treq's collect helper is handy to get all reply content at once + d.addCallback(collect, partial(handle_reply, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, par['bsc_id'], dst))) # handle HTTP errors return d diff --git a/scripts/soap.py b/scripts/soap.py index 0534000..f771530 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -38,12 +38,12 @@ assert V(twisted_ipa_version) > V('0.4') -def handle_reply(p, f, log, r): +def handle_reply(p, bid, f, log, r): """ Reply handler: takes function p to process raw SOAP server reply r, function f to run for each command """ repl = p(r) # result is expected to have both commands[] array and error string (could be None) - bsc_id = comm_proc(repl.commands, f, log) + bsc_id = comm_proc(repl.commands, bid, f, log) log.info("Received SOAP response for BSC %s with %d commands, error status: %s" % (bsc_id, len(repl.commands), repl.error)) @@ -89,7 +89,7 @@ self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) ctx = self.factory.client.registerSiteLocation(bsc, float(params['lon']), float(params['lat']), params['position_validity'], params['time_stamp'], params['oper_status'], params['admin_status'], params['policy_status']) d = post(self.factory.location, ctx.envelope) - d.addCallback(collect, partial(handle_reply, ctx.process_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx + d.addCallback(collect, partial(handle_reply, ctx.process_reply, params['bsc_id'], self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors # Ensure that we run only limited number of requests in parallel: yield self.factory.semaphore.acquire() -- To view, visit https://gerrit.osmocom.org/12145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6acdfddb9a1132f978f2b55c769559b0c29eb3e8 Gerrit-Change-Number: 12145 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:54:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 09:54:47 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: log request/reply as info level In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12146 ) Change subject: Trap handlers: log request/reply as info level ...................................................................... Trap handlers: log request/reply as info level Log the basic location-state trap triggering request and command reply as info level - that way we can receive useful information without turning on full debug output. Change-Id: If8eae9f36292930571954becf6613fada43d301c --- M osmopy/trap_helper.py M scripts/ctrl2cgi.py M scripts/soap.py 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index b7202ac..3e80c6d 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -60,7 +60,7 @@ Command processor: takes function f to run for each command """ bsc_id = comm[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format - log.debug("BSC %s commands: %r" % (bid, comm)) + log.info("BSC %s commands: %r" % (bid, comm)) for t in comm: (_, m) = Ctrl().cmd(*t.split()) f(m) diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index addca2f..5c675bc 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -104,7 +104,7 @@ Handle location-state TRAP: parse trap content, build CGI Request and use treq's routines to post it while setting up async handlers """ params = make_params(bsc, data) - self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) + self.factory.log.info('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) params['h'] = gen_hash(params, self.factory.secret_key) # Ensure that we run only limited number of requests in parallel: self.factory.semaphore.run(make_async_req, self.factory.location, params, self.transport.write, self.factory.log) diff --git a/scripts/soap.py b/scripts/soap.py index f771530..5817988 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -86,7 +86,7 @@ Handle location-state TRAP: parse trap content, build SOAP context and use treq's routines to post it while setting up async handlers """ params = make_params(bsc, data) - self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) + self.factory.log.info('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) ctx = self.factory.client.registerSiteLocation(bsc, float(params['lon']), float(params['lat']), params['position_validity'], params['time_stamp'], params['oper_status'], params['admin_status'], params['policy_status']) d = post(self.factory.location, ctx.envelope) d.addCallback(collect, partial(handle_reply, ctx.process_reply, params['bsc_id'], self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx -- To view, visit https://gerrit.osmocom.org/12146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If8eae9f36292930571954becf6613fada43d301c Gerrit-Change-Number: 12146 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:54:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 09:54:47 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: log request time In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12147 ) Change subject: ctrl2cgi: log request time ...................................................................... ctrl2cgi: log request time Log http request timestamp and duration on debug loglevel. This is especially helpful while troubleshooting issues with multiple concurrent requests under significant load while network issues are present. Change-Id: I11c8ac67a2730a9c6912694e5b83bbdf08fe357d Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 9 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved Objections: daniel: I would prefer this is not merged as is diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 5c675bc..e11e6e6 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,9 +22,9 @@ */ """ -__version__ = "0.0.6" # bump this on every non-trivial change +__version__ = "0.0.7" # bump this on every non-trivial change -import argparse, os, logging, logging.handlers +import argparse, os, logging, logging.handlers, datetime import hashlib import json import configparser @@ -40,11 +40,12 @@ assert V(twisted_ipa_version) > V('0.4') -def handle_reply(bid, f, log, resp): +def handle_reply(ts, bid, f, log, resp): """ Reply handler: process raw CGI server response, function f to run for each command """ decoded = json.loads(resp.decode('utf-8')) + log.debug('request for BSC %s took %d seconds' % (bid, (datetime.datetime.now() - ts).total_seconds())) comm_proc(decoded.get('commands'), bid, f, log) def gen_hash(params, skey): @@ -60,9 +61,9 @@ #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res -def make_async_req(dst, par, f_write, f_log): +def make_async_req(ts, dst, par, f_write, f_log): d = post(dst, par) - d.addCallback(collect, partial(handle_reply, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once + d.addCallback(collect, partial(handle_reply, ts, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, par['bsc_id'], dst))) # handle HTTP errors return d @@ -106,8 +107,10 @@ params = make_params(bsc, data) self.factory.log.info('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) params['h'] = gen_hash(params, self.factory.secret_key) + t = datetime.datetime.now() + self.factory.log.debug('Preparing request for BSC %s @ %s...' % (params['bsc_id'], t)) # Ensure that we run only limited number of requests in parallel: - self.factory.semaphore.run(make_async_req, self.factory.location, params, self.transport.write, self.factory.log) + self.factory.semaphore.run(make_async_req, t, self.factory.location, params, self.transport.write, self.factory.log) def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): """ -- To view, visit https://gerrit.osmocom.org/12147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I11c8ac67a2730a9c6912694e5b83bbdf08fe357d Gerrit-Change-Number: 12147 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:54:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 09:54:48 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: make http request timeout configurable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12148 ) Change subject: ctrl2cgi: make http request timeout configurable ...................................................................... ctrl2cgi: make http request timeout configurable Change-Id: I7839121da831aeab0be7e599049bf79471f845fd Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index e11e6e6..81674d8 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.0.7" # bump this on every non-trivial change +__version__ = "0.0.8" # bump this on every non-trivial change import argparse, os, logging, logging.handlers, datetime import hashlib @@ -61,10 +61,10 @@ #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res -def make_async_req(ts, dst, par, f_write, f_log): - d = post(dst, par) +def make_async_req(ts, dst, par, f_write, f_log, tout): + d = post(dst, par, timeout=tout) d.addCallback(collect, partial(handle_reply, ts, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once - d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, par['bsc_id'], dst))) # handle HTTP errors + d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s (timeout %d)" % (e, par['bsc_id'], dst, tout))) # handle HTTP errors return d class Trap(CTRL): @@ -110,7 +110,7 @@ t = datetime.datetime.now() self.factory.log.debug('Preparing request for BSC %s @ %s...' % (params['bsc_id'], t)) # Ensure that we run only limited number of requests in parallel: - self.factory.semaphore.run(make_async_req, t, self.factory.location, params, self.transport.write, self.factory.log) + self.factory.semaphore.run(make_async_req, t, self.factory.location, params, self.transport.write, self.factory.log, self.factory.timeout) def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): """ @@ -148,6 +148,7 @@ T.addr_ctrl = config['main'].get('addr_ctrl', 'localhost') T.port_ctrl = config['main'].getint('port_ctrl', 4250) + T.timeout = config['main'].getint('timeout', 30) T.semaphore = defer.DeferredSemaphore(config['main'].getint('num_max_conn', 5)) T.location = config['main'].get('location') T.secret_key = config['main'].get('secret_key') -- To view, visit https://gerrit.osmocom.org/12148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7839121da831aeab0be7e599049bf79471f845fd Gerrit-Change-Number: 12148 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:55:27 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 6 Dec 2018 09:55:27 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: log request/reply as info level In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12146 ) Change subject: Trap handlers: log request/reply as info level ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If8eae9f36292930571954becf6613fada43d301c Gerrit-Change-Number: 12146 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 09:55:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:56:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 09:56:33 +0000 Subject: Change in openbsc[master]: Remove ipaccess utils In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11921 ) Change subject: Remove ipaccess utils ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9c04f9b469e60802461a2a6e421d3ba27e6dafa1 Gerrit-Change-Number: 11921 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 06 Dec 2018 09:56:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:56:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 09:56:35 +0000 Subject: Change in openbsc[master]: Remove ipaccess utils In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11921 ) Change subject: Remove ipaccess utils ...................................................................... Remove ipaccess utils There's increasing gap in functionality between ipaccess utils from this repo and from osmo-bsc due to ongoing development in new repository. To avoid potential user confusion let's drop them similar to the way SGSN was removed earlier. Change-Id: I9c04f9b469e60802461a2a6e421d3ba27e6dafa1 --- M debian/control D debian/osmocom-ipaccess-utils.install M debian/rules M openbsc/README M openbsc/configure.ac M openbsc/src/Makefile.am D openbsc/src/ipaccess/Makefile.am D openbsc/src/ipaccess/abisip-find.c D openbsc/src/ipaccess/ipaccess-config.c D openbsc/src/ipaccess/ipaccess-firmware.c D openbsc/src/ipaccess/ipaccess-proxy.c D openbsc/src/ipaccess/network_listen.c 12 files changed, 0 insertions(+), 2,935 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian/control b/debian/control index 0e9bb0c..a841acf 100644 --- a/debian/control +++ b/debian/control @@ -42,15 +42,6 @@ components bundled together. When using osmocom-nitb, there is no need for a Mobile Switching Center (MSC) which is needed when using osmocom-bsc-sccplite. -Package: osmocom-ipaccess-utils -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: Command line utilities for ip.access nanoBTS - This package contains utilities that are specific for nanoBTS when being used - together with OpenBSC. It contains mainly three tools: ipaccess-find, - ipaccess-config and ipaccess-proxy. - Package: osmocom-bs11-utils Architecture: any Depends: ${shlibs:Depends}, diff --git a/debian/osmocom-ipaccess-utils.install b/debian/osmocom-ipaccess-utils.install deleted file mode 100644 index de13c18..0000000 --- a/debian/osmocom-ipaccess-utils.install +++ /dev/null @@ -1,3 +0,0 @@ -/usr/bin/ipaccess-config -/usr/bin/abisip-find -/usr/bin/ipaccess-proxy diff --git a/debian/rules b/debian/rules index dc609f9..0ea9b23 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ override_dh_strip: dh_strip -posmocom-bsc-sccplite --dbg-package=osmocom-bsc-sccplite-dbg dh_strip -posmocom-nitb --dbg-package=osmocom-nitb-dbg - dh_strip -posmocom-ipaccess-utils --dbg-package=osmocom-ipaccess-utils-dbg dh_strip -posmocom-bs11-utils --dbg-package=osmocom-bs11-utils-dbg dh_strip -posmocom-bsc-nat --dbg-package=osmocom-bsc-nat-dbg diff --git a/openbsc/README b/openbsc/README index d01b2cf..bffdd81 100644 --- a/openbsc/README +++ b/openbsc/README @@ -14,7 +14,6 @@ * Osmo-GbProxy - a Proxy to aggregate many Gb links as one Gb link to the SGSN * OsmoBSCNAT - a gateway aggregating many A links as one A link to the MSC * OsmoGTPHUB - a hub aggregating many GTP links (between SGSN and GGSN) - * ipaccess-utils - some tools to discover + configure ip.access nanoBTS * bs11_config - a tool to configure the Siemens BS-11 microBTS Various interfaces towards the BTS are supported, among which are: diff --git a/openbsc/configure.ac b/openbsc/configure.ac index 75dd5d3..64285e0 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -259,7 +259,6 @@ src/osmo-bsc/Makefile src/osmo-bsc_nat/Makefile src/osmo-bsc_mgcp/Makefile - src/ipaccess/Makefile src/utils/Makefile tests/Makefile tests/atlocal diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am index e579ea0..86d6f8f 100644 --- a/openbsc/src/Makefile.am +++ b/openbsc/src/Makefile.am @@ -42,7 +42,6 @@ osmo-nitb \ osmo-bsc_mgcp \ utils \ - ipaccess \ $(NULL) # Conditional Programs diff --git a/openbsc/src/ipaccess/Makefile.am b/openbsc/src/ipaccess/Makefile.am deleted file mode 100644 index 4dfe247..0000000 --- a/openbsc/src/ipaccess/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir)/include \ - -I$(top_builddir) \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(NULL) - -AM_LDFLAGS = \ - $(COVERAGE_LDFLAGS) \ - $(NULL) - -OSMO_LIBS = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOABIS_LIBS) \ - $(NULL) - -bin_PROGRAMS = \ - abisip-find \ - ipaccess-config \ - ipaccess-proxy \ - $(NULL) - -abisip_find_LDADD = \ - $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libtrau/libtrau.a \ - $(top_builddir)/src/libcommon/libcommon.a \ - $(OSMO_LIBS) \ - $(NULL) - -abisip_find_SOURCES = \ - abisip-find.c \ - $(NULL) - -ipaccess_config_SOURCES = \ - ipaccess-config.c \ - ipaccess-firmware.c \ - network_listen.c \ - $(NULL) - -# FIXME: resolve the bogus dependencies patched around here: -ipaccess_config_LDADD = \ - $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libtrau/libtrau.a \ - $(top_builddir)/src/libcommon/libcommon.a \ - $(OSMO_LIBS) \ - $(NULL) - -ipaccess_proxy_SOURCES = \ - ipaccess-proxy.c \ - $(NULL) - -ipaccess_proxy_LDADD = \ - $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libtrau/libtrau.a \ - $(top_builddir)/src/libcommon/libcommon.a \ - $(OSMO_LIBS) \ - $(NULL) diff --git a/openbsc/src/ipaccess/abisip-find.c b/openbsc/src/ipaccess/abisip-find.c deleted file mode 100644 index 21d9f22..0000000 --- a/openbsc/src/ipaccess/abisip-find.c +++ /dev/null @@ -1,216 +0,0 @@ -/* ip.access nanoBTS configuration tool */ - -/* (C) 2009-2010 by Harald Welte - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include - - -#include -#include -#include -#include -#include - -static int udp_sock(const char *ifname) -{ - int fd, rc, bc = 1; - struct sockaddr_in sa; - - fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); - if (fd < 0) - return fd; - - if (ifname) { -#ifdef __FreeBSD__ - rc = setsockopt(fd, SOL_SOCKET, IP_RECVIF, ifname, - strlen(ifname)); -#else - rc = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, ifname, - strlen(ifname)); -#endif - if (rc < 0) - goto err; - } - - memset(&sa, 0, sizeof(sa)); - sa.sin_family = AF_INET; - sa.sin_port = htons(3006); - sa.sin_addr.s_addr = INADDR_ANY; - - rc = bind(fd, (struct sockaddr *)&sa, sizeof(sa)); - if (rc < 0) - goto err; - - rc = setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &bc, sizeof(bc)); - if (rc < 0) - goto err; - -#if 0 - /* we cannot bind, since the response packets don't come from - * the broadcast address */ - sa.sin_family = AF_INET; - sa.sin_port = htons(3006); - inet_aton("255.255.255.255", &sa.sin_addr); - - rc = connect(fd, (struct sockaddr *)&sa, sizeof(sa)); - if (rc < 0) - goto err; -#endif - return fd; - -err: - close(fd); - return rc; -} - -const unsigned char find_pkt[] = { 0x00, 0x0b+8, IPAC_PROTO_IPACCESS, 0x00, - IPAC_MSGT_ID_GET, - 0x01, IPAC_IDTAG_MACADDR, - 0x01, IPAC_IDTAG_IPADDR, - 0x01, IPAC_IDTAG_UNIT, - 0x01, IPAC_IDTAG_LOCATION1, - 0x01, IPAC_IDTAG_LOCATION2, - 0x01, IPAC_IDTAG_EQUIPVERS, - 0x01, IPAC_IDTAG_SWVERSION, - 0x01, IPAC_IDTAG_UNITNAME, - 0x01, IPAC_IDTAG_SERNR, - }; - - -static int bcast_find(int fd) -{ - struct sockaddr_in sa; - - sa.sin_family = AF_INET; - sa.sin_port = htons(3006); - inet_aton("255.255.255.255", &sa.sin_addr); - - return sendto(fd, find_pkt, sizeof(find_pkt), 0, (struct sockaddr *) &sa, sizeof(sa)); -} - -static int parse_response(unsigned char *buf, int len) -{ - uint8_t t_len; - uint8_t t_tag; - uint8_t *cur = buf; - - while (cur < buf + len) { - t_len = *cur++; - t_tag = *cur++; - - printf("%s='%s' ", ipa_ccm_idtag_name(t_tag), cur); - - cur += t_len; - } - printf("\n"); - return 0; -} - -static int read_response(int fd) -{ - unsigned char buf[255]; - struct sockaddr_in sa; - int len; - socklen_t sa_len = sizeof(sa); - - len = recvfrom(fd, buf, sizeof(buf), 0, (struct sockaddr *)&sa, &sa_len); - if (len < 0) - return len; - - /* 2 bytes length, 1 byte protocol */ - if (buf[2] != IPAC_PROTO_IPACCESS) - return 0; - - if (buf[4] != IPAC_MSGT_ID_RESP) - return 0; - - return parse_response(buf+6, len-6); -} - -static int bfd_cb(struct osmo_fd *bfd, unsigned int flags) -{ - if (flags & BSC_FD_READ) - return read_response(bfd->fd); - if (flags & BSC_FD_WRITE) { - bfd->when &= ~BSC_FD_WRITE; - return bcast_find(bfd->fd); - } - return 0; -} - -static struct osmo_timer_list timer; - -static void timer_cb(void *_data) -{ - struct osmo_fd *bfd = _data; - - bfd->when |= BSC_FD_WRITE; - - osmo_timer_schedule(&timer, 5, 0); -} - -int main(int argc, char **argv) -{ - struct osmo_fd bfd; - char *ifname = NULL; - int rc; - - printf("abisip-find (C) 2009 by Harald Welte\n"); - printf("This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY\n\n"); - - if (argc < 2) { - fprintf(stdout, "you might need to specify the outgoing\n" - " network interface, e.g. ``%s eth0''\n", argv[0]); - } else { - ifname = argv[1]; - } - - bfd.cb = bfd_cb; - bfd.when = BSC_FD_READ | BSC_FD_WRITE; - bfd.fd = udp_sock(ifname); - if (bfd.fd < 0) { - perror("Cannot create local socket for broadcast udp"); - exit(1); - } - - rc = osmo_fd_register(&bfd); - if (rc < 0) { - fprintf(stderr, "Cannot register FD\n"); - exit(1); - } - - osmo_timer_setup(&timer, timer_cb, &bfd); - osmo_timer_schedule(&timer, 5, 0); - - printf("Trying to find ip.access BTS by broadcast UDP...\n"); - - while (1) { - rc = osmo_select_main(0); - if (rc < 0) - exit(3); - } - - exit(0); -} - diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c deleted file mode 100644 index 6822c06..0000000 --- a/openbsc/src/ipaccess/ipaccess-config.c +++ /dev/null @@ -1,1019 +0,0 @@ -/* ip.access nanoBTS configuration tool */ - -/* (C) 2009-2010 by Harald Welte - * (C) 2009-2011 by Holger Hans Peter Freyther - * (C) 2009-2010 by On-Waves - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#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 - -struct gsm_network *bsc_gsmnet; - -static int net_listen_testnr; -static int restart; -static char *prim_oml_ip; -static char *bts_ip_addr, *bts_ip_mask, *bts_ip_gw; -static char *unit_id; -static uint16_t nv_flags; -static uint16_t nv_mask; -static char *software = NULL; -static int sw_load_state = 0; -static int oml_state = 0; -static int dump_files = 0; -static char *firmware_analysis = NULL; -static int found_trx = 0; -static int loop_tests = 0; - -static void *tall_ctx_config = NULL; -static struct abis_nm_sw_desc *sw_load1 = NULL; -static struct abis_nm_sw_desc *sw_load2 = NULL; - -/* -static uint8_t prim_oml_attr[] = { 0x95, 0x00, 7, 0x88, 192, 168, 100, 11, 0x00, 0x00 }; -static uint8_t unit_id_attr[] = { 0x91, 0x00, 9, '2', '3', '4', '2', '/' , '0', '/', '0', 0x00 }; -*/ - -extern int ipaccess_fd_cb(struct osmo_fd *bfd, unsigned int what); -extern struct e1inp_line_ops ipaccess_e1inp_line_ops; - -/* Actively connect to a BTS. Currently used by ipaccess-config.c */ -static int ipaccess_connect(struct e1inp_line *line, struct sockaddr_in *sa) -{ - struct e1inp_ts *e1i_ts = &line->ts[0]; - struct osmo_fd *bfd = &e1i_ts->driver.ipaccess.fd; - int ret, on = 1; - - bfd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ | BSC_FD_WRITE; - bfd->data = line; - bfd->priv_nr = E1INP_SIGN_OML; - - if (bfd->fd < 0) { - LOGP(DLINP, LOGL_ERROR, "could not create TCP socket.\n"); - return -EIO; - } - - ret = setsockopt(bfd->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "could not set socket option\n"); - close(bfd->fd); - return -EIO; - } - - ret = connect(bfd->fd, (struct sockaddr *) sa, sizeof(*sa)); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "could not connect socket\n"); - close(bfd->fd); - return ret; - } - - ret = osmo_fd_register(bfd); - if (ret < 0) { - close(bfd->fd); - return ret; - } - return ret; - //return e1inp_line_register(line); -} - -/* configure pseudo E1 line in ip.access style and connect to BTS */ -static int ia_config_connect(struct gsm_bts *bts, struct sockaddr_in *sin) -{ - struct e1inp_line *line; - struct e1inp_ts *sign_ts, *rsl_ts; - struct e1inp_sign_link *oml_link, *rsl_link; - - line = talloc_zero(tall_bsc_ctx, struct e1inp_line); - if (!line) - return -ENOMEM; - - line->driver = e1inp_driver_find("ipa"); - if (!line->driver) { - fprintf(stderr, "cannot `ipa' driver, giving up.\n"); - return -EINVAL; - } - line->ops = &ipaccess_e1inp_line_ops; - - /* create E1 timeslots for signalling and TRAU frames */ - e1inp_ts_config_sign(&line->ts[1-1], line); - e1inp_ts_config_sign(&line->ts[2-1], line); - - /* create signalling links for TS1 */ - sign_ts = &line->ts[1-1]; - rsl_ts = &line->ts[2-1]; - oml_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_OML, - bts->c0, 0xff, 0); - rsl_link = e1inp_sign_link_create(rsl_ts, E1INP_SIGN_RSL, - bts->c0, 0, 0); - - /* create back-links from bts/trx */ - bts->oml_link = oml_link; - bts->c0->rsl_link = rsl_link; - - /* default port at BTS for incoming connections is 3006 */ - if (sin->sin_port == 0) - sin->sin_port = htons(3006); - - return ipaccess_connect(line, sin); -} - -/* - * Callback function for NACK on the OML NM - * - * Currently we send the config requests but don't check the - * result. The nanoBTS will send us a NACK when we did something the - * BTS didn't like. - */ -static int ipacc_msg_nack(uint8_t mt) -{ - fprintf(stderr, "Failure to set attribute. This seems fatal\n"); - exit(-1); - return 0; -} - -static void check_restart_or_exit(struct gsm_bts_trx *trx) -{ - if (restart) { - abis_nm_ipaccess_restart(trx); - } else { - exit(0); - } -} - -static int ipacc_msg_ack(uint8_t mt, struct gsm_bts_trx *trx) -{ - if (sw_load_state == 1) { - fprintf(stderr, "The new software is activaed.\n"); - check_restart_or_exit(trx); - } else if (oml_state == 1) { - fprintf(stderr, "Set the NV Attributes.\n"); - check_restart_or_exit(trx); - } - - return 0; -} - -static const uint8_t phys_conf_min[] = { 0x02 }; - -static uint16_t build_physconf(uint8_t *physconf_buf, const struct rxlev_stats *st) -{ - uint16_t *whitelist = (uint16_t *) (physconf_buf + 4); - int num_arfcn; - unsigned int arfcnlist_size; - - /* Create whitelist from rxlevels */ - physconf_buf[0] = phys_conf_min[0]; - physconf_buf[1] = NM_IPAC_EIE_ARFCN_WHITE; - num_arfcn = ipac_rxlevstat2whitelist(whitelist, st, 0, 100); - arfcnlist_size = num_arfcn * 2; - *((uint16_t *) (physconf_buf+2)) = htons(arfcnlist_size); - DEBUGP(DNM, "physconf_buf (%s)\n", osmo_hexdump(physconf_buf, arfcnlist_size+4)); - return arfcnlist_size+4; -} - -static int nwl_sig_cb(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data) -{ - struct gsm_bts_trx *trx; - uint8_t physconf_buf[2*NUM_ARFCNS+16]; - uint16_t physconf_len; - - switch (signal) { - case S_IPAC_NWL_COMPLETE: - trx = signal_data; - DEBUGP(DNM, "received S_IPAC_NWL_COMPLETE signal\n"); - switch (trx->ipaccess.test_nr) { - case NM_IPACC_TESTNO_CHAN_USAGE: - /* Dump RxLev results */ - //rxlev_stat_dump(&trx->ipaccess.rxlev_stat); - /* Create whitelist from results */ - physconf_len = build_physconf(physconf_buf, - &trx->ipaccess.rxlev_stat); - /* Start next test abbout BCCH channel usage */ - ipac_nwl_test_start(trx, NM_IPACC_TESTNO_BCCH_CHAN_USAGE, - physconf_buf, physconf_len); - break; - case NM_IPACC_TESTNO_BCCH_CHAN_USAGE: - /* Dump BCCH RxLev results */ - //rxlev_stat_dump(&trx->ipaccess.rxlev_stat); - /* Create whitelist from results */ - physconf_len = build_physconf(physconf_buf, - &trx->ipaccess.rxlev_stat); - /* Start next test about BCCH info */ - ipac_nwl_test_start(trx, NM_IPACC_TESTNO_BCCH_INFO, - physconf_buf, physconf_len); - break; - case NM_IPACC_TESTNO_BCCH_INFO: - /* re-start full process with CHAN_USAGE */ - if (loop_tests) { - DEBUGP(DNM, "starting next test cycle\n"); - ipac_nwl_test_start(trx, net_listen_testnr, phys_conf_min, - sizeof(phys_conf_min)); - } else { - exit(0); - } - break; - } - break; - } - return 0; -} - -static int nm_state_event(int evt, uint8_t obj_class, void *obj, - struct gsm_nm_state *old_state, struct gsm_nm_state *new_state, - struct abis_om_obj_inst *obj_inst); - -static int nm_sig_cb(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data) -{ - struct ipacc_ack_signal_data *ipacc_data; - struct nm_statechg_signal_data *nsd; - - switch (signal) { - case S_NM_IPACC_NACK: - ipacc_data = signal_data; - return ipacc_msg_nack(ipacc_data->msg_type); - case S_NM_IPACC_ACK: - ipacc_data = signal_data; - return ipacc_msg_ack(ipacc_data->msg_type, ipacc_data->trx); - case S_NM_IPACC_RESTART_ACK: - printf("The BTS has acked the restart. Exiting.\n"); - exit(0); - break; - case S_NM_IPACC_RESTART_NACK: - printf("The BTS has nacked the restart. Exiting.\n"); - exit(0); - break; - case S_NM_STATECHG_OPER: - case S_NM_STATECHG_ADM: - nsd = signal_data; - nm_state_event(signal, nsd->obj_class, nsd->obj, nsd->old_state, - nsd->new_state, nsd->obj_inst); - break; - default: - break; - } - - return 0; -} - -/* callback function passed to the ABIS OML code */ -static int percent; -static int percent_old; -static int swload_cbfn(unsigned int hook, unsigned int event, struct msgb *_msg, - void *data, void *param) -{ - struct msgb *msg; - struct gsm_bts_trx *trx; - - if (hook != GSM_HOOK_NM_SWLOAD) - return 0; - - trx = (struct gsm_bts_trx *) data; - - switch (event) { - case NM_MT_LOAD_INIT_ACK: - fprintf(stdout, "Software Load Initiate ACK\n"); - break; - case NM_MT_LOAD_INIT_NACK: - fprintf(stderr, "ERROR: Software Load Initiate NACK\n"); - exit(5); - break; - case NM_MT_LOAD_END_ACK: - fprintf(stderr, "LOAD END ACK..."); - /* now make it the default */ - sw_load_state = 1; - - msg = msgb_alloc(1024, "sw: nvattr"); - msg->l2h = msgb_put(msg, 3); - msg->l3h = &msg->l2h[3]; - - /* activate software */ - if (sw_load1) - abis_nm_put_sw_desc(msg, sw_load1, true); - - if (sw_load2) - abis_nm_put_sw_desc(msg, sw_load2, true); - - /* fill in the data */ - msg->l2h[0] = NM_ATT_IPACC_CUR_SW_CFG; - msg->l2h[1] = msgb_l3len(msg) >> 8; - msg->l2h[2] = msgb_l3len(msg) & 0xff; - printf("Foo l2h: %p l3h: %p... length l2: %u l3: %u\n", msg->l2h, msg->l3h, msgb_l2len(msg), msgb_l3len(msg)); - abis_nm_ipaccess_set_nvattr(trx, msg->l2h, msgb_l2len(msg)); - msgb_free(msg); - break; - case NM_MT_LOAD_END_NACK: - fprintf(stderr, "ERROR: Software Load End NACK\n"); - exit(3); - break; - case NM_MT_ACTIVATE_SW_NACK: - fprintf(stderr, "ERROR: Activate Software NACK\n"); - exit(4); - break; - case NM_MT_ACTIVATE_SW_ACK: - break; - case NM_MT_LOAD_SEG_ACK: - percent = abis_nm_software_load_status(trx->bts); - if (percent > percent_old) - printf("Software Download Progress: %d%%\n", percent); - percent_old = percent; - break; - case NM_MT_LOAD_ABORT: - fprintf(stderr, "ERROR: Load aborted by the BTS.\n"); - exit(6); - break; - } - return 0; -} - -static void nv_put_ip_if_cfg(struct msgb *nmsg, uint32_t ip, uint32_t mask) -{ - msgb_put_u8(nmsg, NM_ATT_IPACC_IP_IF_CFG); - - msgb_put_u32(nmsg, ip); - msgb_put_u32(nmsg, mask); -} - -static void nv_put_gw_cfg(struct msgb *nmsg, uint32_t addr, uint32_t mask, uint32_t gw) -{ - msgb_put_u8(nmsg, NM_ATT_IPACC_IP_GW_CFG); - msgb_put_u32(nmsg, addr); - msgb_put_u32(nmsg, mask); - msgb_put_u32(nmsg, gw); -} - -static void nv_put_unit_id(struct msgb *nmsg, const char *unit_id) -{ - msgb_tl16v_put(nmsg, NM_ATT_IPACC_UNIT_ID, strlen(unit_id)+1, - (const uint8_t *)unit_id); -} - -static void nv_put_prim_oml(struct msgb *nmsg, uint32_t ip, uint16_t port) -{ - int len; - - /* 0x88 + IP + port */ - len = 1 + sizeof(ip) + sizeof(port); - - msgb_put_u8(nmsg, NM_ATT_IPACC_PRIM_OML_CFG_LIST); - msgb_put_u16(nmsg, len); - - msgb_put_u8(nmsg, 0x88); - - /* IP address */ - msgb_put_u32(nmsg, ip); - - /* port number */ - msgb_put_u16(nmsg, port); -} - -static void nv_put_flags(struct msgb *nmsg, uint16_t nv_flags, uint16_t nv_mask) -{ - msgb_put_u8(nmsg, NM_ATT_IPACC_NV_FLAGS); - msgb_put_u16(nmsg, sizeof(nv_flags) + sizeof(nv_mask)); - msgb_put_u8(nmsg, nv_flags & 0xff); - msgb_put_u8(nmsg, nv_mask & 0xff); - msgb_put_u8(nmsg, nv_flags >> 8); - msgb_put_u8(nmsg, nv_mask >> 8); -} - -/* human-readable test names for the ip.access tests */ -static const struct value_string ipa_test_strs[] = { - { 64, "ccch-usage" }, - { 65, "bcch-usage" }, - { 66, "freq-sync" }, - { 67, "rtp-usage" }, - { 68, "rtp-perf" }, - { 69, "gprs-ccch" }, - { 70, "pccch-usage" }, - { 71, "gprs-usage" }, - { 72, "esta-mf" }, - { 73, "uplink-mf" }, - { 74, "dolink-mf" }, - { 75, "tbf-details" }, - { 76, "tbf-usage" }, - { 77, "llc-data" }, - { 78, "pdch-usage" }, - { 79, "power-control" }, - { 80, "link-adaption" }, - { 81, "tch-usage" }, - { 82, "amr-mf" }, - { 83, "rtp-multiplex-perf" }, - { 84, "rtp-multiplex-usage" }, - { 85, "srtp-multiplex-usage" }, - { 86, "abis-traffic" }, - { 89, "gprs-multiplex-perf" }, - { 90, "gprs-multiplex-usage" }, - { 0, NULL }, -}; - -/* human-readable names for the ip.access nanoBTS NVRAM Flags */ -static const struct value_string ipa_nvflag_strs[] = { - { 0x0001, "static-ip" }, - { 0x0002, "static-gw" }, - { 0x0004, "no-dhcp-vsi" }, - { 0x0008, "dhcp-enabled" }, - { 0x0040, "led-disabled" }, - { 0x0100, "secondary-oml-enabled" }, - { 0x0200, "diag-enabled" }, - { 0x0400, "cli-enabled" }, - { 0x0800, "http-enabled" }, - { 0x1000, "post-enabled" }, - { 0x2000, "snmp-enabled" }, - { 0, NULL } -}; - -/* set the flags in flags/mask according to a string-identified flag and 'enable' */ -static int ipa_nvflag_set(uint16_t *flags, uint16_t *mask, const char *name, int en) -{ - int rc; - rc = get_string_value(ipa_nvflag_strs, name); - if (rc < 0) - return rc; - - *mask |= rc; - if (en) - *flags |= rc; - else - *flags &= ~rc; - - return 0; -} - -static void bootstrap_om(struct gsm_bts_trx *trx) -{ - struct msgb *nmsg = msgb_alloc(1024, "nested msgb"); - int need_to_set_attr = 0; - int len; - - printf("OML link established using TRX %d\n", trx->nr); - - if (unit_id) { - len = strlen(unit_id); - if (len > nmsg->data_len-10) - goto out_err; - printf("setting Unit ID to '%s'\n", unit_id); - nv_put_unit_id(nmsg, unit_id); - need_to_set_attr = 1; - } - if (prim_oml_ip) { - struct in_addr ia; - - if (!inet_aton(prim_oml_ip, &ia)) { - fprintf(stderr, "invalid IP address: %s\n", - prim_oml_ip); - goto out_err; - } - - printf("setting primary OML link IP to '%s'\n", inet_ntoa(ia)); - nv_put_prim_oml(nmsg, ntohl(ia.s_addr), 0); - need_to_set_attr = 1; - } - if (nv_mask) { - printf("setting NV Flags/Mask to 0x%04x/0x%04x\n", - nv_flags, nv_mask); - nv_put_flags(nmsg, nv_flags, nv_mask); - need_to_set_attr = 1; - } - if (bts_ip_addr && bts_ip_mask) { - struct in_addr ia_addr, ia_mask; - - if (!inet_aton(bts_ip_addr, &ia_addr)) { - fprintf(stderr, "invalid IP address: %s\n", - bts_ip_addr); - goto out_err; - } - - if (!inet_aton(bts_ip_mask, &ia_mask)) { - fprintf(stderr, "invalid IP address: %s\n", - bts_ip_mask); - goto out_err; - } - - printf("setting static IP Address/Mask\n"); - nv_put_ip_if_cfg(nmsg, ntohl(ia_addr.s_addr), ntohl(ia_mask.s_addr)); - need_to_set_attr = 1; - } - if (bts_ip_gw) { - struct in_addr ia_gw; - - if (!inet_aton(bts_ip_gw, &ia_gw)) { - fprintf(stderr, "invalid IP address: %s\n", - bts_ip_gw); - goto out_err; - } - - printf("setting static IP Gateway\n"); - /* we only set the default gateway with zero addr/mask */ - nv_put_gw_cfg(nmsg, 0, 0, ntohl(ia_gw.s_addr)); - need_to_set_attr = 1; - } - - if (need_to_set_attr) { - abis_nm_ipaccess_set_nvattr(trx, nmsg->head, nmsg->len); - oml_state = 1; - } - - if (restart && !prim_oml_ip && !software) { - printf("restarting BTS\n"); - abis_nm_ipaccess_restart(trx); - } - -out_err: - msgb_free(nmsg); -} - -static int nm_state_event(int evt, uint8_t obj_class, void *obj, - struct gsm_nm_state *old_state, struct gsm_nm_state *new_state, - struct abis_om_obj_inst *obj_inst) -{ - if (obj_class == NM_OC_BASEB_TRANSC) { - if (!found_trx && obj_inst->trx_nr != 0xff) { - struct gsm_bts_trx *trx = container_of(obj, struct gsm_bts_trx, bb_transc); - bootstrap_om(trx); - found_trx = 1; - } - } else if (evt == S_NM_STATECHG_OPER && - obj_class == NM_OC_RADIO_CARRIER && - new_state->availability == 3) { - struct gsm_bts_trx *trx = obj; - - if (net_listen_testnr) - ipac_nwl_test_start(trx, net_listen_testnr, - phys_conf_min, sizeof(phys_conf_min)); - else if (software) { - int rc; - printf("Attempting software upload with '%s'\n", software); - rc = abis_nm_software_load(trx->bts, trx->nr, software, 19, 0, swload_cbfn, trx); - if (rc < 0) { - fprintf(stderr, "Failed to start software load\n"); - exit(-3); - } - } - } - return 0; -} - -static struct abis_nm_sw_desc *create_swload(struct sdp_header *header) -{ - struct abis_nm_sw_desc *load; - - load = talloc_zero(tall_ctx_config, struct abis_nm_sw_desc); - - osmo_strlcpy((char *)load->file_id, header->firmware_info.sw_part, - sizeof(load->file_id)); - load->file_id_len = strlen((char*)load->file_id) + 1; - - osmo_strlcpy((char *)load->file_version, header->firmware_info.version, - sizeof(load->file_version)); - load->file_version_len = strlen((char*)load->file_version) + 1; - - return load; -} - -static int find_sw_load_params(const char *filename) -{ - struct stat stat; - struct sdp_header *header; - struct llist_head *entry; - int fd; - void *tall_firm_ctx = 0; - - entry = talloc_zero(tall_firm_ctx, struct llist_head); - INIT_LLIST_HEAD(entry); - - fd = open(filename, O_RDONLY); - if (!fd) { - perror("nada"); - return -1; - } - - /* verify the file */ - if (fstat(fd, &stat) == -1) { - perror("Can not stat the file"); - close(fd); - return -1; - } - - ipaccess_analyze_file(fd, stat.st_size, 0, entry); - if (close(fd) != 0) { - perror("Close failed.\n"); - return -1; - } - - /* try to find what we are looking for */ - llist_for_each_entry(header, entry, entry) { - if (ntohs(header->firmware_info.more_more_magic) == 0x1000) { - sw_load1 = create_swload(header); - } else if (ntohs(header->firmware_info.more_more_magic) == 0x2001) { - sw_load2 = create_swload(header); - } - } - - if (!sw_load1 || !sw_load2) { - fprintf(stderr, "Did not find data.\n"); - talloc_free(tall_firm_ctx); - return -1; - } - - talloc_free(tall_firm_ctx); - return 0; -} - -static void dump_entry(struct sdp_header_item *sub_entry, int part, int fd) -{ - int out_fd; - int copied; - char filename[4096]; - off_t target; - - if (!dump_files) - return; - - if (sub_entry->header_entry.something1 == 0) - return; - - snprintf(filename, sizeof(filename), "part.%d", part++); - out_fd = open(filename, O_WRONLY | O_CREAT, 0660); - if (out_fd < 0) { - perror("Can not dump firmware"); - return; - } - - target = sub_entry->absolute_offset + ntohl(sub_entry->header_entry.start) + 4; - if (lseek(fd, target, SEEK_SET) != target) { - perror("seek failed"); - close(out_fd); - return; - } - - for (copied = 0; copied < ntohl(sub_entry->header_entry.length); ++copied) { - char c; - if (read(fd, &c, sizeof(c)) != sizeof(c)) { - perror("copy failed"); - break; - } - - if (write(out_fd, &c, sizeof(c)) != sizeof(c)) { - perror("write failed"); - break; - } - } - - close(out_fd); -} - -static void analyze_firmware(const char *filename) -{ - struct stat stat; - struct sdp_header *header; - struct sdp_header_item *sub_entry; - struct llist_head *entry; - int fd; - void *tall_firm_ctx = 0; - int part = 0; - - entry = talloc_zero(tall_firm_ctx, struct llist_head); - INIT_LLIST_HEAD(entry); - - printf("Opening possible firmware '%s'\n", filename); - fd = open(filename, O_RDONLY); - if (!fd) { - perror("nada"); - return; - } - - /* verify the file */ - if (fstat(fd, &stat) == -1) { - perror("Can not stat the file"); - close(fd); - return; - } - - ipaccess_analyze_file(fd, stat.st_size, 0, entry); - - llist_for_each_entry(header, entry, entry) { - printf("Printing header information:\n"); - printf("more_more_magic: 0x%x\n", ntohs(header->firmware_info.more_more_magic)); - printf("header_length: %u\n", ntohl(header->firmware_info.header_length)); - printf("file_length: %u\n", ntohl(header->firmware_info.file_length)); - printf("sw_part: %.20s\n", header->firmware_info.sw_part); - printf("text1: %.64s\n", header->firmware_info.text1); - printf("time: %.12s\n", header->firmware_info.time); - printf("date: %.14s\n", header->firmware_info.date); - printf("text2: %.10s\n", header->firmware_info.text2); - printf("version: %.20s\n", header->firmware_info.version); - printf("subitems...\n"); - - llist_for_each_entry(sub_entry, &header->header_list, entry) { - printf("\tsomething1: %u\n", sub_entry->header_entry.something1); - printf("\ttext1: %.64s\n", sub_entry->header_entry.text1); - printf("\ttime: %.12s\n", sub_entry->header_entry.time); - printf("\tdate: %.14s\n", sub_entry->header_entry.date); - printf("\ttext2: %.10s\n", sub_entry->header_entry.text2); - printf("\tversion: %.20s\n", sub_entry->header_entry.version); - printf("\tlength: %u\n", ntohl(sub_entry->header_entry.length)); - printf("\taddr1: 0x%x\n", ntohl(sub_entry->header_entry.addr1)); - printf("\taddr2: 0x%x\n", ntohl(sub_entry->header_entry.addr2)); - printf("\tstart: 0x%x\n", ntohl(sub_entry->header_entry.start)); - printf("\tabs. offset: 0x%lx\n", sub_entry->absolute_offset); - printf("\n\n"); - - dump_entry(sub_entry, part++, fd); - } - printf("\n\n"); - } - - if (close(fd) != 0) { - perror("Close failed.\n"); - return; - } - - talloc_free(tall_firm_ctx); -} - -static void print_usage(void) -{ - printf("Usage: ipaccess-config IP_OF_BTS\n"); -} - -static void print_help(void) -{ -#if 0 - printf("Commands for reading from the BTS:\n"); - printf(" -D --dump\t\t\tDump the BTS configuration\n"); - printf("\n"); -#endif - printf("Commands for writing to the BTS:\n"); - printf(" -u --unit-id UNIT_ID\t\tSet the Unit ID of the BTS\n"); - printf(" -o --oml-ip IP\t\tSet primary OML IP (IP of your BSC)\n"); - printf(" -i --ip-address IP/MASK\tSet static IP address + netmask of BTS\n"); - printf(" -g --ip-gateway IP\t\tSet static IP gateway of BTS\n"); - printf(" -r --restart\t\t\tRestart the BTS (after other operations)\n"); - printf(" -n --nvram-flags FLAGS/MASK\tSet NVRAM attributes\n"); - printf(" -S --nvattr-set FLAG\tSet one additional NVRAM attribute\n"); - printf(" -U --nvattr-unset FLAG\tSet one additional NVRAM attribute\n"); - printf(" -l --listen TESTNR\t\tPerform specified test number\n"); - printf(" -L --Listen TEST_NAME\t\tPerform specified test\n"); - printf(" -s --stream-id ID\t\tSet the IPA Stream Identifier for OML\n"); - printf(" -d --software FIRMWARE\tDownload firmware into BTS\n"); - printf("\n"); - printf("Miscellaneous commands:\n"); - printf(" -h --help\t\t\tthis text\n"); - printf(" -H --HELP\t\t\tPrint parameter details.\n"); - printf(" -f --firmware FIRMWARE\tProvide firmware information\n"); - printf(" -w --write-firmware\t\tThis will dump the firmware parts to the filesystem. Use with -f.\n"); - printf(" -p --loop\t\t\tLoop the tests executed with the --listen command.\n"); -} - -static void print_value_string(const struct value_string *val, int size) -{ - int i; - - for (i = 0; i < size - 1; ++i) { - char sep = val[i + 1].str == NULL ? '.' : ','; - printf("%s%c ", val[i].str, sep); - } - printf("\n"); -} - -static void print_options(void) -{ - - printf("Options for NVRAM (-S,-U):\n "); - print_value_string(&ipa_nvflag_strs[0], ARRAY_SIZE(ipa_nvflag_strs)); - - printf("Options for Tests (-L):\n "); - print_value_string(&ipa_test_strs[0], ARRAY_SIZE(ipa_test_strs)); -} - -extern void bts_model_nanobts_init(); - -int main(int argc, char **argv) -{ - struct gsm_bts *bts; - struct sockaddr_in sin; - int rc, option_index = 0, stream_id = 0xff; - - tall_ctx_config = talloc_named_const(NULL, 0, "ipaccess-config"); - msgb_talloc_ctx_init(tall_ctx_config, 0); - - osmo_init_logging(&log_info); - log_parse_category_mask(osmo_stderr_target, "DNM,0"); - bts_model_nanobts_init(); - - printf("ipaccess-config (C) 2009-2010 by Harald Welte and others\n"); - printf("This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY\n\n"); - - while (1) { - int c; - unsigned long ul; - char *slash; - static struct option long_options[] = { - { "unit-id", 1, 0, 'u' }, - { "oml-ip", 1, 0, 'o' }, - { "ip-address", 1, 0, 'i' }, - { "ip-gateway", 1, 0, 'g' }, - { "restart", 0, 0, 'r' }, - { "nvram-flags", 1, 0, 'n' }, - { "nvattr-set", 1, 0, 'S' }, - { "nvattr-unset", 1, 0, 'U' }, - { "help", 0, 0, 'h' }, - { "HELP", 0, 0, 'H' }, - { "listen", 1, 0, 'l' }, - { "Listen", 1, 0, 'L' }, - { "stream-id", 1, 0, 's' }, - { "software", 1, 0, 'd' }, - { "firmware", 1, 0, 'f' }, - { "write-firmware", 0, 0, 'w' }, - { "disable-color", 0, 0, 'c'}, - { "loop", 0, 0, 'p' }, - { 0, 0, 0, 0 }, - }; - - c = getopt_long(argc, argv, "u:o:i:g:rn:S:U:l:L:hs:d:f:wcpH", long_options, - &option_index); - - if (c == -1) - break; - - switch (c) { - case 'u': - unit_id = optarg; - break; - case 'o': - prim_oml_ip = optarg; - break; - case 'i': - slash = strchr(optarg, '/'); - if (!slash) - exit(2); - bts_ip_addr = optarg; - *slash = 0; - bts_ip_mask = slash+1; - break; - case 'g': - bts_ip_gw = optarg; - break; - case 'r': - restart = 1; - break; - case 'n': - slash = strchr(optarg, '/'); - if (!slash) - exit(2); - ul = strtoul(optarg, NULL, 16); - nv_flags = ul & 0xffff; - ul = strtoul(slash+1, NULL, 16); - nv_mask = ul & 0xffff; - break; - case 'S': - if (ipa_nvflag_set(&nv_flags, &nv_mask, optarg, 1) < 0) - exit(2); - break; - case 'U': - if (ipa_nvflag_set(&nv_flags, &nv_mask, optarg, 0) < 0) - exit(2); - break; - case 'l': - net_listen_testnr = atoi(optarg); - break; - case 'L': - net_listen_testnr = get_string_value(ipa_test_strs, - optarg); - if (net_listen_testnr < 0) { - fprintf(stderr, - "The test '%s' is not known. Use -H to" - " see available tests.\n", optarg); - exit(2); - } - break; - case 's': - stream_id = atoi(optarg); - break; - case 'd': - software = strdup(optarg); - if (find_sw_load_params(optarg) != 0) - exit(0); - break; - case 'f': - firmware_analysis = optarg; - break; - case 'w': - dump_files = 1; - break; - case 'c': - log_set_use_color(osmo_stderr_target, 0); - break; - case 'p': - loop_tests = 1; - break; - case 'h': - print_usage(); - print_help(); - exit(0); - case 'H': - print_options(); - exit(0); - } - }; - - if (firmware_analysis) - analyze_firmware(firmware_analysis); - - if (optind >= argc) { - /* only warn if we have not done anything else */ - if (!firmware_analysis) - fprintf(stderr, "you have to specify the IP address of the BTS. Use --help for more information\n"); - exit(2); - } - libosmo_abis_init(tall_ctx_config); - - bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1, NULL); - if (!bsc_gsmnet) - exit(1); - - bts = gsm_bts_alloc_register(bsc_gsmnet, GSM_BTS_TYPE_NANOBTS, - HARDCODED_BSIC); - /* ip.access supports up to 4 chained TRX */ - gsm_bts_trx_alloc(bts); - gsm_bts_trx_alloc(bts); - gsm_bts_trx_alloc(bts); - bts->oml_tei = stream_id; - - osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL); - osmo_signal_register_handler(SS_IPAC_NWL, nwl_sig_cb, NULL); - - ipac_nwl_init(); - - printf("Trying to connect to ip.access BTS ...\n"); - - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - inet_aton(argv[optind], &sin.sin_addr); - rc = ia_config_connect(bts, &sin); - if (rc < 0) { - perror("Error connecting to the BTS"); - exit(1); - } - - bts->oml_link->ts->sign.delay = 10; - bts->c0->rsl_link->ts->sign.delay = 10; - while (1) { - rc = osmo_select_main(0); - if (rc < 0) - exit(3); - } - - exit(0); -} - diff --git a/openbsc/src/ipaccess/ipaccess-firmware.c b/openbsc/src/ipaccess/ipaccess-firmware.c deleted file mode 100644 index 5f55bb5..0000000 --- a/openbsc/src/ipaccess/ipaccess-firmware.c +++ /dev/null @@ -1,135 +0,0 @@ -/* Routines for parsing an ipacces SDP firmware file */ - -/* (C) 2009 by Holger Hans Peter Freyther - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include - -#include -#include -#include -#include - -#define PART_LENGTH 138 - -osmo_static_assert(sizeof(struct sdp_header_entry) == 138, right_entry); -osmo_static_assert(sizeof(struct sdp_firmware) == 158, _right_header_length); - -/* more magic, the second "int" in the header */ -static char more_magic[] = { 0x10, 0x02 }; - -int ipaccess_analyze_file(int fd, const unsigned int st_size, const unsigned int base_offset, struct llist_head *list) -{ - struct sdp_firmware *firmware_header = 0; - struct sdp_header *header; - char buf[4096]; - int rc, i; - uint16_t table_size; - uint16_t table_offset; - off_t table_start; - - - rc = read(fd, buf, sizeof(*firmware_header)); - if (rc < 0) { - perror("Can not read header start."); - return -1; - } - - firmware_header = (struct sdp_firmware *) &buf[0]; - if (strncmp(firmware_header->magic, " SDP", 4) != 0) { - fprintf(stderr, "Wrong magic.\n"); - return -1; - } - - if (memcmp(firmware_header->more_magic, more_magic, 2) != 0) { - fprintf(stderr, "Wrong more magic. Got: 0x%x 0x%x vs. 0x%x 0x%x\n", - firmware_header->more_magic[0] & 0xff, firmware_header->more_magic[1] & 0xff, - more_magic[0], more_magic[1]); - return -1; - } - - - if (ntohl(firmware_header->file_length) != st_size) { - fprintf(stderr, "The filesize and the header do not match.\n"); - return -1; - } - - /* add the firmware */ - header = talloc_zero(list, struct sdp_header); - header->firmware_info = *firmware_header; - INIT_LLIST_HEAD(&header->header_list); - llist_add(&header->entry, list); - - table_offset = ntohs(firmware_header->table_offset); - table_start = lseek(fd, table_offset, SEEK_CUR); - if (table_start == -1) { - fprintf(stderr, "Failed to seek to the rel position: 0x%x\n", table_offset); - return -1; - } - - if (read(fd, &table_size, sizeof(table_size)) != sizeof(table_size)) { - fprintf(stderr, "The table size could not be read.\n"); - return -1; - } - - table_size = ntohs(table_size); - - if (table_size % PART_LENGTH != 0) { - fprintf(stderr, "The part length seems to be wrong: 0x%x\n", table_size); - return -1; - } - - /* look into each firmware now */ - for (i = 0; i < table_size / PART_LENGTH; ++i) { - struct sdp_header_entry entry; - struct sdp_header_item *header_entry; - unsigned int offset = table_start + 2; - offset += i * 138; - - if (lseek(fd, offset, SEEK_SET) != offset) { - fprintf(stderr, "Can not seek to the offset: %u.\n", offset); - return -1; - } - - rc = read(fd, &entry, sizeof(entry)); - if (rc != sizeof(entry)) { - fprintf(stderr, "Can not read the header entry.\n"); - return -1; - } - - header_entry = talloc_zero(header, struct sdp_header_item); - header_entry->header_entry = entry; - header_entry->absolute_offset = base_offset; - llist_add(&header_entry->entry, &header->header_list); - - /* now we need to find the SDP file... */ - offset = ntohl(entry.start) + 4 + base_offset; - if (lseek(fd, offset, SEEK_SET) != offset) { - perror("can't seek to sdp"); - return -1; - } - - - ipaccess_analyze_file(fd, ntohl(entry.length), offset, list); - } - - return 0; -} - diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c deleted file mode 100644 index d367442..0000000 --- a/openbsc/src/ipaccess/ipaccess-proxy.c +++ /dev/null @@ -1,1226 +0,0 @@ -/* OpenBSC Abis/IP proxy ip.access nanoBTS */ - -/* (C) 2009 by Harald Welte - * (C) 2010 by On-Waves - * (C) 2010 by Holger Hans Peter Freyther - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define _GNU_SOURCE -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* one instance of an ip.access protocol proxy */ -struct ipa_proxy { - /* socket where we listen for incoming OML from BTS */ - struct osmo_fd oml_listen_fd; - /* socket where we listen for incoming RSL from BTS */ - struct osmo_fd rsl_listen_fd; - /* list of BTS's (struct ipa_bts_conn */ - struct llist_head bts_list; - /* the BSC reconnect timer */ - struct osmo_timer_list reconn_timer; - /* global GPRS NS data */ - struct in_addr gprs_addr; - struct in_addr listen_addr; -}; - -/* global pointer to the proxy structure */ -static struct ipa_proxy *ipp; - -struct ipa_proxy_conn { - struct osmo_fd fd; - struct llist_head tx_queue; - struct ipa_bts_conn *bts_conn; -}; -#define MAX_TRX 4 - -/* represents a particular BTS in our proxy */ -struct ipa_bts_conn { - /* list of BTS's (ipa_proxy->bts_list) */ - struct llist_head list; - /* back pointer to the proxy which we belong to */ - struct ipa_proxy *ipp; - /* the unit ID as determined by CCM */ - struct { - uint16_t site_id; - uint16_t bts_id; - } unit_id; - - /* incoming connections from BTS */ - struct ipa_proxy_conn *oml_conn; - struct ipa_proxy_conn *rsl_conn[MAX_TRX]; - - /* outgoing connections to BSC */ - struct ipa_proxy_conn *bsc_oml_conn; - struct ipa_proxy_conn *bsc_rsl_conn[MAX_TRX]; - - /* UDP sockets for BTS and BSC injection */ - struct osmo_fd udp_bts_fd; - struct osmo_fd udp_bsc_fd; - - /* NS data */ - struct in_addr bts_addr; - struct osmo_fd gprs_ns_fd; - int gprs_local_port; - uint16_t gprs_orig_port; - uint32_t gprs_orig_ip; - - char *id_tags[256]; - uint8_t *id_resp; - unsigned int id_resp_len; -}; - -enum ipp_fd_type { - OML_FROM_BTS = 1, - RSL_FROM_BTS = 2, - OML_TO_BSC = 3, - RSL_TO_BSC = 4, - UDP_TO_BTS = 5, - UDP_TO_BSC = 6, -}; - -/* some of the code against we link from OpenBSC needs this */ -void *tall_bsc_ctx; - -static char *listen_ipaddr; -static char *bsc_ipaddr; -static char *gprs_ns_ipaddr; - -static int gprs_ns_cb(struct osmo_fd *bfd, unsigned int what); - -#define PROXY_ALLOC_SIZE 1200 - -static struct ipa_bts_conn *find_bts_by_unitid(struct ipa_proxy *ipp, - uint16_t site_id, - uint16_t bts_id) -{ - struct ipa_bts_conn *ipbc; - - llist_for_each_entry(ipbc, &ipp->bts_list, list) { - if (ipbc->unit_id.site_id == site_id && - ipbc->unit_id.bts_id == bts_id) - return ipbc; - } - - return NULL; -} - -struct ipa_proxy_conn *alloc_conn(void) -{ - struct ipa_proxy_conn *ipc; - - ipc = talloc_zero(tall_bsc_ctx, struct ipa_proxy_conn); - if (!ipc) - return NULL; - - INIT_LLIST_HEAD(&ipc->tx_queue); - - return ipc; -} - -static int store_idtags(struct ipa_bts_conn *ipbc, struct tlv_parsed *tlvp) -{ - unsigned int i, len; - - for (i = 0; i <= 0xff; i++) { - if (!TLVP_PRESENT(tlvp, i)) - continue; - - len = TLVP_LEN(tlvp, i); -#if 0 - if (!ipbc->id_tags[i]) - ipbc->id_tags[i] = talloc_size(tall_bsc_ctx, len); - else -#endif - ipbc->id_tags[i] = talloc_realloc_size(ipbc, - ipbc->id_tags[i], len); - if (!ipbc->id_tags[i]) - return -ENOMEM; - - memset(ipbc->id_tags[i], 0, len); - //memcpy(ipbc->id_tags[i], TLVP_VAL(tlvp, i), len); - } - return 0; -} - - -static struct ipa_proxy_conn *connect_bsc(struct sockaddr_in *sa, int priv_nr, void *data); - -#define logp_ipbc_uid(ss, lvl, ipbc, trx_id) _logp_ipbc_uid(ss, lvl, __FILE__, __LINE__, ipbc, trx_id) - -static void _logp_ipbc_uid(unsigned int ss, unsigned int lvl, char *file, int line, - struct ipa_bts_conn *ipbc, uint8_t trx_id) -{ - if (ipbc) - logp2(ss, lvl, file, line, 0, "(%u/%u/%u) ", ipbc->unit_id.site_id, - ipbc->unit_id.bts_id, trx_id); - else - logp2(ss, lvl, file, line, 0, "unknown "); -} - -static int handle_udp_read(struct osmo_fd *bfd) -{ - struct ipa_bts_conn *ipbc = bfd->data; - struct ipa_proxy_conn *other_conn = NULL; - struct msgb *msg = msgb_alloc(PROXY_ALLOC_SIZE, "Abis/IP UDP"); - struct ipaccess_head *hh; - int ret; - - /* with UDP sockets, we cannot read partial packets but have to read - * all of it in one go */ - hh = (struct ipaccess_head *) msg->data; - ret = recv(bfd->fd, msg->data, msg->data_len, 0); - if (ret < 0) { - if (errno != EAGAIN) - LOGP(DLINP, LOGL_ERROR, "recv error %s\n", strerror(errno)); - msgb_free(msg); - return ret; - } - if (ret == 0) { - DEBUGP(DLINP, "UDP peer disappeared, dead socket\n"); - osmo_fd_unregister(bfd); - close(bfd->fd); - bfd->fd = -1; - msgb_free(msg); - return -EIO; - } - if (ret < sizeof(*hh)) { - DEBUGP(DLINP, "could not even read header!?!\n"); - msgb_free(msg); - return -EIO; - } - msgb_put(msg, ret); - msg->l2h = msg->data + sizeof(*hh); - DEBUGP(DLMI, "UDP RX: %s\n", osmo_hexdump(msg->data, msg->len)); - - if (hh->len != msg->len - sizeof(*hh)) { - DEBUGP(DLINP, "length (%u/%u) disagrees with header(%u)\n", - msg->len, msg->len - 3, hh->len); - msgb_free(msg); - return -EIO; - } - - switch (bfd->priv_nr & 0xff) { - case UDP_TO_BTS: - /* injection towards BTS */ - switch (hh->proto) { - case IPAC_PROTO_RSL: - /* FIXME: what to do about TRX > 0 */ - other_conn = ipbc->rsl_conn[0]; - break; - default: - DEBUGP(DLINP, "Unknown protocol 0x%02x, sending to " - "OML FD\n", hh->proto); - /* fall through */ - case IPAC_PROTO_IPACCESS: - case IPAC_PROTO_OML: - other_conn = ipbc->oml_conn; - break; - } - break; - case UDP_TO_BSC: - /* injection towards BSC */ - switch (hh->proto) { - case IPAC_PROTO_RSL: - /* FIXME: what to do about TRX > 0 */ - other_conn = ipbc->bsc_rsl_conn[0]; - break; - default: - DEBUGP(DLINP, "Unknown protocol 0x%02x, sending to " - "OML FD\n", hh->proto); - /* fall through */ - case IPAC_PROTO_IPACCESS: - case IPAC_PROTO_OML: - other_conn = ipbc->bsc_oml_conn; - break; - } - break; - default: - DEBUGP(DLINP, "Unknown filedescriptor priv_nr=%04x\n", bfd->priv_nr); - break; - } - - if (other_conn) { - /* enqueue the message for TX on the respective FD */ - msgb_enqueue(&other_conn->tx_queue, msg); - other_conn->fd.when |= BSC_FD_WRITE; - } else - msgb_free(msg); - - return 0; -} - -static int handle_udp_write(struct osmo_fd *bfd) -{ - /* not implemented yet */ - bfd->when &= ~BSC_FD_WRITE; - - return -EIO; -} - -/* callback from select.c in case one of the fd's can be read/written */ -static int udp_fd_cb(struct osmo_fd *bfd, unsigned int what) -{ - int rc = 0; - - if (what & BSC_FD_READ) - rc = handle_udp_read(bfd); - if (what & BSC_FD_WRITE) - rc = handle_udp_write(bfd); - - return rc; -} - - -static int ipbc_alloc_connect(struct ipa_proxy_conn *ipc, struct osmo_fd *bfd, - uint16_t site_id, uint16_t bts_id, - uint16_t trx_id, struct tlv_parsed *tlvp, - struct msgb *msg) -{ - struct ipa_bts_conn *ipbc; - uint16_t udp_port; - int ret = 0; - struct sockaddr_in sin; - - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - inet_aton(bsc_ipaddr, &sin.sin_addr); - - DEBUGP(DLINP, "(%u/%u/%u) New BTS connection: ", - site_id, bts_id, trx_id); - - /* OML needs to be established before RSL */ - if ((bfd->priv_nr & 0xff) != OML_FROM_BTS) { - DEBUGPC(DLINP, "Not a OML connection ?!?\n"); - return -EIO; - } - - /* allocate new BTS connection data structure */ - ipbc = talloc_zero(tall_bsc_ctx, struct ipa_bts_conn); - if (!ipbc) { - ret = -ENOMEM; - goto err_out; - } - - DEBUGPC(DLINP, "Created BTS Conn data structure\n"); - ipbc->ipp = ipp; - ipbc->unit_id.site_id = site_id; - ipbc->unit_id.bts_id = bts_id; - ipbc->oml_conn = ipc; - ipc->bts_conn = ipbc; - - /* store the content of the ID TAGS for later reference */ - store_idtags(ipbc, tlvp); - ipbc->id_resp_len = msg->len; - ipbc->id_resp = talloc_size(tall_bsc_ctx, ipbc->id_resp_len); - memcpy(ipbc->id_resp, msg->data, ipbc->id_resp_len); - - /* Create OML TCP connection towards BSC */ - sin.sin_port = htons(IPA_TCP_PORT_OML); - ipbc->bsc_oml_conn = connect_bsc(&sin, OML_TO_BSC, ipbc); - if (!ipbc->bsc_oml_conn) { - ret = -EIO; - goto err_bsc_conn; - } - - DEBUGP(DLINP, "(%u/%u/%u) OML Connected to BSC\n", - site_id, bts_id, trx_id); - - /* Create UDP socket for BTS packet injection */ - udp_port = 10000 + (site_id % 1000)*100 + (bts_id % 100); - ret = make_sock(&ipbc->udp_bts_fd, IPPROTO_UDP, INADDR_ANY, udp_port, - UDP_TO_BTS, udp_fd_cb, ipbc); - if (ret < 0) - goto err_udp_bts; - DEBUGP(DLINP, "(%u/%u/%u) Created UDP socket for injection " - "towards BTS at port %u\n", site_id, bts_id, trx_id, udp_port); - - /* Create UDP socket for BSC packet injection */ - udp_port = 20000 + (site_id % 1000)*100 + (bts_id % 100); - ret = make_sock(&ipbc->udp_bsc_fd, IPPROTO_UDP, INADDR_ANY, udp_port, - UDP_TO_BSC, udp_fd_cb, ipbc); - if (ret < 0) - goto err_udp_bsc; - DEBUGP(DLINP, "(%u/%u/%u) Created UDP socket for injection " - "towards BSC at port %u\n", site_id, bts_id, trx_id, udp_port); - - - /* GPRS NS related code */ - if (gprs_ns_ipaddr) { - struct sockaddr_in sock; - socklen_t len = sizeof(sock); - struct in_addr addr; - uint32_t ip; - - inet_aton(listen_ipaddr, &addr); - ip = ntohl(addr.s_addr); /* make_sock() needs host byte order */ - ret = make_sock(&ipbc->gprs_ns_fd, IPPROTO_UDP, ip, 0, 0, - gprs_ns_cb, ipbc); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "Creating the GPRS socket failed.\n"); - goto err_udp_bsc; - } - - ret = getsockname(ipbc->gprs_ns_fd.fd, (struct sockaddr* ) &sock, &len); - ipbc->gprs_local_port = ntohs(sock.sin_port); - LOGP(DLINP, LOGL_NOTICE, - "Created GPRS NS Socket. Listening on: %s:%d\n", - inet_ntoa(sock.sin_addr), ipbc->gprs_local_port); - - ret = getpeername(bfd->fd, (struct sockaddr* ) &sock, &len); - ipbc->bts_addr = sock.sin_addr; - } - - llist_add(&ipbc->list, &ipp->bts_list); - - return 0; - -err_udp_bsc: - osmo_fd_unregister(&ipbc->udp_bts_fd); -err_udp_bts: - osmo_fd_unregister(&ipbc->bsc_oml_conn->fd); - close(ipbc->bsc_oml_conn->fd.fd); - talloc_free(ipbc->bsc_oml_conn); - ipbc->bsc_oml_conn = NULL; -err_bsc_conn: - talloc_free(ipbc->id_resp); - talloc_free(ipbc); -#if 0 - osmo_fd_unregister(bfd); - close(bfd->fd); - talloc_free(bfd); -#endif -err_out: - return ret; -} - -static int ipaccess_rcvmsg(struct ipa_proxy_conn *ipc, struct msgb *msg, - struct osmo_fd *bfd) -{ - struct tlv_parsed tlvp; - uint8_t msg_type = *(msg->l2h); - struct ipaccess_unit unit_data; - struct ipa_bts_conn *ipbc; - int ret = 0; - - switch (msg_type) { - case IPAC_MSGT_PING: - ret = ipa_ccm_send_pong(bfd->fd); - break; - case IPAC_MSGT_PONG: - DEBUGP(DLMI, "PONG!\n"); - break; - case IPAC_MSGT_ID_RESP: - DEBUGP(DLMI, "ID_RESP "); - /* parse tags, search for Unit ID */ - ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, - msgb_l2len(msg)-2); - DEBUGP(DLMI, "\n"); - - if (!TLVP_PRESENT(&tlvp, IPAC_IDTAG_UNIT)) { - LOGP(DLINP, LOGL_ERROR, "No Unit ID in ID RESPONSE !?!\n"); - return -EIO; - } - - /* lookup BTS, create sign_link, ... */ - memset(&unit_data, 0, sizeof(unit_data)); - ipa_parse_unitid((char *)TLVP_VAL(&tlvp, IPAC_IDTAG_UNIT), - &unit_data); - ipbc = find_bts_by_unitid(ipp, unit_data.site_id, unit_data.bts_id); - if (!ipbc) { - /* We have not found an ipbc (per-bts proxy instance) - * for this BTS yet. The first connection of a new BTS must - * be a OML connection. We allocate the associated data structures, - * and try to connect to the remote end */ - - return ipbc_alloc_connect(ipc, bfd, unit_data.site_id, - unit_data.bts_id, - unit_data.trx_id, &tlvp, msg); - /* if this fails, the caller will clean up bfd */ - } else { - struct sockaddr_in sin; - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - inet_aton(bsc_ipaddr, &sin.sin_addr); - - DEBUGP(DLINP, "Identified BTS %u/%u/%u\n", - unit_data.site_id, unit_data.bts_id, unit_data.trx_id); - - if ((bfd->priv_nr & 0xff) != RSL_FROM_BTS) { - LOGP(DLINP, LOGL_ERROR, "Second OML connection from " - "same BTS ?!?\n"); - return 0; - } - - if (unit_data.trx_id >= MAX_TRX) { - LOGP(DLINP, LOGL_ERROR, "We don't support more " - "than %u TRX\n", MAX_TRX); - return -EINVAL; - } - - ipc->bts_conn = ipbc; - /* store TRX number in higher 8 bit of the bfd private number */ - bfd->priv_nr |= unit_data.trx_id << 8; - ipbc->rsl_conn[unit_data.trx_id] = ipc; - - /* Create RSL TCP connection towards BSC */ - sin.sin_port = htons(IPA_TCP_PORT_RSL); - ipbc->bsc_rsl_conn[unit_data.trx_id] = - connect_bsc(&sin, RSL_TO_BSC | (unit_data.trx_id << 8), ipbc); - if (!ipbc->bsc_oml_conn) - return -EIO; - DEBUGP(DLINP, "(%u/%u/%u) Connected RSL to BSC\n", - unit_data.site_id, unit_data.bts_id, unit_data.trx_id); - } - break; - case IPAC_MSGT_ID_GET: - DEBUGP(DLMI, "ID_GET\n"); - if ((bfd->priv_nr & 0xff) != OML_TO_BSC && - (bfd->priv_nr & 0xff) != RSL_TO_BSC) { - DEBUGP(DLINP, "IDentity REQuest from BTS ?!?\n"); - return -EIO; - } - ipbc = ipc->bts_conn; - if (!ipbc) { - DEBUGP(DLINP, "ID_GET from BSC before we have ID_RESP from BTS\n"); - return -EIO; - } - ret = write(bfd->fd, ipbc->id_resp, ipbc->id_resp_len); - if (ret != ipbc->id_resp_len) { - LOGP(DLINP, LOGL_ERROR, "Partial write: %d of %d\n", - ret, ipbc->id_resp_len); - return -EIO; - } - ret = 0; - break; - case IPAC_MSGT_ID_ACK: - DEBUGP(DLMI, "ID_ACK? -> ACK!\n"); - ret = ipa_ccm_send_id_ack(bfd->fd); - break; - default: - LOGP(DLMI, LOGL_ERROR, "Unhandled IPA type; %d\n", msg_type); - return 1; - break; - } - return ret; -} - -struct msgb *ipaccess_proxy_read_msg(struct osmo_fd *bfd, int *error) -{ - struct msgb *msg = msgb_alloc(PROXY_ALLOC_SIZE, "Abis/IP"); - struct ipaccess_head *hh; - int len, ret = 0; - - if (!msg) { - *error = -ENOMEM; - return NULL; - } - - /* first read our 3-byte header */ - hh = (struct ipaccess_head *) msg->data; - ret = recv(bfd->fd, msg->data, 3, 0); - if (ret < 0) { - if (errno != EAGAIN) - LOGP(DLINP, LOGL_ERROR, "recv error: %s\n", strerror(errno)); - msgb_free(msg); - *error = ret; - return NULL; - } else if (ret == 0) { - msgb_free(msg); - *error = ret; - return NULL; - } - - msgb_put(msg, ret); - - /* then read te length as specified in header */ - msg->l2h = msg->data + sizeof(*hh); - len = ntohs(hh->len); - ret = recv(bfd->fd, msg->l2h, len, 0); - if (ret < len) { - LOGP(DLINP, LOGL_ERROR, "short read!\n"); - msgb_free(msg); - *error = -EIO; - return NULL; - } - msgb_put(msg, ret); - - return msg; -} - -static struct ipa_proxy_conn *ipc_by_priv_nr(struct ipa_bts_conn *ipbc, - unsigned int priv_nr) -{ - struct ipa_proxy_conn *bsc_conn; - unsigned int trx_id = priv_nr >> 8; - - switch (priv_nr & 0xff) { - case OML_FROM_BTS: /* incoming OML data from BTS, forward to BSC OML */ - bsc_conn = ipbc->bsc_oml_conn; - break; - case RSL_FROM_BTS: /* incoming RSL data from BTS, forward to BSC RSL */ - bsc_conn = ipbc->bsc_rsl_conn[trx_id]; - break; - case OML_TO_BSC: /* incoming OML data from BSC, forward to BTS OML */ - bsc_conn = ipbc->oml_conn; - break; - case RSL_TO_BSC: /* incoming RSL data from BSC, forward to BTS RSL */ - bsc_conn = ipbc->rsl_conn[trx_id]; - break; - default: - bsc_conn = NULL; - break; - } - return bsc_conn; -} - -static void reconn_tmr_cb(void *data) -{ - struct ipa_proxy *ipp = data; - struct ipa_bts_conn *ipbc; - struct sockaddr_in sin; - int i; - - DEBUGP(DLINP, "Running reconnect timer\n"); - - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - inet_aton(bsc_ipaddr, &sin.sin_addr); - - llist_for_each_entry(ipbc, &ipp->bts_list, list) { - /* if OML to BSC is dead, try to restore it */ - if (ipbc->oml_conn && !ipbc->bsc_oml_conn) { - sin.sin_port = htons(IPA_TCP_PORT_OML); - logp_ipbc_uid(DLINP, LOGL_NOTICE, ipbc, 0); - LOGPC(DLINP, LOGL_NOTICE, "OML Trying to reconnect\n"); - ipbc->bsc_oml_conn = connect_bsc(&sin, OML_TO_BSC, ipbc); - if (!ipbc->bsc_oml_conn) - goto reschedule; - logp_ipbc_uid(DLINP, LOGL_NOTICE, ipbc, 0); - LOGPC(DLINP, LOGL_NOTICE, "OML Reconnected\n"); - } - /* if we (still) don't have a OML connection, skip RSL */ - if (!ipbc->oml_conn || !ipbc->bsc_oml_conn) - continue; - - for (i = 0; i < ARRAY_SIZE(ipbc->rsl_conn); i++) { - unsigned int priv_nr; - /* don't establish RSL links which we don't have */ - if (!ipbc->rsl_conn[i]) - continue; - if (ipbc->bsc_rsl_conn[i]) - continue; - priv_nr = ipbc->rsl_conn[i]->fd.priv_nr; - priv_nr &= ~0xff; - priv_nr |= RSL_TO_BSC; - sin.sin_port = htons(IPA_TCP_PORT_RSL); - logp_ipbc_uid(DLINP, LOGL_NOTICE, ipbc, priv_nr >> 8); - LOGPC(DLINP, LOGL_NOTICE, "RSL Trying to reconnect\n"); - ipbc->bsc_rsl_conn[i] = connect_bsc(&sin, priv_nr, ipbc); - if (!ipbc->bsc_rsl_conn[i]) - goto reschedule; - logp_ipbc_uid(DLINP, LOGL_NOTICE, ipbc, priv_nr >> 8); - LOGPC(DLINP, LOGL_NOTICE, "RSL Reconnected\n"); - } - } - return; - -reschedule: - osmo_timer_schedule(&ipp->reconn_timer, 5, 0); -} - -static void handle_dead_socket(struct osmo_fd *bfd) -{ - struct ipa_proxy_conn *ipc = bfd->data; /* local conn */ - struct ipa_proxy_conn *bsc_conn; /* remote conn */ - struct ipa_bts_conn *ipbc = ipc->bts_conn; - unsigned int trx_id = bfd->priv_nr >> 8; - struct msgb *msg, *msg2; - - osmo_fd_unregister(bfd); - close(bfd->fd); - bfd->fd = -1; - - /* FIXME: clear tx_queue, remove all references, etc. */ - llist_for_each_entry_safe(msg, msg2, &ipc->tx_queue, list) - msgb_free(msg); - - switch (bfd->priv_nr & 0xff) { - case OML_FROM_BTS: /* incoming OML data from BTS, forward to BSC OML */ - /* The BTS started a connection with us but we got no - * IPAC_MSGT_ID_RESP message yet, in that scenario we did not - * allocate the ipa_bts_conn structure. */ - if (ipbc == NULL) - break; - ipbc->oml_conn = NULL; - bsc_conn = ipbc->bsc_oml_conn; - /* close the connection to the BSC */ - osmo_fd_unregister(&bsc_conn->fd); - close(bsc_conn->fd.fd); - llist_for_each_entry_safe(msg, msg2, &bsc_conn->tx_queue, list) - msgb_free(msg); - talloc_free(bsc_conn); - ipbc->bsc_oml_conn = NULL; - /* FIXME: do we need to delete the entire ipbc ? */ - break; - case RSL_FROM_BTS: /* incoming RSL data from BTS, forward to BSC RSL */ - ipbc->rsl_conn[trx_id] = NULL; - bsc_conn = ipbc->bsc_rsl_conn[trx_id]; - /* close the connection to the BSC */ - osmo_fd_unregister(&bsc_conn->fd); - close(bsc_conn->fd.fd); - llist_for_each_entry_safe(msg, msg2, &bsc_conn->tx_queue, list) - msgb_free(msg); - talloc_free(bsc_conn); - ipbc->bsc_rsl_conn[trx_id] = NULL; - break; - case OML_TO_BSC: /* incoming OML data from BSC, forward to BTS OML */ - ipbc->bsc_oml_conn = NULL; - bsc_conn = ipbc->oml_conn; - /* start reconnect timer */ - osmo_timer_schedule(&ipp->reconn_timer, 5, 0); - break; - case RSL_TO_BSC: /* incoming RSL data from BSC, forward to BTS RSL */ - ipbc->bsc_rsl_conn[trx_id] = NULL; - bsc_conn = ipbc->rsl_conn[trx_id]; - /* start reconnect timer */ - osmo_timer_schedule(&ipp->reconn_timer, 5, 0); - break; - default: - bsc_conn = NULL; - break; - } - - talloc_free(ipc); -} - -static void patch_gprs_msg(struct ipa_bts_conn *ipbc, int priv_nr, struct msgb *msg) -{ - uint8_t *nsvci; - - if ((priv_nr & 0xff) != OML_FROM_BTS && (priv_nr & 0xff) != OML_TO_BSC) - return; - - if (msgb_l2len(msg) != 39) - return; - - /* - * Check if this is a IPA Set Attribute or IPA Set Attribute ACK - * and if the FOM Class is GPRS NSVC0 and then we will patch it. - * - * The patch assumes the message looks like the one from the trace - * but we only match messages with a specific size anyway... So - * this hack should work just fine. - */ - - if (msg->l2h[0] == 0x10 && msg->l2h[1] == 0x80 && - msg->l2h[2] == 0x00 && msg->l2h[3] == 0x15 && - msg->l2h[18] == 0xf5 && msg->l2h[19] == 0xf2) { - nsvci = &msg->l2h[23]; - ipbc->gprs_orig_port = *(uint16_t *)(nsvci+8); - ipbc->gprs_orig_ip = *(uint32_t *)(nsvci+10); - *(uint16_t *)(nsvci+8) = htons(ipbc->gprs_local_port); - *(uint32_t *)(nsvci+10) = ipbc->ipp->listen_addr.s_addr; - } else if (msg->l2h[0] == 0x10 && msg->l2h[1] == 0x80 && - msg->l2h[2] == 0x00 && msg->l2h[3] == 0x15 && - msg->l2h[18] == 0xf6 && msg->l2h[19] == 0xf2) { - nsvci = &msg->l2h[23]; - *(uint16_t *)(nsvci+8) = ipbc->gprs_orig_port; - *(uint32_t *)(nsvci+10) = ipbc->gprs_orig_ip; - } -} - -static int handle_tcp_read(struct osmo_fd *bfd) -{ - struct ipa_proxy_conn *ipc = bfd->data; - struct ipa_bts_conn *ipbc = ipc->bts_conn; - struct ipa_proxy_conn *bsc_conn; - struct msgb *msg; - struct ipaccess_head *hh; - int ret = 0; - char *btsbsc; - - if ((bfd->priv_nr & 0xff) <= 2) - btsbsc = "BTS"; - else - btsbsc = "BSC"; - - msg = ipaccess_proxy_read_msg(bfd, &ret); - if (!msg) { - if (ret == 0) { - logp_ipbc_uid(DLINP, LOGL_NOTICE, ipbc, bfd->priv_nr >> 8); - LOGPC(DLINP, LOGL_NOTICE, "%s disappeared, " - "dead socket\n", btsbsc); - handle_dead_socket(bfd); - } - return ret; - } - - msgb_put(msg, ret); - logp_ipbc_uid(DLMI, LOGL_DEBUG, ipbc, bfd->priv_nr >> 8); - DEBUGPC(DLMI, "RX<-%s: %s\n", btsbsc, osmo_hexdump(msg->data, msg->len)); - - hh = (struct ipaccess_head *) msg->data; - if (hh->proto == IPAC_PROTO_IPACCESS) { - ret = ipaccess_rcvmsg(ipc, msg, bfd); - if (ret < 0) { - osmo_fd_unregister(bfd); - close(bfd->fd); - bfd->fd = -1; - talloc_free(bfd); - msgb_free(msg); - return ret; - } else if (ret == 0) { - /* we do not forward parts of the CCM protocol - * through the proxy but rather terminate it ourselves. */ - msgb_free(msg); - return ret; - } - } - - if (!ipbc) { - LOGP(DLINP, LOGL_ERROR, - "received %s packet but no ipc->bts_conn?!?\n", btsbsc); - msgb_free(msg); - return -EIO; - } - - bsc_conn = ipc_by_priv_nr(ipbc, bfd->priv_nr); - if (bsc_conn) { - if (gprs_ns_ipaddr) - patch_gprs_msg(ipbc, bfd->priv_nr, msg); - /* enqueue packet towards BSC */ - msgb_enqueue(&bsc_conn->tx_queue, msg); - /* mark respective filedescriptor as 'we want to write' */ - bsc_conn->fd.when |= BSC_FD_WRITE; - } else { - logp_ipbc_uid(DLINP, LOGL_INFO, ipbc, bfd->priv_nr >> 8); - LOGPC(DLINP, LOGL_INFO, "Dropping packet from %s, " - "since remote connection is dead\n", btsbsc); - msgb_free(msg); - } - - return ret; -} - -/* a TCP socket is ready to be written to */ -static int handle_tcp_write(struct osmo_fd *bfd) -{ - struct ipa_proxy_conn *ipc = bfd->data; - struct ipa_bts_conn *ipbc = ipc->bts_conn; - struct llist_head *lh; - struct msgb *msg; - char *btsbsc; - int ret; - - if ((bfd->priv_nr & 0xff) <= 2) - btsbsc = "BTS"; - else - btsbsc = "BSC"; - - - /* get the next msg for this timeslot */ - if (llist_empty(&ipc->tx_queue)) { - bfd->when &= ~BSC_FD_WRITE; - return 0; - } - lh = ipc->tx_queue.next; - llist_del(lh); - msg = llist_entry(lh, struct msgb, list); - - logp_ipbc_uid(DLMI, LOGL_DEBUG, ipbc, bfd->priv_nr >> 8); - DEBUGPC(DLMI, "TX %04x: %s\n", bfd->priv_nr, - osmo_hexdump(msg->data, msg->len)); - - ret = send(bfd->fd, msg->data, msg->len, 0); - msgb_free(msg); - - if (ret == 0) { - logp_ipbc_uid(DLINP, LOGL_NOTICE, ipbc, bfd->priv_nr >> 8); - LOGP(DLINP, LOGL_NOTICE, "%s disappeared, dead socket\n", btsbsc); - handle_dead_socket(bfd); - } - - return ret; -} - -/* callback from select.c in case one of the fd's can be read/written */ -static int proxy_ipaccess_fd_cb(struct osmo_fd *bfd, unsigned int what) -{ - int rc = 0; - - if (what & BSC_FD_READ) { - rc = handle_tcp_read(bfd); - if (rc < 0) - return rc; - } - if (what & BSC_FD_WRITE) - rc = handle_tcp_write(bfd); - - return rc; -} - -/* callback of the listening filedescriptor */ -static int listen_fd_cb(struct osmo_fd *listen_bfd, unsigned int what) -{ - int ret; - struct ipa_proxy_conn *ipc; - struct osmo_fd *bfd; - struct sockaddr_in sa; - socklen_t sa_len = sizeof(sa); - - if (!(what & BSC_FD_READ)) - return 0; - - ret = accept(listen_bfd->fd, (struct sockaddr *) &sa, &sa_len); - if (ret < 0) { - perror("accept"); - return ret; - } - DEBUGP(DLINP, "accept()ed new %s link from %s\n", - (listen_bfd->priv_nr & 0xff) == OML_FROM_BTS ? "OML" : "RSL", - inet_ntoa(sa.sin_addr)); - - ipc = alloc_conn(); - if (!ipc) { - close(ret); - return -ENOMEM; - } - - bfd = &ipc->fd; - bfd->fd = ret; - bfd->data = ipc; - bfd->priv_nr = listen_bfd->priv_nr; - bfd->cb = proxy_ipaccess_fd_cb; - bfd->when = BSC_FD_READ; - ret = osmo_fd_register(bfd); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "could not register FD\n"); - close(bfd->fd); - talloc_free(ipc); - return ret; - } - - /* Request ID. FIXME: request LOCATION, HW/SW VErsion, Unit Name, Serno */ - ret = ipa_ccm_send_id_req(bfd->fd); - - return 0; -} - -static void send_ns(int fd, const char *buf, int size, struct in_addr ip, int port) -{ - int ret; - struct sockaddr_in addr; - socklen_t len = sizeof(addr); - memset(&addr, 0, sizeof(addr)); - - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - addr.sin_addr = ip; - - ret = sendto(fd, buf, size, 0, (struct sockaddr *) &addr, len); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "Failed to forward GPRS message.\n"); - } -} - -static int gprs_ns_cb(struct osmo_fd *bfd, unsigned int what) -{ - struct ipa_bts_conn *bts; - char buf[4096]; - int ret; - struct sockaddr_in sock; - socklen_t len = sizeof(sock); - - /* 1. get the data... */ - ret = recvfrom(bfd->fd, buf, sizeof(buf), 0, (struct sockaddr *) &sock, &len); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "Failed to recv GPRS NS msg: %s.\n", strerror(errno)); - return -1; - } - - bts = bfd->data; - - /* 2. figure out where to send it to */ - if (memcmp(&sock.sin_addr, &ipp->gprs_addr, sizeof(sock.sin_addr)) == 0) { - LOGP(DLINP, LOGL_DEBUG, "GPRS NS msg from network.\n"); - send_ns(bfd->fd, buf, ret, bts->bts_addr, 23000); - } else if (memcmp(&sock.sin_addr, &bts->bts_addr, sizeof(sock.sin_addr)) == 0) { - LOGP(DLINP, LOGL_DEBUG, "GPRS NS msg from BTS.\n"); - send_ns(bfd->fd, buf, ret, ipp->gprs_addr, 23000); - } else { - LOGP(DLINP, LOGL_ERROR, "Unknown GPRS source: %s\n", inet_ntoa(sock.sin_addr)); - } - - return 0; -} - -/* Actively connect to a BSC. */ -static struct ipa_proxy_conn *connect_bsc(struct sockaddr_in *sa, int priv_nr, void *data) -{ - struct ipa_proxy_conn *ipc; - struct osmo_fd *bfd; - int ret, on = 1; - - ipc = alloc_conn(); - if (!ipc) - return NULL; - - ipc->bts_conn = data; - - bfd = &ipc->fd; - bfd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ | BSC_FD_WRITE; - bfd->data = ipc; - bfd->priv_nr = priv_nr; - - if (bfd->fd < 0) { - LOGP(DLINP, LOGL_ERROR, "Could not create socket: %s\n", - strerror(errno)); - talloc_free(ipc); - return NULL; - } - - ret = setsockopt(bfd->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "Could not set socket option\n"); - close(bfd->fd); - talloc_free(ipc); - return NULL; - } - - ret = connect(bfd->fd, (struct sockaddr *) sa, sizeof(*sa)); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "Could not connect socket: %s\n", - inet_ntoa(sa->sin_addr)); - close(bfd->fd); - talloc_free(ipc); - return NULL; - } - - /* pre-fill tx_queue with identity request */ - ret = osmo_fd_register(bfd); - if (ret < 0) { - close(bfd->fd); - talloc_free(ipc); - return NULL; - } - - return ipc; -} - -static int ipaccess_proxy_setup(void) -{ - int ret; - - ipp = talloc_zero(tall_bsc_ctx, struct ipa_proxy); - if (!ipp) - return -ENOMEM; - INIT_LLIST_HEAD(&ipp->bts_list); - osmo_timer_setup(&ipp->reconn_timer, reconn_tmr_cb, ipp); - - /* Listen for OML connections */ - ret = make_sock(&ipp->oml_listen_fd, IPPROTO_TCP, INADDR_ANY, - IPA_TCP_PORT_OML, OML_FROM_BTS, listen_fd_cb, NULL); - if (ret < 0) - return ret; - - /* Listen for RSL connections */ - ret = make_sock(&ipp->rsl_listen_fd, IPPROTO_TCP, INADDR_ANY, - IPA_TCP_PORT_RSL, RSL_FROM_BTS, listen_fd_cb, NULL); - - if (ret < 0) - return ret; - - /* Connect the GPRS NS Socket */ - if (gprs_ns_ipaddr) { - inet_aton(gprs_ns_ipaddr, &ipp->gprs_addr); - inet_aton(listen_ipaddr, &ipp->listen_addr); - } - - return ret; -} - -static void signal_handler(int signal) -{ - fprintf(stdout, "signal %u received\n", signal); - - switch (signal) { - case SIGABRT: - /* in case of abort, we want to obtain a talloc report - * and then return to the caller, who will abort the process */ - case SIGUSR1: - talloc_report_full(tall_bsc_ctx, stderr); - break; - default: - break; - } -} - -static void print_help(void) -{ - printf(" ipaccess-proxy is a proxy BTS.\n"); - printf(" -h --help. This help text.\n"); - printf(" -l --listen IP. The ip to listen to.\n"); - printf(" -b --bsc IP. The BSC IP address.\n"); - printf(" -g --gprs IP. Take GPRS NS from that IP.\n"); - printf("\n"); - printf(" -s --disable-color. Disable the color inside the logging message.\n"); - printf(" -e --log-level number. Set the global loglevel.\n"); - printf(" -T --timestamp. Prefix every log message with a timestamp.\n"); - printf(" -V --version. Print the version of OpenBSC.\n"); -} - -static void print_usage(void) -{ - printf("Usage: ipaccess-proxy [options]\n"); -} - -enum { - IPA_PROXY_OPT_LISTEN_NONE = 0, - IPA_PROXY_OPT_LISTEN_IP = (1 << 0), - IPA_PROXY_OPT_BSC_IP = (1 << 1), -}; - -static void handle_options(int argc, char** argv) -{ - int options_mask = 0; - - /* disable explicit missing arguments error output from getopt_long */ - opterr = 0; - - while (1) { - int option_index = 0, c; - static struct option long_options[] = { - {"help", 0, 0, 'h'}, - {"disable-color", 0, 0, 's'}, - {"timestamp", 0, 0, 'T'}, - {"log-level", 1, 0, 'e'}, - {"listen", 1, 0, 'l'}, - {"bsc", 1, 0, 'b'}, - {0, 0, 0, 0} - }; - - c = getopt_long(argc, argv, "hsTe:l:b:g:", - long_options, &option_index); - if (c == -1) - break; - - switch (c) { - case 'h': - print_usage(); - print_help(); - exit(0); - case 'l': - listen_ipaddr = optarg; - options_mask |= IPA_PROXY_OPT_LISTEN_IP; - break; - case 'b': - bsc_ipaddr = optarg; - options_mask |= IPA_PROXY_OPT_BSC_IP; - break; - case 'g': - gprs_ns_ipaddr = optarg; - break; - case 's': - log_set_use_color(osmo_stderr_target, 0); - break; - case 'T': - log_set_print_timestamp(osmo_stderr_target, 1); - break; - case 'e': - log_set_log_level(osmo_stderr_target, atoi(optarg)); - break; - case '?': - if (optopt) { - printf("ERROR: missing mandatory argument " - "for `%s' option\n", argv[optind-1]); - } else { - printf("ERROR: unknown option `%s'\n", - argv[optind-1]); - } - print_usage(); - print_help(); - exit(EXIT_FAILURE); - break; - default: - /* ignore */ - break; - } - } - if ((options_mask & (IPA_PROXY_OPT_LISTEN_IP | IPA_PROXY_OPT_BSC_IP)) - != (IPA_PROXY_OPT_LISTEN_IP | IPA_PROXY_OPT_BSC_IP)) { - printf("ERROR: You have to specify `--listen' and `--bsc' " - "options at least.\n"); - print_usage(); - print_help(); - exit(EXIT_FAILURE); - } -} - -int main(int argc, char **argv) -{ - int rc; - - tall_bsc_ctx = talloc_named_const(NULL, 1, "ipaccess-proxy"); - msgb_talloc_ctx_init(tall_bsc_ctx, 0); - - osmo_init_logging(&log_info); - log_parse_category_mask(osmo_stderr_target, "DLINP:DLMI"); - - handle_options(argc, argv); - - rc = ipaccess_proxy_setup(); - if (rc < 0) - exit(1); - - signal(SIGUSR1, &signal_handler); - signal(SIGABRT, &signal_handler); - osmo_init_ignore_signals(); - - while (1) { - osmo_select_main(0); - } -} diff --git a/openbsc/src/ipaccess/network_listen.c b/openbsc/src/ipaccess/network_listen.c deleted file mode 100644 index 43d82a9..0000000 --- a/openbsc/src/ipaccess/network_listen.c +++ /dev/null @@ -1,257 +0,0 @@ -/* ip.access nanoBTS network listen mode */ - -/* (C) 2009-2010 by Harald Welte - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#define WHITELIST_MAX_SIZE ((NUM_ARFCNS*2)+2+1) - -int ipac_rxlevstat2whitelist(uint16_t *buf, const struct rxlev_stats *st, uint8_t min_rxlev, - uint16_t max_num_arfcns) -{ - int i; - unsigned int num_arfcn = 0; - - for (i = NUM_RXLEVS-1; i >= min_rxlev; i--) { - int16_t arfcn = -1; - - while ((arfcn = rxlev_stat_get_next(st, i, arfcn)) >= 0) { - *buf++ = htons(arfcn); - num_arfcn++; - - } - - if (num_arfcn > max_num_arfcns) - break; - } - - return num_arfcn; -} - -enum ipac_test_state { - IPAC_TEST_S_IDLE, - IPAC_TEST_S_RQD, - IPAC_TEST_S_EXEC, - IPAC_TEST_S_PARTIAL, -}; - -int ipac_nwl_test_start(struct gsm_bts_trx *trx, uint8_t testnr, - const uint8_t *phys_conf, unsigned int phys_conf_len) -{ - struct msgb *msg; - - if (trx->ipaccess.test_state != IPAC_TEST_S_IDLE) { - fprintf(stderr, "Cannot start test in state %u\n", trx->ipaccess.test_state); - return -EINVAL; - } - - switch (testnr) { - case NM_IPACC_TESTNO_CHAN_USAGE: - case NM_IPACC_TESTNO_BCCH_CHAN_USAGE: - rxlev_stat_reset(&trx->ipaccess.rxlev_stat); - break; - } - - msg = msgb_alloc_headroom(phys_conf_len+256, 128, "OML"); - - if (phys_conf && phys_conf_len) { - uint8_t *payload; - /* first put the phys conf header */ - msgb_tv16_put(msg, NM_ATT_PHYS_CONF, phys_conf_len); - payload = msgb_put(msg, phys_conf_len); - memcpy(payload, phys_conf, phys_conf_len); - } - - abis_nm_perform_test(trx->bts, NM_OC_RADIO_CARRIER, 0, trx->nr, 0xff, - testnr, 1, msg); - trx->ipaccess.test_nr = testnr; - - /* FIXME: start safety timer until when test is supposed to complete */ - - return 0; -} - -static uint16_t last_arfcn; -static struct gsm_sysinfo_freq nwl_si_freq[1024]; -#define FREQ_TYPE_NCELL_2 0x04 /* sub channel of SI 2 */ -#define FREQ_TYPE_NCELL_2bis 0x08 /* sub channel of SI 2bis */ -#define FREQ_TYPE_NCELL_2ter 0x10 /* sub channel of SI 2ter */ - -struct ipacc_ferr_elem { - int16_t freq_err; - uint8_t freq_qual; - uint8_t arfcn; -} __attribute__((packed)); - -struct ipacc_cusage_elem { - uint16_t arfcn:10, - rxlev:6; -} __attribute__ ((packed)); - -static int test_rep(void *_msg) -{ - struct msgb *msg = _msg; - struct abis_om_fom_hdr *foh = msgb_l3(msg); - uint16_t test_rep_len, ferr_list_len; - struct ipacc_ferr_elem *ife; - struct ipac_bcch_info binfo; - struct e1inp_sign_link *sign_link = (struct e1inp_sign_link *)msg->dst; - int i, rc; - - DEBUGP(DNM, "TEST REPORT: "); - - if (foh->data[0] != NM_ATT_TEST_NO || - foh->data[2] != NM_ATT_TEST_REPORT) - return -EINVAL; - - DEBUGPC(DNM, "test_no=0x%02x ", foh->data[1]); - /* data[2] == NM_ATT_TEST_REPORT */ - /* data[3..4]: test_rep_len */ - memcpy(&test_rep_len, &foh->data[3], sizeof(uint16_t)); - test_rep_len = ntohs(test_rep_len); - /* data[5]: ip.access test result */ - DEBUGPC(DNM, "tst_res=%s\n", ipacc_testres_name(foh->data[5])); - - /* data[6]: ip.access nested IE. 3 == freq_err_list */ - switch (foh->data[6]) { - case NM_IPAC_EIE_FREQ_ERR_LIST: - /* data[7..8]: length of ferr_list */ - memcpy(&ferr_list_len, &foh->data[7], sizeof(uint16_t)); - ferr_list_len = ntohs(ferr_list_len); - - /* data[9...]: frequency error list elements */ - for (i = 0; i < ferr_list_len; i+= sizeof(*ife)) { - ife = (struct ipacc_ferr_elem *) (foh->data + 9 + i); - DEBUGP(DNM, "==> ARFCN %4u, Frequency Error %6hd\n", - ife->arfcn, ntohs(ife->freq_err)); - } - break; - case NM_IPAC_EIE_CHAN_USE_LIST: - /* data[7..8]: length of ferr_list */ - memcpy(&ferr_list_len, &foh->data[7], sizeof(uint16_t)); - ferr_list_len = ntohs(ferr_list_len); - - /* data[9...]: channel usage list elements */ - for (i = 0; i < ferr_list_len; i+= 2) { - uint16_t *cu_ptr = (uint16_t *)(foh->data + 9 + i); - uint16_t cu = ntohs(*cu_ptr); - uint16_t arfcn = cu & 0x3ff; - uint8_t rxlev = cu >> 10; - DEBUGP(DNM, "==> ARFCN %4u, RxLev %2u\n", arfcn, rxlev); - rxlev_stat_input(&sign_link->trx->ipaccess.rxlev_stat, - arfcn, rxlev); - } - break; - case NM_IPAC_EIE_BCCH_INFO_TYPE: - break; - case NM_IPAC_EIE_BCCH_INFO: - rc = ipac_parse_bcch_info(&binfo, foh->data+6); - if (rc < 0) { - DEBUGP(DNM, "BCCH Info parsing failed\n"); - break; - } - DEBUGP(DNM, "==> ARFCN %u, RxLev %2u, RxQual %2u: %s, LAC %d CI %d BSIC %u\n", - binfo.arfcn, binfo.rx_lev, binfo.rx_qual, - osmo_plmn_name(&binfo.cgi.lai.plmn), - binfo.cgi.lai.lac, binfo.cgi.cell_identity, binfo.bsic); - - if (binfo.arfcn != last_arfcn) { - /* report is on a new arfcn, need to clear channel list */ - memset(nwl_si_freq, 0, sizeof(nwl_si_freq)); - last_arfcn = binfo.arfcn; - } - if (binfo.info_type & IPAC_BINF_NEIGH_BA_SI2) { - DEBUGP(DNM, "BA SI2: %s\n", osmo_hexdump(binfo.ba_list_si2, sizeof(binfo.ba_list_si2))); - gsm48_decode_freq_list(nwl_si_freq, binfo.ba_list_si2, sizeof(binfo.ba_list_si2), - 0x8c, FREQ_TYPE_NCELL_2); - } - if (binfo.info_type & IPAC_BINF_NEIGH_BA_SI2bis) { - DEBUGP(DNM, "BA SI2bis: %s\n", osmo_hexdump(binfo.ba_list_si2bis, sizeof(binfo.ba_list_si2bis))); - gsm48_decode_freq_list(nwl_si_freq, binfo.ba_list_si2bis, sizeof(binfo.ba_list_si2bis), - 0x8e, FREQ_TYPE_NCELL_2bis); - } - if (binfo.info_type & IPAC_BINF_NEIGH_BA_SI2ter) { - DEBUGP(DNM, "BA SI2ter: %s\n", osmo_hexdump(binfo.ba_list_si2ter, sizeof(binfo.ba_list_si2ter))); - gsm48_decode_freq_list(nwl_si_freq, binfo.ba_list_si2ter, sizeof(binfo.ba_list_si2ter), - 0x8e, FREQ_TYPE_NCELL_2ter); - } - for (i = 0; i < ARRAY_SIZE(nwl_si_freq); i++) { - if (nwl_si_freq[i].mask) - DEBUGP(DNM, "Neighbor Cell on ARFCN %u\n", i); - } - break; - default: - break; - } - - switch (foh->data[5]) { - case NM_IPACC_TESTRES_SUCCESS: - case NM_IPACC_TESTRES_STOPPED: - case NM_IPACC_TESTRES_TIMEOUT: - case NM_IPACC_TESTRES_NO_CHANS: - sign_link->trx->ipaccess.test_state = IPAC_TEST_S_IDLE; - /* Send signal to notify higher layers of test completion */ - DEBUGP(DNM, "dispatching S_IPAC_NWL_COMPLETE signal\n"); - osmo_signal_dispatch(SS_IPAC_NWL, S_IPAC_NWL_COMPLETE, - sign_link->trx); - break; - case NM_IPACC_TESTRES_PARTIAL: - sign_link->trx->ipaccess.test_state = IPAC_TEST_S_PARTIAL; - break; - } - - return 0; -} - -static int nwl_sig_cb(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data) -{ - switch (signal) { - case S_NM_TEST_REP: - return test_rep(signal_data); - default: - break; - } - - return 0; -} - -void ipac_nwl_init(void) -{ - osmo_signal_register_handler(SS_NM, nwl_sig_cb, NULL); -} -- To view, visit https://gerrit.osmocom.org/11921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9c04f9b469e60802461a2a6e421d3ba27e6dafa1 Gerrit-Change-Number: 11921 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 09:59:52 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 6 Dec 2018 09:59:52 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: propagate expected BSC id to command processor In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12145 ) Change subject: Trap handlers: propagate expected BSC id to command processor ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12145/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12145/1//COMMIT_MSG at 10 PS1, Line 10: when request was made, not the one which is part of the reply. Do they change? In what situation can that happen? Shouldn't we skip all changes and log an error in that case? -- To view, visit https://gerrit.osmocom.org/12145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6acdfddb9a1132f978f2b55c769559b0c29eb3e8 Gerrit-Change-Number: 12145 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 09:59:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 10:00:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 10:00:15 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: log request time In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12147 ) Change subject: ctrl2cgi: log request time ...................................................................... Patch Set 1: > So maybe add a log statement here with the difference between ts and datetime.now and pass a new datetime.now into the callback? Good point, although I'm not sure how lazy python in this case: if arguments to sem.run() are evaluated in advance that would work but if it's deferred until it's acquired than both ts would fire at the same time. I'll try to test and see if this can be implemented in a separate patch. -- To view, visit https://gerrit.osmocom.org/12147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11c8ac67a2730a9c6912694e5b83bbdf08fe357d Gerrit-Change-Number: 12147 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 10:00:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 10:06:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 10:06:31 +0000 Subject: Change in python/osmo-python-tests[master]: twisted: disable low-level logging in dispatchers In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, daniel, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12150 to look at the new patch set (#2). Change subject: twisted: disable low-level logging in dispatchers ...................................................................... twisted: disable low-level logging in dispatchers The same messages are better handled in derived classes using message-specific functions instead of generic dispatchers. Change-Id: I4a054eec9ef7ab39e15ac0cd64834a251d4fb2d7 --- M osmopy/twisted_ipa.py 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/50/12150/2 -- To view, visit https://gerrit.osmocom.org/12150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4a054eec9ef7ab39e15ac0cd64834a251d4fb2d7 Gerrit-Change-Number: 12150 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 10:06:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 10:06:31 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: adjust http error log In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, daniel, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12149 to look at the new patch set (#2). Change subject: Trap handlers: adjust http error log ...................................................................... Trap handlers: adjust http error log Log repr() of error because it's more conscience which makes it easier to read the logs: in case of "e" there's additional "Failure instance: Traceback (failure with no frames)" prefix which is pretty useless because we won't have proper tracebacks for deferred anyway. Change-Id: I39870b83cacee9a589636974d04e356ef0d32345 --- M scripts/ctrl2cgi.py M scripts/soap.py 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/49/12149/2 -- To view, visit https://gerrit.osmocom.org/12149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I39870b83cacee9a589636974d04e356ef0d32345 Gerrit-Change-Number: 12149 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 6 10:08:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 10:08:23 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-ggsn_=C2=BB_--enable-?= =?UTF-8?Q?gtp-linux,0,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#1197?= In-Reply-To: <992955556.1115.1544081819179.JavaMail.jenkins@jenkins.osmocom.org> References: <992955556.1115.1544081819179.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <690493235.1119.1544090903912.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Dec 6 10:08:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 10:08:42 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-ggsn_=C2=BB_--disable?= =?UTF-8?Q?-gtp-linux,1,a3=3Ddefault,a4=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#1197?= In-Reply-To: <806470406.1114.1544081806418.JavaMail.jenkins@jenkins.osmocom.org> References: <806470406.1114.1544081806418.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <171167180.1120.1544090922470.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Dec 6 10:10:34 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 6 Dec 2018 10:10:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 06 Dec 2018 10:10:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 10:18:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 10:18:56 +0000 Subject: Change in python/osmo-python-tests[master]: twisted: remove low-level logging in dispatchers In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, daniel, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12150 to look at the new patch set (#3). Change subject: twisted: remove low-level logging in dispatchers ...................................................................... twisted: remove low-level logging in dispatchers The same messages are better handled in derived classes using message-specific functions instead of generic dispatchers. Change-Id: I4a054eec9ef7ab39e15ac0cd64834a251d4fb2d7 --- M osmopy/twisted_ipa.py 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/50/12150/3 -- To view, visit https://gerrit.osmocom.org/12150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4a054eec9ef7ab39e15ac0cd64834a251d4fb2d7 Gerrit-Change-Number: 12150 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 10:21:19 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 6 Dec 2018 10:21:19 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: adjust http error log In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12149 ) Change subject: Trap handlers: adjust http error log ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39870b83cacee9a589636974d04e356ef0d32345 Gerrit-Change-Number: 12149 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 10:21:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 10:21:46 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 6 Dec 2018 10:21:46 +0000 Subject: Change in python/osmo-python-tests[master]: twisted: remove low-level logging in dispatchers In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12150 ) Change subject: twisted: remove low-level logging in dispatchers ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a054eec9ef7ab39e15ac0cd64834a251d4fb2d7 Gerrit-Change-Number: 12150 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 06 Dec 2018 10:21:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 6 10:31:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 10:31:25 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#329?= In-Reply-To: <726040561.1074.1544022608449.JavaMail.jenkins@jenkins.osmocom.org> References: <726040561.1074.1544022608449.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <675624796.1121.1544092285732.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 4.03 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Dec 6 10:35:32 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 10:35:32 +0000 Subject: Change in python/osmo-python-tests[master]: Trap handlers: adjust http error log In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12149 ) Change subject: Trap handlers: adjust http error log ...................................................................... Trap handlers: adjust http error log Log repr() of error because it's more conscience which makes it easier to read the logs: in case of "e" there's additional "Failure instance: Traceback (failure with no frames)" prefix which is pretty useless because we won't have proper tracebacks for deferred anyway. Change-Id: I39870b83cacee9a589636974d04e356ef0d32345 --- M scripts/ctrl2cgi.py M scripts/soap.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 81674d8..28a7c3b 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -64,7 +64,7 @@ def make_async_req(ts, dst, par, f_write, f_log, tout): d = post(dst, par, timeout=tout) d.addCallback(collect, partial(handle_reply, ts, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once - d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s (timeout %d)" % (e, par['bsc_id'], dst, tout))) # handle HTTP errors + d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s (timeout %d)" % (repr(e), par['bsc_id'], dst, tout))) # handle HTTP errors return d class Trap(CTRL): diff --git a/scripts/soap.py b/scripts/soap.py index 5817988..0cb2184 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -90,7 +90,7 @@ ctx = self.factory.client.registerSiteLocation(bsc, float(params['lon']), float(params['lat']), params['position_validity'], params['time_stamp'], params['oper_status'], params['admin_status'], params['policy_status']) d = post(self.factory.location, ctx.envelope) d.addCallback(collect, partial(handle_reply, ctx.process_reply, params['bsc_id'], self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx - d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors + d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (repr(e), bsc, self.factory.location)), bsc) # handle HTTP errors # Ensure that we run only limited number of requests in parallel: yield self.factory.semaphore.acquire() yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit -- To view, visit https://gerrit.osmocom.org/12149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I39870b83cacee9a589636974d04e356ef0d32345 Gerrit-Change-Number: 12149 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 10:35:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 10:35:33 +0000 Subject: Change in python/osmo-python-tests[master]: twisted: remove low-level logging in dispatchers In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12150 ) Change subject: twisted: remove low-level logging in dispatchers ...................................................................... twisted: remove low-level logging in dispatchers The same messages are better handled in derived classes using message-specific functions instead of generic dispatchers. Change-Id: I4a054eec9ef7ab39e15ac0cd64834a251d4fb2d7 --- M osmopy/twisted_ipa.py 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmopy/twisted_ipa.py b/osmopy/twisted_ipa.py index 70c1ef0..5b65f12 100755 --- a/osmopy/twisted_ipa.py +++ b/osmopy/twisted_ipa.py @@ -146,7 +146,6 @@ """ (_, proto, extension, content) = IPA().del_header(data) if content is not None: - self.dbg('IPA received %s::%s [%d/%d] %s' % (IPA().proto(proto), IPA().ext_name(proto, extension), len(data), len(content), content)) method = getattr(self, 'handle_' + IPA().proto(proto), lambda: "protocol dispatch failure") method(content, proto, extension) @@ -249,7 +248,6 @@ OSMO CTRL message dispatcher, lambda default should never happen For basic tests only, appropriate handling routines should be replaced: see CtrlServer for example """ - self.dbg('OSMO CTRL received %s::%s' % Ctrl().parse_kv(data)) (cmd, op_id, v) = data.decode('utf-8').split(' ', 2) method = getattr(self, 'ctrl_' + cmd, lambda: "CTRL unknown command") method(data, op_id, v) -- To view, visit https://gerrit.osmocom.org/12150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4a054eec9ef7ab39e15ac0cd64834a251d4fb2d7 Gerrit-Change-Number: 12150 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 10:46:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 10:46:11 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 06 Dec 2018 10:46:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 10:49:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 10:49:44 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Patch Set 11: > one slight problem with LOGP could be that in regression tests, we often only check stdout. Actually as long as we check the result of test helper and abort() it should be fine. We can always inspect the logs manually. -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 11 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Dec 2018 10:49:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 11:03:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 11:03:52 +0000 Subject: Change in osmo-hlr[master]: introduce osmo_gsup_client_create2() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/12098 ) Change subject: introduce osmo_gsup_client_create2() ...................................................................... introduce osmo_gsup_client_create2() Add a new API which allows creating a GSUP client connection with more identification information than just a unit name. Instead of being selective about which idenfifiers callers may use, allow callers to pass a full-blown struct ipaccess_unit. This allows applications to use entirely custom identifiers on GSUP client connections. This change is a prerequisite for inter-MSC handover because MSCs will need to use unique identifiers towards the HLR, which isn't very easy to do with the old osmo_gsup_client_create() API. While it's always been possible to pass a unique unit_name, this is not as flexible as we would like. The old API remains for backwards compatibility. struct osmo_gsup_client grows in size but is allocated internally by the library; old calling code won't notice the difference. Change-Id: Ief09677e07d6e977247185b72c605f109aa091f5 Related: OS#3355 --- M include/osmocom/gsupclient/gsup_client.h M src/gsupclient/gsup_client.c 2 files changed, 49 insertions(+), 19 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsupclient/gsup_client.h b/include/osmocom/gsupclient/gsup_client.h index 981751b..95163cd 100644 --- a/include/osmocom/gsupclient/gsup_client.h +++ b/include/osmocom/gsupclient/gsup_client.h @@ -23,6 +23,7 @@ #include #include +#include /* a loss of GSUP between MSC and HLR is considered quite serious, let's try to recover as quickly as * possible. Even one new connection attempt per second should be quite acceptable until the link is @@ -38,7 +39,7 @@ typedef int (*osmo_gsup_client_read_cb_t)(struct osmo_gsup_client *gsupc, struct msgb *msg); struct osmo_gsup_client { - const char *unit_name; + const char *unit_name; /* same as ipa_dev->unit_name, for backwards compat */ struct ipa_client_conn *link; osmo_gsup_client_read_cb_t read_cb; @@ -50,8 +51,16 @@ struct osmo_timer_list connect_timer; int is_connected; int got_ipa_pong; + + struct ipaccess_unit *ipa_dev; /* identification information sent to IPA server */ }; +struct osmo_gsup_client *osmo_gsup_client_create2(void *talloc_ctx, + struct ipaccess_unit *ipa_dev, + const char *ip_addr, + unsigned int tcp_port, + osmo_gsup_client_read_cb_t read_cb, + struct osmo_oap_client_config *oapc_config); struct osmo_gsup_client *osmo_gsup_client_create(void *talloc_ctx, const char *unit_name, const char *ip_addr, diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c index d34a22d..f259bdc 100644 --- a/src/gsupclient/gsup_client.c +++ b/src/gsupclient/gsup_client.c @@ -170,16 +170,12 @@ struct ipaccess_head_ext *he = (struct ipaccess_head_ext *) msgb_l2(msg); struct osmo_gsup_client *gsupc = (struct osmo_gsup_client *)link->data; int rc; - struct ipaccess_unit ipa_dev = { - /* see gsup_client_create() on const vs non-const */ - .unit_name = (char*)gsupc->unit_name, - }; - OSMO_ASSERT(ipa_dev.unit_name); + OSMO_ASSERT(gsupc->unit_name); msg->l2h = &hh->data[0]; - rc = ipaccess_bts_handle_ccm(link, &ipa_dev, msg); + rc = ipaccess_bts_handle_ccm(link, gsupc->ipa_dev, msg); if (rc < 0) { LOGP(DLGSUP, LOGL_NOTICE, @@ -262,24 +258,33 @@ gsup_client_send_ping(gsupc); } -struct osmo_gsup_client *osmo_gsup_client_create(void *talloc_ctx, - const char *unit_name, - const char *ip_addr, - unsigned int tcp_port, - osmo_gsup_client_read_cb_t read_cb, - struct osmo_oap_client_config *oapc_config) +/*! + * Create a gsup client connecting to the specified IP address and TCP port. + * Use the provided ipaccess unit as the client-side identifier; ipa_dev should + * be allocated in talloc_ctx talloc_ctx as well. + * \param[in] talloc_ctx talloc context. + * \param[in] ipa_dev IP access unit which contains client identification information; must be allocated + * in talloc_ctx as well to ensure it lives throughout the lifetime of the connection. + * \param[in] ip_addr GSUP server IP address. + * \param[in] tcp_port GSUP server TCP port. + * \param[in] read_cb callback for reading from the GSUP connection. + * \param[in] oapc_config OPA client configuration. + * \returns a GSUP client connection or NULL on failure. + */ +struct osmo_gsup_client *osmo_gsup_client_create2(void *talloc_ctx, + struct ipaccess_unit *ipa_dev, + const char *ip_addr, + unsigned int tcp_port, + osmo_gsup_client_read_cb_t read_cb, + struct osmo_oap_client_config *oapc_config) { struct osmo_gsup_client *gsupc; int rc; gsupc = talloc_zero(talloc_ctx, struct osmo_gsup_client); OSMO_ASSERT(gsupc); - - /* struct ipaccess_unit has a non-const unit_name, so let's copy to be - * able to have a non-const unit_name here as well. To not taint the - * public gsup_client API, let's store it in a const char* anyway. */ - gsupc->unit_name = talloc_strdup(gsupc, unit_name); - OSMO_ASSERT(gsupc->unit_name); + gsupc->unit_name = (const char *)ipa_dev->unit_name; /* API backwards compat */ + gsupc->ipa_dev = ipa_dev; /* a NULL oapc_config will mark oap_state disabled. */ rc = osmo_oap_client_init(oapc_config, &gsupc->oap_state); @@ -313,6 +318,22 @@ return NULL; } +/** + * Like osmo_gsup_client_create2() except it expects a unit name instead + * of a full-blown ipacess_unit as the client-side identifier. + */ +struct osmo_gsup_client *osmo_gsup_client_create(void *talloc_ctx, + const char *unit_name, + const char *ip_addr, + unsigned int tcp_port, + osmo_gsup_client_read_cb_t read_cb, + struct osmo_oap_client_config *oapc_config) +{ + struct ipaccess_unit *ipa_dev = talloc_zero(talloc_ctx, struct ipaccess_unit); + ipa_dev->unit_name = talloc_strdup(ipa_dev, unit_name); + return osmo_gsup_client_create2(talloc_ctx, ipa_dev, ip_addr, tcp_port, read_cb, oapc_config); +} + void osmo_gsup_client_destroy(struct osmo_gsup_client *gsupc) { osmo_timer_del(&gsupc->connect_timer); -- To view, visit https://gerrit.osmocom.org/12098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ief09677e07d6e977247185b72c605f109aa091f5 Gerrit-Change-Number: 12098 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 11:05:30 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 11:05:30 +0000 Subject: Change in libosmocore[master]: Allow log_init() with NULL log_info In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12092 ) Change subject: Allow log_init() with NULL log_info ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 Gerrit-Change-Number: 12092 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 06 Dec 2018 11:05:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 11:08:31 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 6 Dec 2018 11:08:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: Add SGs testcases In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#14) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: Add SGs testcases ...................................................................... WIP: MSC_Tests: Add SGs testcases This extens MSC_Tests.ttcn with an initial set of SGs interface test cases for RESET, LU, DETACH, PAGING, SMS and CSFB procedures In particular the following testcases are added: - TC_sgsap_reset: isolated reset procedure test - TC_sgsap_lu: isolated location update with TMSI realloc - TC_sgsap_lu_imsi_reject: location update, reject case - TC_sgsap_lu_and_nothing: location update with failed TMSI realloc - TC_sgsap_expl_imsi_det_eps: detach from EPS serveces - TC_sgsap_expl_imsi_det_noneps: detach from non-EPS services - TC_sgsap_paging_rej: isolated paging, reject case - TC_sgsap_paging_subscr_rej: isolated paging, subscr rejects call - TC_sgsap_paging_ue_unr: isolated paging, ue is unreachable - TC_sgsap_paging_and_nothing: page, but don't respond - TC_sgsap_mt_sms: mobile terminated SMS through SGs Interface - TC_sgsap_mo_sms: mobile originated SMS through SGs Interface - TC_sgsap_mt_sms_and_nothing: trigger SMS, but don't respond to paging - TC_sgsap_mt_sms_and_reject: trigger SMS, but reject paging - TC_sgsap_unexp_ud: Send unexpected unitdata (SGs Association: NULL) - TC_sgsap_unsol_ud: Send unsolicited unitdata (subscriber not in VLR) - TC_sgsap_lu_and_mt_call: Initiate MT call via SGs, then do CSFB Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Related: OS#3645 --- M library/SGsAP_Emulation.ttcn M library/SGsAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/gen_links.sh M msc/regen_makefile.sh 6 files changed, 893 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11488/14 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 14 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 11:15:52 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 11:15:52 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12020 to look at the new patch set (#15). Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... LCLS, TS 48.008: add GCR IE encoding/decoding * add functions to encode Global Call. Ref. from TS 29.205 as 3GPP TS 48.008 ?3.2.2.115 information element * add corresponding tests Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 109 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/12020/15 -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 15 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 11:15:52 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 11:15:52 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass2() In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11826 to look at the new patch set (#26). Change subject: LCLS: add gsm0808_create_ass2() ...................................................................... LCLS: add gsm0808_create_ass2() It allows setting additional assignment parameters explicitly. Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Related: OS#2487 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 133 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/11826/26 -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 26 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 11:18:18 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 11:18:18 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 14: > If decoding failed (gsm0808_dec_gcr returned <0), it makes no sense using p and printing related p stuff. If it fails it doesn't mean that part of GCR has not been decoded so I think it still would be nice to see the results of all the checks at once. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 14 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 11:18:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 11:18:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 11:18:34 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 21 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 11:18:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 11:29:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 6 Dec 2018 11:29:48 +0000 Subject: Change in libosmocore[master]: gsm0808: add encoder for cause codes and use it In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12044 to look at the new patch set (#3). Change subject: gsm0808: add encoder for cause codes and use it ...................................................................... gsm0808: add encoder for cause codes and use it At the moment the all gsm0808 cause codes are encoded directly using the tlv API directly to put a one byte TLV field. This works ok for most situations where the cause code consists of a single byte. However, gsm0808 specifies a two byte cause code model where cause codes may be extended up to two bytes. Instead of implementing the encoding over and over and again, let's rather have an encoder function we can call. - Add an encoder function that can generate single byte and extended cause codeds and makes the length decision automatically. - Use only this function to append cause codes Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 6 files changed, 76 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/12044/3 -- To view, visit https://gerrit.osmocom.org/12044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb Gerrit-Change-Number: 12044 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 11:54:31 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Dec 2018 11:54:31 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity ...................................................................... Patch Set 2: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c at 51 PS2, Line 51: struct osmo_sccp_user *scu, int conn_id) TBH, this looks ugly. I am not a big fun of such fancy \t\t\t...\s\s... alignment in general, but let's don't make it even worse please ;) https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c at 321 PS2, Line 321: ci = cil.id_list[0].ci; If 'break' statement is not required here, please add a comment to suppress possible warnings (e.g. from Coverity). -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 06 Dec 2018 11:54:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 11:56:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 11:56:07 +0000 Subject: Change in libosmocore[master]: gsm0808: add encoder for cause codes and use it In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12044 ) Change subject: gsm0808: add encoder for cause codes and use it ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12044/3/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/12044/3/src/gsm/gsm0808_utils.c at 68 PS3, Line 68: osmo_store16be(cause, msg->tail); logical order of l68 and l69 looks wrong to me. BTW, I think you can rmove both and simply use msgb_put_u16(msg, cause); -- To view, visit https://gerrit.osmocom.org/12044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb Gerrit-Change-Number: 12044 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 11:56:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:05:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 12:05:43 +0000 Subject: Change in libosmocore[master]: gsm0408_test: test encoding and decoding Mobile Identity In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12151 ) Change subject: gsm0408_test: test encoding and decoding Mobile Identity ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaae3af87f82f1a8f2e6273984c011b2813038cf7 Gerrit-Change-Number: 12151 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 12:05:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:06:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 12:06:34 +0000 Subject: Change in libosmocore[master]: api doc: gsm48_mi_to_string(): warn of return value implementation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12152 ) Change subject: api doc: gsm48_mi_to_string(): warn of return value implementation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5e7abd15dddf39cdfad8071f4cd5ca8244eabe0 Gerrit-Change-Number: 12152 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 12:06:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:17:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 12:17:02 +0000 Subject: Change in libosmocore[master]: add osmo_bsc2str() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12153 ) Change subject: add osmo_bsc2str() ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/12153/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12153/2//COMMIT_MSG at 7 PS2, Line 7: add osmo_bsc2str() typo: bcd2str https://gerrit.osmocom.org/#/c/12153/2/include/osmocom/core/utils.h File include/osmocom/core/utils.h: https://gerrit.osmocom.org/#/c/12153/2/include/osmocom/core/utils.h at 52 PS2, Line 52: int osmo_bcd2str(char *dst, size_t dst_size, const uint8_t bcd[], int start_nibble, int end_nibble); Why using bcd[] instead of *bcd? https://gerrit.osmocom.org/#/c/12153/2/src/utils.c File src/utils.c: https://gerrit.osmocom.org/#/c/12153/2/src/utils.c at 143 PS2, Line 143: int osmo_bcd2str(char *dst, size_t dst_size, const uint8_t bcd[], int start_nibble, int end_nibble) if it' strlen, then return is a size_t or unsigned int. -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 12:17:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:21:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 12:21:57 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12154 ) Change subject: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1b51b72a721e1cc9d69796b804ebda741ff0f36b Gerrit-Change-Number: 12154 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 12:21:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:23:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 12:23:16 +0000 Subject: Change in libosmocore[master]: gsm48_generate_mid(): mask out ODD flag from mi_type In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12155 ) Change subject: gsm48_generate_mid(): mask out ODD flag from mi_type ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12155/2/tests/gsm0408/gsm0408_test.c File tests/gsm0408/gsm0408_test.c: https://gerrit.osmocom.org/#/c/12155/2/tests/gsm0408/gsm0408_test.c at 467 PS2, Line 467: .expect_mi_tlv_hex = "17031032f4", /* encoding nonsense! */ It's still an encoding nonsense after this patch? would be nice to understand why is nonsense in the comment. -- To view, visit https://gerrit.osmocom.org/12155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 Gerrit-Change-Number: 12155 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 12:23:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:24:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 12:24:35 +0000 Subject: Change in libosmocore[master]: gsm48_generate_mid(): mask out ODD flag from mi_type In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12155 ) Change subject: gsm48_generate_mid(): mask out ODD flag from mi_type ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12155/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12155/2//COMMIT_MSG at 7 PS2, Line 7: gsm48_generate_mid(): mask out ODD flag from mi_type I'd welcome some extra description about what this ODD flag is, or some spec reference or whatever. -- To view, visit https://gerrit.osmocom.org/12155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 Gerrit-Change-Number: 12155 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 12:24:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:26:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 12:26:23 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): guard against zero length output buffer In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12156 ) Change subject: gsm48_mi_to_string(): guard against zero length output buffer ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I709ac3b9efb7b4258d8660715b10312e11b9b571 Gerrit-Change-Number: 12156 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 12:26:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:28:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 12:28:30 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): style tweak: break on error first In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12158 ) Change subject: gsm48_mi_to_string(): style tweak: break on error first ...................................................................... Patch Set 1: IMO that break inside the if is confusing, I prefer the old way. -- To view, visit https://gerrit.osmocom.org/12158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic76bc5e84ad1278fa3b2db5f5e28cadf1d90a343 Gerrit-Change-Number: 12158 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 12:28:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:31:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 12:31:47 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): do not read from zero length input buffer In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12157 ) Change subject: gsm48_mi_to_string(): do not read from zero length input buffer ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I12cada7c2c5187146ca5a33d1ebfefb4cad65632 Gerrit-Change-Number: 12157 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 12:31:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:51:29 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 12:51:29 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Patch Set 21: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 21 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 06 Dec 2018 12:51:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:53:11 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 12:53:11 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass2() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass2() ...................................................................... Patch Set 26: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 26 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Dec 2018 12:53:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:57:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 12:57:50 +0000 Subject: Change in libosmocore[master]: Allow log_init() with NULL log_info In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12092 ) Change subject: Allow log_init() with NULL log_info ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 Gerrit-Change-Number: 12092 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 06 Dec 2018 12:57:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:59:36 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 12:59:36 +0000 Subject: Change in osmo-sip-connector[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12159 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I1169c1c6d99628d2cbed67cac3ed675d778597b0 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/59/12159/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 213cc7a..4e70535 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-sip-connector.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-sip-connector.service endif -- To view, visit https://gerrit.osmocom.org/12159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1169c1c6d99628d2cbed67cac3ed675d778597b0 Gerrit-Change-Number: 12159 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:59:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 12:59:40 +0000 Subject: Change in osmo-ggsn[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12160 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: Ibd348eac3adca88663bd510172efbe4ec0bf3599 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/60/12160/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index e6ad299..fbb553f 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-ggsn.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-ggsn.service endif -- To view, visit https://gerrit.osmocom.org/12160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd348eac3adca88663bd510172efbe4ec0bf3599 Gerrit-Change-Number: 12160 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:59:44 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 12:59:44 +0000 Subject: Change in osmo-bts[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12161 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I5d3712b54a8b777c33a9804a4f612e4f37f829df --- M contrib/systemd/Makefile.am 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/12161/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 1646308..b07299d 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,6 +1,17 @@ +EXTRA_DIST = \ + lc15bts-mgr.service \ + oc2gbts-mgr.service \ + osmo-bts-lc15.service \ + osmo-bts-oc2g.service \ + osmo-bts-sysmo.service \ + osmo-bts-trx.service \ + osmo-bts-virtual.service \ + sysmobts-mgr.service + if HAVE_SYSTEMD SYSTEMD_SERVICES = osmo-bts-virtual.service + if ENABLE_SYSMOBTS SYSTEMD_SERVICES += osmo-bts-sysmo.service sysmobts-mgr.service endif @@ -13,6 +24,5 @@ SYSTEMD_SERVICES += osmo-bts-lc15.service lc15bts-mgr.service endif -EXTRA_DIST = $(SYSTEMD_SERVICES) systemdsystemunit_DATA = $(SYSTEMD_SERVICES) endif # HAVE_SYSTEMD -- To view, visit https://gerrit.osmocom.org/12161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5d3712b54a8b777c33a9804a4f612e4f37f829df Gerrit-Change-Number: 12161 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:59:46 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 12:59:46 +0000 Subject: Change in openbsc[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12162 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I8dbb17571df5d6cea040498af2fe57f087bdeb24 --- M openbsc/contrib/systemd/Makefile.am 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/62/12162/1 diff --git a/openbsc/contrib/systemd/Makefile.am b/openbsc/contrib/systemd/Makefile.am index 69f973e..f4c3483 100644 --- a/openbsc/contrib/systemd/Makefile.am +++ b/openbsc/contrib/systemd/Makefile.am @@ -1,3 +1,9 @@ +EXTRA_DIST = \ + osmo-bsc-mgcp.service \ + osmo-bsc-nat.service \ + osmo-bsc-sccplite.service \ + osmo-nitb.service + if HAVE_SYSTEMD SYSTEMD_SERVICES = osmo-nitb.service osmo-bsc-mgcp.service @@ -9,6 +15,5 @@ SYSTEMD_SERVICES += osmo-bsc-sccplite.service endif -EXTRA_DIST = $(SYSTEMD_SERVICES) systemdsystemunit_DATA = $(SYSTEMD_SERVICES) endif # HAVE_SYSTEMD -- To view, visit https://gerrit.osmocom.org/12162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8dbb17571df5d6cea040498af2fe57f087bdeb24 Gerrit-Change-Number: 12162 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:59:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 12:59:49 +0000 Subject: Change in libosmo-sccp[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12163 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: Ib848aa5ce03f45d4f8182a4e77b0130ccb261635 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/63/12163/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index e7d846f..38c1ea3 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-stp.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-stp.service endif -- To view, visit https://gerrit.osmocom.org/12163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib848aa5ce03f45d4f8182a4e77b0130ccb261635 Gerrit-Change-Number: 12163 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:59:51 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 12:59:51 +0000 Subject: Change in osmo-iuh[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12164 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I8e1615793bc89fdc3b0549c150cc10d848e56645 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/64/12164/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 507be2d..212601c 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-hnbgw.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-hnbgw.service endif -- To view, visit https://gerrit.osmocom.org/12164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8e1615793bc89fdc3b0549c150cc10d848e56645 Gerrit-Change-Number: 12164 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:59:54 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 12:59:54 +0000 Subject: Change in osmo-bsc[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12165 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: Ide5de9383a2a3b957d182dca1187f73dbf1ce982 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/12165/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 5119adf..7c3e29f 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-bsc.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-bsc.service endif -- To view, visit https://gerrit.osmocom.org/12165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ide5de9383a2a3b957d182dca1187f73dbf1ce982 Gerrit-Change-Number: 12165 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 12:59:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 12:59:57 +0000 Subject: Change in osmo-mgw[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12166 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I5014d98e06e033d04be45585b34458c90b1ced00 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/66/12166/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index c0d95ff..340cd90 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-mgw.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-mgw.service endif -- To view, visit https://gerrit.osmocom.org/12166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5014d98e06e033d04be45585b34458c90b1ced00 Gerrit-Change-Number: 12166 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:00:00 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 13:00:00 +0000 Subject: Change in osmo-sgsn[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12167 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I4b1973a4796ccddce930a130be00c15b09572c16 --- M contrib/systemd/Makefile.am 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/67/12167/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index b644f34..11e8f98 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,9 +1,13 @@ +EXTRA_DIST = \ + osmo-gbproxy.service \ + osmo-gtphub.service \ + osmo-sgsn.service + if HAVE_SYSTEMD SYSTEMD_SERVICES = \ osmo-gbproxy.service \ osmo-gtphub.service \ osmo-sgsn.service -EXTRA_DIST = $(SYSTEMD_SERVICES) systemdsystemunit_DATA = $(SYSTEMD_SERVICES) endif -- To view, visit https://gerrit.osmocom.org/12167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4b1973a4796ccddce930a130be00c15b09572c16 Gerrit-Change-Number: 12167 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:00:02 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 13:00:02 +0000 Subject: Change in osmo-hlr[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12168 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: Ic164403189510f3b20ff7906df09c78550735591 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/68/12168/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 520e720..eb33b4a 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-hlr.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-hlr.service endif -- To view, visit https://gerrit.osmocom.org/12168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic164403189510f3b20ff7906df09c78550735591 Gerrit-Change-Number: 12168 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:00:05 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 13:00:05 +0000 Subject: Change in osmo-pcu[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12169 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I356aa59ab152ace89b247823a2c0517814a69ecb --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/69/12169/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index f565234..7b41145 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-pcu.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-pcu.service endif -- To view, visit https://gerrit.osmocom.org/12169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I356aa59ab152ace89b247823a2c0517814a69ecb Gerrit-Change-Number: 12169 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:00:08 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 13:00:08 +0000 Subject: Change in osmo-trx[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12170 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I2e417f4c453987df1ac04f0ff41bf000da4b5c49 --- M contrib/systemd/Makefile.am 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/70/12170/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 21fbb53..800b1e1 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,3 +1,8 @@ +EXTRA_DIST = \ + osmo-trx-lms.service \ + osmo-trx-uhd.service \ + osmo-trx-usrp1.service + if HAVE_SYSTEMD SYSTEMD_SERVICES = @@ -13,6 +18,5 @@ SYSTEMD_SERVICES += osmo-trx-lms.service endif -EXTRA_DIST = $(SYSTEMD_SERVICES) systemdsystemunit_DATA = $(SYSTEMD_SERVICES) endif # HAVE_SYSTEMD -- To view, visit https://gerrit.osmocom.org/12170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2e417f4c453987df1ac04f0ff41bf000da4b5c49 Gerrit-Change-Number: 12170 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:00:13 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 13:00:13 +0000 Subject: Change in osmo-pcap[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12171 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I2fed90915f57bbb054a26bacecf8417d6f3ba5ce --- M contrib/systemd/Makefile.am 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/71/12171/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 5b41c52..2966a63 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,8 +1,11 @@ +EXTRA_DIST = \ + osmo-pcap-client.service \ + osmo-pcap-server.service + if HAVE_SYSTEMD SYSTEMD_SERVICES = \ osmo-pcap-client.service \ osmo-pcap-server.service -EXTRA_DIST = $(SYSTEMD_SERVICES) systemdsystemunit_DATA = $(SYSTEMD_SERVICES) endif -- To view, visit https://gerrit.osmocom.org/12171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2fed90915f57bbb054a26bacecf8417d6f3ba5ce Gerrit-Change-Number: 12171 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:00:16 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 13:00:16 +0000 Subject: Change in osmo-msc[master]: contrib: fix makedistcheck with disabled systemd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12172 Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I4a5fc5778bc527aeb0602a7e57d9d2acb6988caa --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/72/12172/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 8648172..bd61571 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-msc.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-msc.service endif -- To view, visit https://gerrit.osmocom.org/12172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4a5fc5778bc527aeb0602a7e57d9d2acb6988caa Gerrit-Change-Number: 12172 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:00:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 13:00:27 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Patch Set 11: Code-Review+1 (1 comment) I like this idea. https://gerrit.osmocom.org/#/c/12017/11/include/osmocom/core/msgb.h File include/osmocom/core/msgb.h: https://gerrit.osmocom.org/#/c/12017/11/include/osmocom/core/msgb.h at 570 PS11, Line 570: * \returns boolean indicating whether msgb content is equal to a given data grammar: "to a given data " -> "to the given data" (data is not countable) Same in many other docstrings below. -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 11 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Dec 2018 13:00:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:02:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:02:23 +0000 Subject: Change in osmo-bts[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12161 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d3712b54a8b777c33a9804a4f612e4f37f829df Gerrit-Change-Number: 12161 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 13:02:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:02:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:02:45 +0000 Subject: Change in openbsc[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12162 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8dbb17571df5d6cea040498af2fe57f087bdeb24 Gerrit-Change-Number: 12162 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 13:02:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:03:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:03:01 +0000 Subject: Change in libosmo-sccp[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12163 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib848aa5ce03f45d4f8182a4e77b0130ccb261635 Gerrit-Change-Number: 12163 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 13:03:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:03:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:03:45 +0000 Subject: Change in osmo-iuh[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12164 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e1615793bc89fdc3b0549c150cc10d848e56645 Gerrit-Change-Number: 12164 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 13:03:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:03:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:03:56 +0000 Subject: Change in osmo-bsc[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12165 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ide5de9383a2a3b957d182dca1187f73dbf1ce982 Gerrit-Change-Number: 12165 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 13:03:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:04:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:04:23 +0000 Subject: Change in osmo-mgw[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12166 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5014d98e06e033d04be45585b34458c90b1ced00 Gerrit-Change-Number: 12166 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 13:04:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:04:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:04:45 +0000 Subject: Change in osmo-sgsn[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12167 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b1973a4796ccddce930a130be00c15b09572c16 Gerrit-Change-Number: 12167 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 13:04:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:05:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:05:10 +0000 Subject: Change in osmo-hlr[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12168 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic164403189510f3b20ff7906df09c78550735591 Gerrit-Change-Number: 12168 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 13:05:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:05:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:05:47 +0000 Subject: Change in osmo-pcu[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12169 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I356aa59ab152ace89b247823a2c0517814a69ecb Gerrit-Change-Number: 12169 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 13:05:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:06:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:06:27 +0000 Subject: Change in osmo-trx[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12170 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2e417f4c453987df1ac04f0ff41bf000da4b5c49 Gerrit-Change-Number: 12170 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 13:06:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:06:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:06:52 +0000 Subject: Change in osmo-pcap[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12171 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2fed90915f57bbb054a26bacecf8417d6f3ba5ce Gerrit-Change-Number: 12171 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 13:06:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:07:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:07:28 +0000 Subject: Change in osmo-ggsn[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12160 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd348eac3adca88663bd510172efbe4ec0bf3599 Gerrit-Change-Number: 12160 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 13:07:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:07:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:07:53 +0000 Subject: Change in osmo-sip-connector[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12159 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1169c1c6d99628d2cbed67cac3ed675d778597b0 Gerrit-Change-Number: 12159 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 13:07:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 13:08:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 13:08:42 +0000 Subject: Change in osmo-msc[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12172 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a5fc5778bc527aeb0602a7e57d9d2acb6988caa Gerrit-Change-Number: 12172 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 13:08:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 6 13:48:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 13:48:49 +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_#212?= In-Reply-To: <126393615.1112.1544079222446.JavaMail.jenkins@jenkins.osmocom.org> References: <126393615.1112.1544079222446.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1515130687.1124.1544104129423.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Dec 6 14:52:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 14:52:41 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12017 to look at the new patch set (#12). Change subject: msgb: add test helpers ...................................................................... msgb: add test helpers It's often handy to compare certain msgb layer to a given array and print the position where they differ. Add simple pretty-printer and corresponding L* wrappers. Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 --- M include/osmocom/core/msgb.h M src/msgb.c 2 files changed, 231 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/12017/12 -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 12 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 14:55:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 14:55:40 +0000 Subject: Change in osmo-gsm-tester[master]: test: cs_paging_gprs_active: Make sure gprs data (TBF) is ongoing In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12143 ) Change subject: test: cs_paging_gprs_active: Make sure gprs data (TBF) is ongoing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id29391d75101d94e2cd58f444b383f4c5217ab6a Gerrit-Change-Number: 12143 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 14:55:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 14:55:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 14:55:41 +0000 Subject: Change in osmo-gsm-tester[master]: test: cs_paging_gprs_active: Make sure gprs data (TBF) is ongoing In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12143 ) Change subject: test: cs_paging_gprs_active: Make sure gprs data (TBF) is ongoing ...................................................................... test: cs_paging_gprs_active: Make sure gprs data (TBF) is ongoing PACCH is used for paging only if the MS is actively using a PDCH, and the only way to be sure that's happening is to place some data through the GPRS path so MS has TBF in use when the call is placed. Change-Id: Id29391d75101d94e2cd58f444b383f4c5217ab6a --- M suites/gprs/cs_paging_gprs_active.py M suites/gprs/lib/testlib.py 2 files changed, 30 insertions(+), 73 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/suites/gprs/cs_paging_gprs_active.py b/suites/gprs/cs_paging_gprs_active.py index fc0e160..b7dead2 100755 --- a/suites/gprs/cs_paging_gprs_active.py +++ b/suites/gprs/cs_paging_gprs_active.py @@ -5,79 +5,34 @@ from osmo_gsm_tester.testenv import * -hlr = suite.hlr() -bts = suite.bts() -pcu = bts.pcu() -mgw_msc = suite.mgw() -mgw_bsc = suite.mgw() -stp = suite.stp() -ggsn = suite.ggsn() -sgsn = suite.sgsn(hlr, ggsn) -msc = suite.msc(hlr, mgw_msc, stp) -bsc = suite.bsc(msc, mgw_bsc, stp) -ms_mo = suite.modem() -ms_mt = suite.modem() +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import setup_run_iperf3_test_parallel -bsc.bts_add(bts) -sgsn.bts_add(bts) +def ready_cb_place_voicecall(ms_li): + print('waiting a few secs to make sure iperf3 test is running') + sleep(2) + # At this point in time, TBF should be enabled on both MS since they are sending/receiving data. + print('iperf3 running, let\'s place a call') + ms_mo = ms_li[0] + ms_mt = ms_li[1] + assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 + mo_cid = ms_mo.call_dial(ms_mt) + mt_cid = ms_mt.call_wait_incoming(ms_mo) + print('dial success') -print('start network...') -hlr.start() -stp.start() -ggsn.start() -sgsn.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() -bsc.start() + assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) + ms_mt.call_answer(mt_cid) + wait(ms_mo.call_is_active, mo_cid) + wait(ms_mt.call_is_active, mt_cid) + print('answer success, call established and ongoing') -bts.start() -wait(bsc.bts_is_connected, bts) -print('Waiting for bts to be ready...') -wait(bts.ready_for_pcu) -pcu.start() + sleep(5) # maintain the call active for 5 seconds -hlr.subscriber_add(ms_mo) -hlr.subscriber_add(ms_mt) + assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) + ms_mt.call_hangup(mt_cid) + wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) + print('hangup success') -ms_mo.connect(msc.mcc_mnc()) -ms_mt.connect(msc.mcc_mnc()) -ms_mo.attach() -ms_mt.attach() -ms_mo.log_info() -ms_mt.log_info() - -print('waiting for modems to attach...') -wait(ms_mo.is_connected, msc.mcc_mnc()) -wait(ms_mt.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms_mo, ms_mt) - -print('waiting for modems to attach to data services...') -wait(ms_mo.is_attached) -wait(ms_mt.is_attached) - -# We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) -ctx_id_v4_mo = ms_mo.activate_context(apn='inet46', protocol=ms_mo.CTX_PROT_IPv4) -ctx_id_v4_mt = ms_mt.activate_context(apn='inet46', protocol=ms_mt.CTX_PROT_IPv4) - -assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 -mo_cid = ms_mo.call_dial(ms_mt) -mt_cid = ms_mt.call_wait_incoming(ms_mo) -print('dial success') - -assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) -ms_mt.call_answer(mt_cid) -wait(ms_mo.call_is_active, mo_cid) -wait(ms_mt.call_is_active, mt_cid) -print('answer success, call established and ongoing') - -sleep(5) # maintain the call active for 5 seconds - -assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) -ms_mt.call_hangup(mt_cid) -wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) -print('hangup success') - -ms_mo.deactivate_context(ctx_id_v4_mo) -ms_mt.deactivate_context(ctx_id_v4_mt) +setup_run_iperf3_test_parallel(2, ready_cb=ready_cb_place_voicecall) diff --git a/suites/gprs/lib/testlib.py b/suites/gprs/lib/testlib.py index 13a6671..ac3a847 100644 --- a/suites/gprs/lib/testlib.py +++ b/suites/gprs/lib/testlib.py @@ -11,7 +11,7 @@ print("\tSEND: %d KB, %d kbps, %d seconds" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'])) print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) -def run_iperf3_cli_parallel(iperf3clients, ms_li): +def run_iperf3_cli_parallel(iperf3clients, ms_li, ready_cb): assert len(iperf3clients) == len(ms_li) procs = [] for i in range(len(iperf3clients)): @@ -20,6 +20,8 @@ try: for proc in procs: proc.launch() + if ready_cb: + ready_cb(ms_li) for proc in procs: proc.wait() except Exception as e: @@ -28,7 +30,7 @@ raise e -def setup_run_iperf3_test_parallel(num_ms): +def setup_run_iperf3_test_parallel(num_ms, ready_cb=None): hlr = suite.hlr() bts = suite.bts() pcu = bts.pcu() @@ -98,7 +100,7 @@ ms.setup_context_data_plane(ctx_id_v4) setattr(ms, 'tmp_ctx_id', ctx_id_v4) - run_iperf3_cli_parallel(clients, ms_li) + run_iperf3_cli_parallel(clients, ms_li, ready_cb) for i in range(num_ms): servers[i].stop() -- To view, visit https://gerrit.osmocom.org/12143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id29391d75101d94e2cd58f444b383f4c5217ab6a Gerrit-Change-Number: 12143 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 14:56:04 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 14:56:04 +0000 Subject: Change in libosmocore[master]: Allow log_init() with NULL log_info In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12092 ) Change subject: Allow log_init() with NULL log_info ...................................................................... Allow log_init() with NULL log_info Since we have library-internal categories we don't have to force application to supply its own categories. This is especially useful for testing code inside libosmocore which only use internal categories anyway. Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 --- M src/logging.c 1 file changed, 15 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/logging.c b/src/logging.c index e7cc472..2bb53ae 100644 --- a/src/logging.c +++ b/src/logging.c @@ -948,9 +948,11 @@ } /*! Initialize the Osmocom logging core - * \param[in] inf Information regarding logging categories + * \param[in] inf Information regarding logging categories, could be NULL * \param[in] ctx \ref talloc context for logging allocations * \returns 0 in case of success, negative in case of error + * + * If inf is NULL then only library-internal categories are initialized. */ int log_init(const struct log_info *inf, void *ctx) { @@ -964,10 +966,13 @@ if (!osmo_log_info) return -ENOMEM; - osmo_log_info->filter_fn = inf->filter_fn; - osmo_log_info->num_cat_user = inf->num_cat; - /* total number = number of user cat + library cat */ - osmo_log_info->num_cat = inf->num_cat + ARRAY_SIZE(internal_cat); + osmo_log_info->num_cat = ARRAY_SIZE(internal_cat); + + if (inf) { + osmo_log_info->filter_fn = inf->filter_fn; + osmo_log_info->num_cat_user = inf->num_cat; + osmo_log_info->num_cat += inf->num_cat; + } osmo_log_info->cat = talloc_zero_array(osmo_log_info, struct log_info_cat, @@ -978,11 +983,11 @@ return -ENOMEM; } - /* copy over the user part */ - for (i = 0; i < inf->num_cat; i++) { - memcpy((struct log_info_cat *) &osmo_log_info->cat[i], - &inf->cat[i], - sizeof(struct log_info_cat)); + if (inf) { /* copy over the user part */ + for (i = 0; i < inf->num_cat; i++) { + memcpy((struct log_info_cat *) &osmo_log_info->cat[i], + &inf->cat[i], sizeof(struct log_info_cat)); + } } /* copy over the library part */ -- To view, visit https://gerrit.osmocom.org/12092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8 Gerrit-Change-Number: 12092 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 14:56:55 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 14:56:55 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 12 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Dec 2018 14:56:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:09:16 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 15:09:16 +0000 Subject: Change in osmo-hlr[master]: store timestamp of last location update seen from subscriber In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12121 to look at the new patch set (#4). Change subject: store timestamp of last location update seen from subscriber ...................................................................... store timestamp of last location update seen from subscriber Store a timestamp of the last location update seen from a subscriber in the HLR DB. Timestamps are stored in a new 'last_lu_seen' column in the 'subscriber' table, in granularity of seconds. At present, osmo-hlr only records these timestamps but otherwise makes no use of them. Because the timestamps are stored in a human-readable formt, they may already provide value to external processes which need this information. For example: sqlite> select imsi,last_lu_seen from subscriber; 901990000000001|2018-12-04 14:17:12 I didn't bother adding additional tests because the code added with this commit is already being exercised by several calls to db_subscr_lu() in db_test.c. This change requires a HLR DB schema update. Existing databases won't be upgraded automatically. However, osmo-hlr will refuse to operate with databases which are not upgraded. Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Related: OS#2838 --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c 4 files changed, 104 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/21/12121/4 -- To view, visit https://gerrit.osmocom.org/12121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Gerrit-Change-Number: 12121 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 6 15:11:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 6 Dec 2018 15:11:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#330?= In-Reply-To: <675624796.1121.1544092285732.JavaMail.jenkins@jenkins.osmocom.org> References: <675624796.1121.1544092285732.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <763540430.1127.1544109075553.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:11:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 15:11:50 +0000 Subject: Change in libosmocore[master]: add osmo_bsc2str() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12153 ) Change subject: add osmo_bsc2str() ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/#/c/12153/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12153/2//COMMIT_MSG at 7 PS2, Line 7: add osmo_bsc2str() > typo: bcd2str lol https://gerrit.osmocom.org/#/c/12153/2/include/osmocom/core/utils.h File include/osmocom/core/utils.h: https://gerrit.osmocom.org/#/c/12153/2/include/osmocom/core/utils.h at 52 PS2, Line 52: int osmo_bcd2str(char *dst, size_t dst_size, const uint8_t bcd[], int start_nibble, int end_nibble); > Why using bcd[] instead of *bcd? not sure really. (You know how you sometimes in a city you walk your favorite route to get somewhere, but when you walk back you take a different route, and can't really explain why?) I guess since it is a fixed const array of bytes made me pick []. But sure, our style is usually different. https://gerrit.osmocom.org/#/c/12153/2/src/utils.c File src/utils.c: https://gerrit.osmocom.org/#/c/12153/2/src/utils.c at 143 PS2, Line 143: int osmo_bcd2str(char *dst, size_t dst_size, const uint8_t bcd[], int start_nibble, int end_nibble) > if it' strlen, then return is a size_t or unsigned int. hmm, but snprintf() returns int, too. -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 15:11:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:12:42 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 15:12:42 +0000 Subject: Change in libosmocore[master]: Add osmo_sockaddr_in_to_str_and_uint() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11842 ) Change subject: Add osmo_sockaddr_in_to_str_and_uint() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie384483124d407a960ab6732e6a7fd90554389d2 Gerrit-Change-Number: 11842 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 06 Dec 2018 15:12:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:28:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 15:28:04 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 12 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Dec 2018 15:28:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:30:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 15:30:50 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 13: > > If decoding failed (gsm0808_dec_gcr returned <0), it makes no > sense using p and printing related p stuff. > > If it fails it doesn't mean that part of GCR has not been decoded > so I think it still would be nice to see the results of all the > checks at once. That doesn't make sense to me. If it fails, you cannot just expect some part to be decoded, it's either all or nothing. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 13 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 15:30:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:32:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 6 Dec 2018 15:32:40 +0000 Subject: Change in docker-playground[master]: osmo-sgsn-master: install libosmo-gsup-client-dev Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12173 Change subject: osmo-sgsn-master: install libosmo-gsup-client-dev ...................................................................... osmo-sgsn-master: install libosmo-gsup-client-dev This library is required for building osmo-sgsn, and because it is currently missing, Jenkins fails. No idea why it used to work without the dependency though. Example failure: https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-sgsn-test/328/console Change-Id: I1cd5eb51fea9e39d82b12f10ef36c0bf8bbce472 --- M osmo-sgsn-master/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/73/12173/1 diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index 841e324..d87f295 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -17,6 +17,7 @@ telnet \ libosmocore-dev \ libosmo-abis-dev \ + libosmo-gsup-client-dev \ libosmo-netif-dev \ libosmo-sccp-dev \ libsmpp34-dev \ -- To view, visit https://gerrit.osmocom.org/12173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1cd5eb51fea9e39d82b12f10ef36c0bf8bbce472 Gerrit-Change-Number: 12173 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:33:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 15:33:26 +0000 Subject: Change in libosmocore[master]: add osmo_bsc2str() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12153 ) Change subject: add osmo_bsc2str() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12153/2/src/utils.c File src/utils.c: https://gerrit.osmocom.org/#/c/12153/2/src/utils.c at 143 PS2, Line 143: int osmo_bcd2str(char *dst, size_t dst_size, const uint8_t bcd[], int start_nibble, int end_nibble) > hmm, but snprintf() returns int, too. Sure, because it can fail parsing, not like this function apparently ;) Furthermore, you don't specify a negative error being returned in the API, so what does a negative value being returned mean? -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 15:33:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:34:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 15:34:21 +0000 Subject: Change in docker-playground[master]: osmo-sgsn-master: install libosmo-gsup-client-dev In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12173 ) Change subject: osmo-sgsn-master: install libosmo-gsup-client-dev ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1cd5eb51fea9e39d82b12f10ef36c0bf8bbce472 Gerrit-Change-Number: 12173 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 15:34:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:34:35 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 15:34:35 +0000 Subject: Change in osmo-hlr[master]: store timestamp of last location update seen from subscriber In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12121 to look at the new patch set (#5). Change subject: store timestamp of last location update seen from subscriber ...................................................................... store timestamp of last location update seen from subscriber Store a timestamp of the last location update seen from a subscriber in the HLR DB. Timestamps are stored in a new 'last_lu_seen' column in the 'subscriber' table, in granularity of seconds. At present, osmo-hlr only records these timestamps but otherwise makes no use of them. Because the timestamps are stored in a human-readable formt, they may already provide value to external processes which need this information. For example: sqlite> select imsi,last_lu_seen from subscriber; 901990000000001|2018-12-04 14:17:12 I didn't bother adding additional tests because the code added with this commit is already being exercised by several calls to db_subscr_lu() in db_test.c. This change requires a HLR DB schema update. Existing databases won't be upgraded automatically. However, osmo-hlr will refuse to operate with databases which are not upgraded. Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Related: OS#2838 --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c 4 files changed, 104 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/21/12121/5 -- To view, visit https://gerrit.osmocom.org/12121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Gerrit-Change-Number: 12121 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:54:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 15:54:29 +0000 Subject: Change in osmo-hlr[master]: store timestamp of last location update seen from subscriber In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12121 ) Change subject: store timestamp of last location update seen from subscriber ...................................................................... Patch Set 5: Code-Review-1 (7 comments) https://gerrit.osmocom.org/#/c/12121/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12121/5//COMMIT_MSG at 9 PS5, Line 9: Store a timestamp of the last location update seen from a subscriber Can we have full first sentence in first line, and then dropped repeated line in first description pragraph? Looks like I can foresee the next word before reading it otherwise ;) https://gerrit.osmocom.org/#/c/12121/5//COMMIT_MSG at 11 PS5, Line 11: in the 'subscriber' table, in granularity of seconds. Describe what do the value mean. seconds in UTC time? https://gerrit.osmocom.org/#/c/12121/5//COMMIT_MSG at 15 PS5, Line 15: human-readable formt, they may already provide value to external typo: formt https://gerrit.osmocom.org/#/c/12121/5//COMMIT_MSG at 19 PS5, Line 19: 901990000000001|2018-12-04 14:17:12 I wonder why we don't store it as num of seconds since 1970. Or it's sqlite transforming it through cli app? https://gerrit.osmocom.org/#/c/12121/5/sql/hlr.sql File sql/hlr.sql: https://gerrit.osmocom.org/#/c/12121/5/sql/hlr.sql at 42 PS5, Line 42: last_lu_seen TIMESTAMP default NULL I'm not able to find TIMESTAMP in sqlite documentation so far. https://www.sqlite.org/datatype3.html https://gerrit.osmocom.org/#/c/12121/5/sql/hlr.sql at 75 PS5, Line 75: PRAGMA user_version = 1; this 1 together with CURRENT_SCHEMA_VERSION in code looks like a candaidate to have in configure.ac and then have a hlr.sql.in which becomes processed. But not really needed :) https://gerrit.osmocom.org/#/c/12121/5/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12121/5/src/db_hlr.c at 637 PS5, Line 637: "Cannot update LU timestamp for subscriber ID=%"PRId64": SQL error: (%d) %s\n", Be careful in general with interleavin strings and PRId64 type of strings, I recall seeing compilers failing because they don't like 2 strings to be concatenated if there's no space in between. So to avoid possible issues,always try to leave a speace in between: ...ID=%" PRId64 ": SQL... -- To view, visit https://gerrit.osmocom.org/12121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Gerrit-Change-Number: 12121 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 15:54:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:56:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 15:56:38 +0000 Subject: Change in docker-playground[master]: osmo-sgsn-master: install libosmo-gsup-client-dev In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12173 ) Change subject: osmo-sgsn-master: install libosmo-gsup-client-dev ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1cd5eb51fea9e39d82b12f10ef36c0bf8bbce472 Gerrit-Change-Number: 12173 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 15:56:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:56:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 15:56:40 +0000 Subject: Change in docker-playground[master]: osmo-sgsn-master: install libosmo-gsup-client-dev In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12173 ) Change subject: osmo-sgsn-master: install libosmo-gsup-client-dev ...................................................................... osmo-sgsn-master: install libosmo-gsup-client-dev This library is required for building osmo-sgsn, and because it is currently missing, Jenkins fails. No idea why it used to work without the dependency though. Example failure: https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-sgsn-test/328/console Change-Id: I1cd5eb51fea9e39d82b12f10ef36c0bf8bbce472 --- M osmo-sgsn-master/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index 841e324..d87f295 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -17,6 +17,7 @@ telnet \ libosmocore-dev \ libosmo-abis-dev \ + libosmo-gsup-client-dev \ libosmo-netif-dev \ libosmo-sccp-dev \ libsmpp34-dev \ -- To view, visit https://gerrit.osmocom.org/12173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1cd5eb51fea9e39d82b12f10ef36c0bf8bbce472 Gerrit-Change-Number: 12173 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 15:57:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 15:57:53 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/#/c/10185/4/include/osmocom/gsm/gsm48_arfcn_range_encode.h File include/osmocom/gsm/gsm48_arfcn_range_encode.h: https://gerrit.osmocom.org/#/c/10185/4/include/osmocom/gsm/gsm48_arfcn_range_encode.h at 8 PS4, Line 8: OSMO_GSM48_ARFCN_RANGE_INVALID = -1, (gerrit shows an indenting mismatch... personally I'd just drop the tabs but ok if they line up) https://gerrit.osmocom.org/#/c/10185/4/src/gsm/gsm48_arfcn_range_encode.c File src/gsm/gsm48_arfcn_range_encode.c: https://gerrit.osmocom.org/#/c/10185/4/src/gsm/gsm48_arfcn_range_encode.c at 6 PS4, Line 6: * (C) 2012 by On-Waves add (C) 2018 sysmocom - s.f.m.c. GmbH? -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Thu, 06 Dec 2018 15:57:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:11:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 16:11:47 +0000 Subject: Change in libosmocore[master]: Add osmo_sockaddr_in_to_str_and_uint() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11842 ) Change subject: Add osmo_sockaddr_in_to_str_and_uint() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie384483124d407a960ab6732e6a7fd90554389d2 Gerrit-Change-Number: 11842 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 06 Dec 2018 16:11:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:19:57 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 6 Dec 2018 16:19:57 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08: Free GSM subscr conn if paging response can't be matched Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/12174 Change subject: gsm_04_08: Free GSM subscr conn if paging response can't be matched ...................................................................... gsm_04_08: Free GSM subscr conn if paging response can't be matched The current idea of calling gscon_release_lchans is not enough because the conn is still present. Insetad pretend we got a disconnect indication from the MSC which will call gscon_release_lchans as well as terminate the conn state machine which will clean up conn state as well. Ticket: OS#3680 Change-Id: Iccf5f6864ffe238189907c4bb3ea333948621b4c --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/74/12174/1 diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 4be5198..f1061ef 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -951,7 +951,7 @@ /* fwd via bsc_api to send COMPLETE L3 INFO to MSC */ rc = bsc_compl_l3(lchan->conn, msg, 0); if (rc < 0) { - gscon_release_lchans(lchan->conn, true); + osmo_fsm_inst_dispatch(lchan->conn->fi, GSCON_EV_A_DISC_IND, NULL); return rc; } /* conn shall release lchan on teardown, also if this Layer 3 Complete is rejected. */ -- To view, visit https://gerrit.osmocom.org/12174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iccf5f6864ffe238189907c4bb3ea333948621b4c Gerrit-Change-Number: 12174 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:23:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 16:23:55 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08: Free GSM subscr conn if paging response can't be matched In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12174 ) Change subject: gsm_04_08: Free GSM subscr conn if paging response can't be matched ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iccf5f6864ffe238189907c4bb3ea333948621b4c Gerrit-Change-Number: 12174 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 16:23:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:27:09 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 16:27:09 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 16: > it's either all or nothing. That's not the case: we might fail in the middle of decoding after some values have already been written out. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 16 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 16:27:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:30:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 16:30:04 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08: Free GSM subscr conn if paging response can't be matched In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12174 ) Change subject: gsm_04_08: Free GSM subscr conn if paging response can't be matched ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12174/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12174/1//COMMIT_MSG at 15 PS1, Line 15: Ticket Related or Closes, but not 'Ticket', please, Did this change show in manual testing that it resolves the problem? -- To view, visit https://gerrit.osmocom.org/12174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iccf5f6864ffe238189907c4bb3ea333948621b4c Gerrit-Change-Number: 12174 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 06 Dec 2018 16:30:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:30:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 16:30:59 +0000 Subject: Change in osmo-bts[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12161 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I5d3712b54a8b777c33a9804a4f612e4f37f829df --- M contrib/systemd/Makefile.am 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 1646308..b07299d 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,6 +1,17 @@ +EXTRA_DIST = \ + lc15bts-mgr.service \ + oc2gbts-mgr.service \ + osmo-bts-lc15.service \ + osmo-bts-oc2g.service \ + osmo-bts-sysmo.service \ + osmo-bts-trx.service \ + osmo-bts-virtual.service \ + sysmobts-mgr.service + if HAVE_SYSTEMD SYSTEMD_SERVICES = osmo-bts-virtual.service + if ENABLE_SYSMOBTS SYSTEMD_SERVICES += osmo-bts-sysmo.service sysmobts-mgr.service endif @@ -13,6 +24,5 @@ SYSTEMD_SERVICES += osmo-bts-lc15.service lc15bts-mgr.service endif -EXTRA_DIST = $(SYSTEMD_SERVICES) systemdsystemunit_DATA = $(SYSTEMD_SERVICES) endif # HAVE_SYSTEMD -- To view, visit https://gerrit.osmocom.org/12161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5d3712b54a8b777c33a9804a4f612e4f37f829df Gerrit-Change-Number: 12161 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:31:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 16:31:01 +0000 Subject: Change in osmo-msc[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12172 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I4a5fc5778bc527aeb0602a7e57d9d2acb6988caa --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 8648172..bd61571 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-msc.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-msc.service endif -- To view, visit https://gerrit.osmocom.org/12172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4a5fc5778bc527aeb0602a7e57d9d2acb6988caa Gerrit-Change-Number: 12172 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:31:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 16:31:10 +0000 Subject: Change in osmo-pcu[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12169 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I356aa59ab152ace89b247823a2c0517814a69ecb --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index f565234..7b41145 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-pcu.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-pcu.service endif -- To view, visit https://gerrit.osmocom.org/12169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I356aa59ab152ace89b247823a2c0517814a69ecb Gerrit-Change-Number: 12169 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:31:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 16:31:13 +0000 Subject: Change in osmo-iuh[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12164 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I8e1615793bc89fdc3b0549c150cc10d848e56645 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 507be2d..212601c 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-hnbgw.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-hnbgw.service endif -- To view, visit https://gerrit.osmocom.org/12164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8e1615793bc89fdc3b0549c150cc10d848e56645 Gerrit-Change-Number: 12164 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:31:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 16:31:15 +0000 Subject: Change in osmo-sgsn[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12167 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I4b1973a4796ccddce930a130be00c15b09572c16 --- M contrib/systemd/Makefile.am 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index b644f34..11e8f98 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,9 +1,13 @@ +EXTRA_DIST = \ + osmo-gbproxy.service \ + osmo-gtphub.service \ + osmo-sgsn.service + if HAVE_SYSTEMD SYSTEMD_SERVICES = \ osmo-gbproxy.service \ osmo-gtphub.service \ osmo-sgsn.service -EXTRA_DIST = $(SYSTEMD_SERVICES) systemdsystemunit_DATA = $(SYSTEMD_SERVICES) endif -- To view, visit https://gerrit.osmocom.org/12167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4b1973a4796ccddce930a130be00c15b09572c16 Gerrit-Change-Number: 12167 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:31:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 16:31:17 +0000 Subject: Change in openbsc[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12162 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I8dbb17571df5d6cea040498af2fe57f087bdeb24 --- M openbsc/contrib/systemd/Makefile.am 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/contrib/systemd/Makefile.am b/openbsc/contrib/systemd/Makefile.am index 69f973e..f4c3483 100644 --- a/openbsc/contrib/systemd/Makefile.am +++ b/openbsc/contrib/systemd/Makefile.am @@ -1,3 +1,9 @@ +EXTRA_DIST = \ + osmo-bsc-mgcp.service \ + osmo-bsc-nat.service \ + osmo-bsc-sccplite.service \ + osmo-nitb.service + if HAVE_SYSTEMD SYSTEMD_SERVICES = osmo-nitb.service osmo-bsc-mgcp.service @@ -9,6 +15,5 @@ SYSTEMD_SERVICES += osmo-bsc-sccplite.service endif -EXTRA_DIST = $(SYSTEMD_SERVICES) systemdsystemunit_DATA = $(SYSTEMD_SERVICES) endif # HAVE_SYSTEMD -- To view, visit https://gerrit.osmocom.org/12162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8dbb17571df5d6cea040498af2fe57f087bdeb24 Gerrit-Change-Number: 12162 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:31:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 16:31:24 +0000 Subject: Change in osmo-bsc[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12165 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: Ide5de9383a2a3b957d182dca1187f73dbf1ce982 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 5119adf..7c3e29f 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-bsc.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-bsc.service endif -- To view, visit https://gerrit.osmocom.org/12165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ide5de9383a2a3b957d182dca1187f73dbf1ce982 Gerrit-Change-Number: 12165 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:31:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 16:31:30 +0000 Subject: Change in osmo-trx[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12170 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I2e417f4c453987df1ac04f0ff41bf000da4b5c49 --- M contrib/systemd/Makefile.am 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 21fbb53..800b1e1 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,3 +1,8 @@ +EXTRA_DIST = \ + osmo-trx-lms.service \ + osmo-trx-uhd.service \ + osmo-trx-usrp1.service + if HAVE_SYSTEMD SYSTEMD_SERVICES = @@ -13,6 +18,5 @@ SYSTEMD_SERVICES += osmo-trx-lms.service endif -EXTRA_DIST = $(SYSTEMD_SERVICES) systemdsystemunit_DATA = $(SYSTEMD_SERVICES) endif # HAVE_SYSTEMD -- To view, visit https://gerrit.osmocom.org/12170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2e417f4c453987df1ac04f0ff41bf000da4b5c49 Gerrit-Change-Number: 12170 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:37:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 16:37:11 +0000 Subject: Change in osmo-hlr[master]: store timestamp of last location update seen from subscriber In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12121 ) Change subject: store timestamp of last location update seen from subscriber ...................................................................... Patch Set 5: (3 comments) https://gerrit.osmocom.org/#/c/12121/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12121/5//COMMIT_MSG at 11 PS5, Line 11: in the 'subscriber' table, in granularity of seconds. > Describe what do the value mean. [?] (imho what the value means should be in a code comment and not so much in a commit log) https://gerrit.osmocom.org/#/c/12121/5/sql/hlr.sql File sql/hlr.sql: https://gerrit.osmocom.org/#/c/12121/5/sql/hlr.sql at 42 PS5, Line 42: last_lu_seen TIMESTAMP default NULL > I'm not able to find TIMESTAMP in sqlite documentation so far. https://www.sqlite.org/datatype3. [?] found https://www.sqlite.org/lang_datefunc.html but am also puzzled why there seems to be no TIMESTAMP. In https://www.sqlite.org/datatypes.html (version 2) it says "SQLite is "typeless". This means that you can store any kind of data you want in any column of any table" -- and version 2 names a TIMESTAMP type. In 3 it says "SQLite does not have a storage class set aside for storing dates and/or times. Instead, the built-in Date And Time Functions of SQLite are capable of storing dates and times as TEXT, REAL, or INTEGER values" So apparently TIMESTAMP is a shim for TEXT. https://gerrit.osmocom.org/#/c/12121/5/sql/hlr.sql at 75 PS5, Line 75: PRAGMA user_version = 1; > this 1 together with CURRENT_SCHEMA_VERSION in code looks like a candaidate to have in configure. [?] also think it's nice to have a single place... ideally the other version would be derived from this file, but I guess that's too complex? Otherwise not so nice to open the unbuilt source and not be able to see the actual version? so unless some bright idea comes up we'll have it duplicated. -- To view, visit https://gerrit.osmocom.org/12121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Gerrit-Change-Number: 12121 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Dec 2018 16:37:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:39:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 16:39:17 +0000 Subject: Change in osmo-hlr[master]: store timestamp of last location update seen from subscriber In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12121 ) Change subject: store timestamp of last location update seen from subscriber ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/12121/5/src/db.c File src/db.c: https://gerrit.osmocom.org/#/c/12121/5/src/db.c at 77 PS5, Line 77: [DB_STMT_SET_LAST_LU_SEEN] = "UPDATE subscriber SET last_lu_seen = datetime($val, 'unixepoch') WHERE id = $subscriber_id", last_lu_seen is really just a TEXT column, and the datetime function converts it to be stored as TEXT -- To view, visit https://gerrit.osmocom.org/12121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Gerrit-Change-Number: 12121 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Dec 2018 16:39:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:40:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 16:40:39 +0000 Subject: Change in libosmo-abis[master]: log IPA tags correctly Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12175 Change subject: log IPA tags correctly ...................................................................... log IPA tags correctly Due to apparent copy-paste errors, wrong values were being logged for IPA tags in ipa_bts_id_resp(). Fixes: 4c57eef663e870247cb7a72130a50750317a44b9 Change-Id: I29a0401db0760219b9b9176709a88d589312261b Related: OS#3355 --- M src/input/ipaccess.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/75/12175/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 8c02996..136aa79 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -603,15 +603,15 @@ break; case IPAC_IDTAG_LOCATION1: if (dev->location1) - osmo_strlcpy(str, dev->swversion, sizeof(str)); + osmo_strlcpy(str, dev->location1, sizeof(str)); break; case IPAC_IDTAG_LOCATION2: if (dev->location2) - osmo_strlcpy(str, dev->swversion, sizeof(str)); + osmo_strlcpy(str, dev->location2, sizeof(str)); break; case IPAC_IDTAG_EQUIPVERS: if (dev->equipvers) - osmo_strlcpy(str, dev->swversion, sizeof(str)); + osmo_strlcpy(str, dev->equipvers, sizeof(str)); break; case IPAC_IDTAG_SWVERSION: if (dev->swversion) @@ -627,7 +627,7 @@ break; case IPAC_IDTAG_SERNR: if (dev->serno) - osmo_strlcpy(str, dev->swversion, sizeof(str)); + osmo_strlcpy(str, dev->serno, sizeof(str)); break; default: LOGP(DLINP, LOGL_NOTICE, -- To view, visit https://gerrit.osmocom.org/12175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I29a0401db0760219b9b9176709a88d589312261b Gerrit-Change-Number: 12175 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:41:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 16:41:59 +0000 Subject: Change in libosmo-abis[master]: log IPA tags correctly In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12175 ) Change subject: log IPA tags correctly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29a0401db0760219b9b9176709a88d589312261b Gerrit-Change-Number: 12175 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 16:41:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:42:03 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 6 Dec 2018 16:42:03 +0000 Subject: Change in libosmo-abis[master]: log IPA tags correctly In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12175 ) Change subject: log IPA tags correctly ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29a0401db0760219b9b9176709a88d589312261b Gerrit-Change-Number: 12175 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 06 Dec 2018 16:42:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:42:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 16:42:52 +0000 Subject: Change in libosmo-abis[master]: log IPA tags correctly In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12175 ) Change subject: log IPA tags correctly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29a0401db0760219b9b9176709a88d589312261b Gerrit-Change-Number: 12175 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 16:42:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:46:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 16:46:02 +0000 Subject: Change in osmo-hlr[master]: store timestamp of last location update seen from subscriber In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12121 ) Change subject: store timestamp of last location update seen from subscriber ...................................................................... Patch Set 5: (2 comments) https://gerrit.osmocom.org/#/c/12121/5/sql/hlr.sql File sql/hlr.sql: https://gerrit.osmocom.org/#/c/12121/5/sql/hlr.sql at 41 PS5, Line 41: -- Timestamp of last location update seen from subscriber As Neels suggested, add granularity and meaning: "seconds, UTC" or whatever. https://gerrit.osmocom.org/#/c/12121/5/sql/hlr.sql at 75 PS5, Line 75: PRAGMA user_version = 1; > also think it's nice to have a single place... [?] Well the idea I already provided, but imho too much work involved for what we get. Maybe adding here a comment saying "Remember to keep up to date with foo/bar.h" may make sense. -- To view, visit https://gerrit.osmocom.org/12121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Gerrit-Change-Number: 12121 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Dec 2018 16:46:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:47:48 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 16:47:48 +0000 Subject: Change in libosmo-abis[master]: log IPA tags correctly In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/12175 ) Change subject: log IPA tags correctly ...................................................................... log IPA tags correctly Due to apparent copy-paste errors, wrong values were being logged for IPA tags in ipa_bts_id_resp(). Fixes: 4c57eef663e870247cb7a72130a50750317a44b9 Change-Id: I29a0401db0760219b9b9176709a88d589312261b Related: OS#3355 --- M src/input/ipaccess.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 8c02996..136aa79 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -603,15 +603,15 @@ break; case IPAC_IDTAG_LOCATION1: if (dev->location1) - osmo_strlcpy(str, dev->swversion, sizeof(str)); + osmo_strlcpy(str, dev->location1, sizeof(str)); break; case IPAC_IDTAG_LOCATION2: if (dev->location2) - osmo_strlcpy(str, dev->swversion, sizeof(str)); + osmo_strlcpy(str, dev->location2, sizeof(str)); break; case IPAC_IDTAG_EQUIPVERS: if (dev->equipvers) - osmo_strlcpy(str, dev->swversion, sizeof(str)); + osmo_strlcpy(str, dev->equipvers, sizeof(str)); break; case IPAC_IDTAG_SWVERSION: if (dev->swversion) @@ -627,7 +627,7 @@ break; case IPAC_IDTAG_SERNR: if (dev->serno) - osmo_strlcpy(str, dev->swversion, sizeof(str)); + osmo_strlcpy(str, dev->serno, sizeof(str)); break; default: LOGP(DLINP, LOGL_NOTICE, -- To view, visit https://gerrit.osmocom.org/12175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I29a0401db0760219b9b9176709a88d589312261b Gerrit-Change-Number: 12175 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:51:34 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 6 Dec 2018 16:51:34 +0000 Subject: Change in osmo-ci[master]: add maintainer email to simtrace project Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/12176 Change subject: add maintainer email to simtrace project ...................................................................... add maintainer email to simtrace project Change-Id: Id0a6740749ea1e3d1c06396485744426b0a74f79 --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/76/12176/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 1b7cdfd..7a3e915 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -356,6 +356,7 @@ cmd: > # keep first line with less indent to preserve newlines ./contrib/jenkins.sh --publish + email: gerrit-log at lists.osmocom.org laforge at gnumonks.org kredon at sysmocom.de - gapk -- To view, visit https://gerrit.osmocom.org/12176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id0a6740749ea1e3d1c06396485744426b0a74f79 Gerrit-Change-Number: 12176 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:51:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 16:51:41 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 16: > > it's either all or nothing. > > That's not the case: we might fail in the middle of decoding after > some values have already been written out. I don't see the API defining those different cases nor this test code checking different cases through return code, so yes, its "all or nothing" (and it's fine being that way). -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 16 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 16:51:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:53:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 16:53:06 +0000 Subject: Change in osmo-ci[master]: add maintainer email to simtrace project In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12176 ) Change subject: add maintainer email to simtrace project ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12176/1/jobs/master-builds.yml File jobs/master-builds.yml: https://gerrit.osmocom.org/#/c/12176/1/jobs/master-builds.yml at 359 PS1, Line 359: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org kredon at sysmocom.de I think we usually leave cmd at the end since it can take several lines, so better move it on top of cmd. -- To view, visit https://gerrit.osmocom.org/12176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0a6740749ea1e3d1c06396485744426b0a74f79 Gerrit-Change-Number: 12176 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 16:53:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:58:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 16:58:16 +0000 Subject: Change in osmo-trx[master]: Add CTRL log category In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12120 to look at the new patch set (#3). Change subject: Add CTRL log category ...................................................................... Add CTRL log category This log category is applied to messages related to TRX CTRL socket interface, and it's printed in yellow, same color used in osmo-bts-trx for TRX category (so same messages are printed with same color in both sides). Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 --- M CommonLibs/debug.c M CommonLibs/debug.h M Transceiver52M/Transceiver.cpp 3 files changed, 14 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/20/12120/3 -- To view, visit https://gerrit.osmocom.org/12120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 Gerrit-Change-Number: 12120 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 16:58:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 16:58:16 +0000 Subject: Change in osmo-trx[master]: transceiver: Log CTRL iface responses towards osmo-bts-trx In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12122 to look at the new patch set (#3). Change subject: transceiver: Log CTRL iface responses towards osmo-bts-trx ...................................................................... transceiver: Log CTRL iface responses towards osmo-bts-trx Change-Id: I8128c42e63ab1fcd2a58812f3b7cf94435b5bbd8 --- M Transceiver52M/Transceiver.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/22/12122/3 -- To view, visit https://gerrit.osmocom.org/12122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8128c42e63ab1fcd2a58812f3b7cf94435b5bbd8 Gerrit-Change-Number: 12122 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:05:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 17:05:29 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): style tweak: break on error first In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12158 ) Change subject: gsm48_mi_to_string(): style tweak: break on error first ...................................................................... Patch Set 1: > IMO that break inside the if is confusing, I prefer the old way. what? but that's the usual way we branch off for errors. Well ok then, let's abandon this then. no use discussing nothing -- To view, visit https://gerrit.osmocom.org/12158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic76bc5e84ad1278fa3b2db5f5e28cadf1d90a343 Gerrit-Change-Number: 12158 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 17:05:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:13:37 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 17:13:37 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12177 Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... make gsup ipa name configurable in osmo-msc.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the MSC. This is a prerequisite for inter-MSC handover. Related: OS#3355 Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 19 files changed, 187 insertions(+), 118 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/12177/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 63af3e7..9eca108 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -212,6 +212,9 @@ /* MSISDN to which to route MO emergency calls */ char *route_to_msisdn; } emergency; + + /* IPA name advertised to GSUP peers. */ + char *msc_ipa_name; }; struct osmo_esme; diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index c0e4864..89a3b2e 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -312,6 +313,8 @@ int vlr_subscr_rx_imsi_detach(struct vlr_subscr *vsub); struct vlr_instance *vlr_alloc(void *ctx, const struct vlr_ops *ops); +int vlr_start2(struct ipaccess_unit *ipa_dev, struct vlr_instance *vlr, + const char *gsup_server_addr_str, uint16_t gsup_server_port); int vlr_start(const char *gsup_unit_name, struct vlr_instance *vlr, const char *gsup_server_addr_str, uint16_t gsup_server_port); diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 2962760..83eb22c 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1827,9 +1827,16 @@ /* Launch the VLR, i.e. its GSUP connection */ int msc_vlr_start(struct gsm_network *net) { + struct ipaccess_unit *ipa_dev; + OSMO_ASSERT(net->vlr); - return vlr_start("MSC", net->vlr, net->gsup_server_addr_str, - net->gsup_server_port); + + ipa_dev = talloc_zero(net->vlr, struct ipaccess_unit); + ipa_dev->unit_name = "MSC"; + ipa_dev->serno = net->msc_ipa_name; /* NULL unless configured via VTY */ + + return vlr_start2(ipa_dev, net->vlr, net->gsup_server_addr_str, + net->gsup_server_port); } struct msgb *gsm48_create_mm_serv_rej(enum gsm48_reject_value value) diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index e1d1b40..99a75ab 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -458,6 +458,16 @@ return CMD_SUCCESS; } +DEFUN(cfg_msc_ipa_name, + cfg_msc_ipa_name_cmd, + "ipa-name NAME", + "Set the IPA name of this MSC (by default, no name is set)\n" + "An arbitrary IPA name for this MSC (for example PLMN + redundancy server number: MSC-901-70-0\n") +{ + gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]); + return CMD_SUCCESS; +} + static int config_write_msc(struct vty *vty) { vty_out(vty, "msc%s", VTY_NEWLINE); @@ -491,6 +501,9 @@ gsmnet->emergency.route_to_msisdn, VTY_NEWLINE); } + if (gsmnet->msc_ipa_name) + vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name, VTY_NEWLINE); + mgcp_client_config_write(vty, " "); #ifdef BUILD_IU ranap_iu_vty_config_write(vty, " "); @@ -1483,6 +1496,7 @@ install_element(MSC_NODE, &cfg_msc_cs7_instance_iu_cmd); install_element(MSC_NODE, &cfg_msc_paging_response_timer_cmd); install_element(MSC_NODE, &cfg_msc_emergency_msisdn_cmd); + install_element(MSC_NODE, &cfg_msc_ipa_name_cmd); mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf); #ifdef BUILD_IU diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 76c84de..6e4a532 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -1210,6 +1211,30 @@ return vlr; } +static void vlr_init(struct vlr_instance *vlr) +{ + vlr->gsup_client->data = vlr; + + osmo_timer_setup(&vlr->lu_expire_timer, vlr_subscr_expire_lu, vlr); + osmo_timer_schedule(&vlr->lu_expire_timer, VLR_SUBSCRIBER_LU_EXPIRATION_INTERVAL, 0); +} + +int vlr_start2(struct ipaccess_unit *ipa_dev, struct vlr_instance *vlr, + const char *gsup_server_addr_str, uint16_t gsup_server_port) +{ + OSMO_ASSERT(vlr); + + vlr->gsup_client = osmo_gsup_client_create2(vlr, ipa_dev, + gsup_server_addr_str, + gsup_server_port, + &vlr_gsupc_read_cb, NULL); + if (!vlr->gsup_client) + return -ENOMEM; + + vlr_init(vlr); + return 0; +} + int vlr_start(const char *gsup_unit_name, struct vlr_instance *vlr, const char *gsup_server_addr_str, uint16_t gsup_server_port) { @@ -1221,10 +1246,8 @@ &vlr_gsupc_read_cb, NULL); if (!vlr->gsup_client) return -ENOMEM; - vlr->gsup_client->data = vlr; - osmo_timer_setup(&vlr->lu_expire_timer, vlr_subscr_expire_lu, vlr); - osmo_timer_schedule(&vlr->lu_expire_timer, VLR_SUBSCRIBER_LU_EXPIRATION_INTERVAL, 0); + vlr_init(vlr); return 0; } diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index 1d1956a..b38ea79 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -20,6 +20,7 @@ AM_LDFLAGS = \ -Wl,--wrap=osmo_gsup_client_create \ + -Wl,--wrap=osmo_gsup_client_create2 \ -Wl,--wrap=osmo_gsup_client_send \ -Wl,--wrap=a_iface_tx_dtap \ -Wl,--wrap=a_iface_tx_clear_cmd \ diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index 4941550..e6a7242 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_auth_use_twice_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -418,7 +418,7 @@ ===== test_auth_use_twice_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_auth_use_twice_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -875,7 +875,7 @@ ===== test_auth_use_twice_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_auth_use_infinitely_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1374,7 +1374,7 @@ ===== test_auth_use_infinitely_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_auth_use_infinitely_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1924,7 +1924,7 @@ ===== test_auth_use_infinitely_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_auth_reuse_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2249,7 +2249,7 @@ ===== test_no_auth_reuse_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_auth_reuse_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2599,8 +2599,8 @@ ===== test_no_auth_reuse_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index a3ff277..b444837 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_call_mo - Total time passed: 0.000000 s @@ -387,7 +387,7 @@ ===== test_call_mo: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_call_mt - Total time passed: 0.000000 s @@ -774,7 +774,7 @@ ===== test_call_mt: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_call_mt2 - Total time passed: 0.000000 s @@ -1127,7 +1127,7 @@ ===== test_call_mt2: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_call_mo_to_unknown - Total time passed: 0.000000 s @@ -1477,7 +1477,7 @@ ===== test_call_mo_to_unknown: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_call_mo_to_unknown_timeout - Total time passed: 0.000000 s @@ -1824,8 +1824,8 @@ ===== test_call_mo_to_unknown_timeout: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 1014bb2..c302021 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_gsm_authen - Location Update request causes a GSUP Send Auth Info request to HLR @@ -450,7 +450,7 @@ ===== test_gsm_authen: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_gsm_authen_tmsi - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1110,7 +1110,7 @@ ===== test_gsm_authen_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_gsm_authen_imei - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1347,7 +1347,7 @@ ===== test_gsm_authen_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_gsm_authen_tmsi_imei - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1616,7 +1616,7 @@ ===== test_gsm_authen_tmsi_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_gsm_milenage_authen - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2048,7 +2048,7 @@ ===== test_gsm_milenage_authen: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_wrong_sres_length - Total time passed: 0.000000 s @@ -2166,8 +2166,8 @@ ===== test_wrong_sres_length: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 5bc57e0..e964972 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ciph - Location Update request causes a GSUP Send Auth Info request to HLR @@ -502,7 +502,7 @@ ===== test_ciph: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ciph_tmsi - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1042,7 +1042,7 @@ ===== test_ciph_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ciph_imei - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1283,7 +1283,7 @@ ===== test_ciph_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ciph_imeisv - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1513,7 +1513,7 @@ ===== test_ciph_imeisv: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ciph_tmsi_imei - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1786,7 +1786,7 @@ ===== test_ciph_tmsi_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_gsm_ciph_in_umts_env - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2258,7 +2258,7 @@ ===== test_gsm_ciph_in_umts_env: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_a5_3_supported - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2758,7 +2758,7 @@ ===== test_a5_3_supported: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_cm_service_needs_classmark_update - Location Update request causes a GSUP Send Auth Info request to HLR @@ -3249,8 +3249,8 @@ ===== test_cm_service_needs_classmark_update: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index ba4db3e..be54264 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_rej_auth_info_unknown_imsi - Location Update request causes a GSUP Send Auth Info request to HLR @@ -79,7 +79,7 @@ ===== test_hlr_rej_auth_info_unknown_imsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_rej_auth_info_net_fail - Location Update request causes a GSUP Send Auth Info request to HLR @@ -159,7 +159,7 @@ ===== test_hlr_rej_auth_info_net_fail: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_rej_auth_info_net_fail_reuse_tuples --- @@ -472,7 +472,7 @@ ===== test_hlr_rej_auth_info_net_fail_reuse_tuples: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples --- @@ -709,7 +709,7 @@ ===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples --- @@ -947,7 +947,7 @@ ===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_acc_but_no_auth_tuples - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1026,7 +1026,7 @@ ===== test_hlr_acc_but_no_auth_tuples: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_rej_lu - Location Update request causes a GSUP LU request to HLR @@ -1108,7 +1108,7 @@ ===== test_hlr_rej_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_no_insert_data - Location Update request causes a GSUP LU request to HLR @@ -1213,8 +1213,8 @@ ===== test_hlr_no_insert_data: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index 60bb8cb..2fa0719 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_timeout_lu_auth_info - Total time passed: 0.000000 s @@ -87,7 +87,7 @@ ===== test_hlr_timeout_lu_auth_info: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_timeout_lu_upd_loc_result - Total time passed: 0.000000 s @@ -194,8 +194,8 @@ ===== test_hlr_timeout_lu_upd_loc_result: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index bf3a0ed..957cfc8 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ms_timeout_lu_auth_resp - Total time passed: 0.000000 s @@ -107,7 +107,7 @@ ===== test_ms_timeout_lu_auth_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ms_timeout_cm_auth_resp - Total time passed: 0.000000 s @@ -353,7 +353,7 @@ ===== test_ms_timeout_cm_auth_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ms_timeout_paging - Total time passed: 0.000000 s @@ -561,7 +561,7 @@ ===== test_ms_timeout_paging: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_classmark_update_timeout - Total time passed: 0.000000 s @@ -691,8 +691,8 @@ ===== test_classmark_update_timeout: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 3f024e0..e692fcf 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen - Location Update request causes a GSUP LU request to HLR @@ -322,7 +322,7 @@ ===== test_no_authen: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_tmsi - Location Update request causes a GSUP LU request to HLR @@ -837,7 +837,7 @@ ===== test_no_authen_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_imei - Location Update request causes a GSUP LU request to HLR @@ -1026,7 +1026,7 @@ ===== test_no_authen_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_tmsi_imei - Location Update request causes a GSUP LU request to HLR @@ -1241,7 +1241,7 @@ ===== test_no_authen_tmsi_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_imeisv - Location Update request causes an IMEISV ID request back to the MS @@ -1416,7 +1416,7 @@ ===== test_no_authen_imeisv: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_imeisv_imei - Location Update request causes an IMEISV ID request back to the MS @@ -1623,7 +1623,7 @@ ===== test_no_authen_imeisv_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_imeisv_tmsi - Location Update request causes an IMEISV ID request back to the MS @@ -2001,7 +2001,7 @@ ===== test_no_authen_imeisv_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_imeisv_tmsi_imei - Location Update request causes an IMEISV ID request back to the MS @@ -2235,7 +2235,7 @@ ===== test_no_authen_imeisv_tmsi_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_subscr_expire - Total time passed: 0.000000 s @@ -2361,8 +2361,8 @@ ===== test_no_authen_subscr_expire: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 90c6f06..40ae5e5 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_2nd_conn - Location Update Request on one connection @@ -158,7 +158,7 @@ ===== test_reject_2nd_conn: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_lu_during_lu - Location Update Request @@ -288,7 +288,7 @@ ===== test_reject_lu_during_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_cm_during_lu - Location Update Request @@ -425,7 +425,7 @@ ===== test_reject_cm_during_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_paging_resp_during_lu - Location Update Request @@ -555,7 +555,7 @@ ===== test_reject_paging_resp_during_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_lu_during_cm --- @@ -752,7 +752,7 @@ ===== test_reject_lu_during_cm: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_cm_during_cm --- @@ -952,7 +952,7 @@ ===== test_reject_cm_during_cm: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_paging_resp_during_cm --- @@ -1140,7 +1140,7 @@ ===== test_reject_paging_resp_during_cm: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_lu_during_paging_resp --- @@ -1367,7 +1367,7 @@ ===== test_reject_lu_during_paging_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_accept_cm_during_paging_resp --- @@ -1614,7 +1614,7 @@ ===== test_accept_cm_during_paging_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_paging_resp_during_paging_resp --- @@ -1839,8 +1839,8 @@ ===== test_reject_paging_resp_during_paging_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 711633b..0ea0d70 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_early_stage - NULL conn @@ -48,7 +48,7 @@ ===== test_early_stage: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_cm_service_without_lu - CM Service Request without a prior Location Updating @@ -91,7 +91,7 @@ ===== test_cm_service_without_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_two_lu - Location Update request causes a GSUP LU request to HLR @@ -368,7 +368,7 @@ ===== test_two_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_lu_unknown_tmsi - Location Update request with unknown TMSI sends ID Request for IMSI @@ -522,8 +522,8 @@ ===== test_lu_unknown_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 15b2888..9db94b4 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ss_ussd_mo_geran - Location Update request causes a GSUP LU request to HLR @@ -203,7 +203,7 @@ ===== test_ss_ussd_mo_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ss_ussd_no_geran - Location Update request causes a GSUP LU request to HLR @@ -436,8 +436,8 @@ ===== test_ss_ussd_no_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index f5b7d02..1949a7c 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -464,7 +464,7 @@ ===== test_umts_authen_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -967,7 +967,7 @@ ===== test_umts_authen_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_resync_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1186,7 +1186,7 @@ ===== test_umts_authen_resync_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_resync_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1417,7 +1417,7 @@ ===== test_umts_authen_resync_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_too_short_res_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1515,7 +1515,7 @@ ===== test_umts_authen_too_short_res_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_too_short_res_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1613,7 +1613,7 @@ ===== test_umts_authen_too_short_res_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_too_long_res_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1711,7 +1711,7 @@ ===== test_umts_authen_too_long_res_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_too_long_res_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1809,7 +1809,7 @@ ===== test_umts_authen_too_long_res_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_only_sres_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1907,7 +1907,7 @@ ===== test_umts_authen_only_sres_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_only_sres_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2005,8 +2005,8 @@ ===== test_umts_authen_only_sres_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 29ffdbf..459a151 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -562,6 +562,23 @@ return gsupc; } +/* override, requires '-Wl,--wrap=osmo_gsup_client_create2' */ +struct osmo_gsup_client * +__real_osmo_gsup_client_create2(struct ipaccess_unit *ipa_dev, const char *ip_addr, + unsigned int tcp_port, osmo_gsup_client_read_cb_t read_cb, + struct osmo_oap_client_config *oap_config); +struct osmo_gsup_client * +__wrap_osmo_gsup_client_create2(struct ipaccess_unit *ipa_dev, const char *ip_addr, + unsigned int tcp_port, osmo_gsup_client_read_cb_t read_cb, + struct osmo_oap_client_config *oap_config) +{ + struct osmo_gsup_client *gsupc; + gsupc = talloc_zero(msc_vlr_tests_ctx, struct osmo_gsup_client); + OSMO_ASSERT(gsupc); + return gsupc; +} + + /* override, requires '-Wl,--wrap=gsup_client_send' */ int __real_osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg); int __wrap_osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg) @@ -882,24 +899,25 @@ /* Verifying that the msgb context is empty */ talloc_report_full(msgb_ctx, stderr); /* Expecting these to stick around in msc_vlr_tests_ctx: - * talloc_total_blocks(tall_bsc_ctx) == 12 - * full talloc report on 'msc_vlr_tests_ctx' (total 3636 bytes in 12 blocks) - * struct osmo_gsup_client contains 248 bytes in 1 blocks (ref 0) 0x563a489c05f0 - * struct gsm_network contains 2031 bytes in 4 blocks (ref 0) 0x563a489bfbb0 - * struct vlr_instance contains 168 bytes in 1 blocks (ref 0) 0x563a489c04e0 - * no_gsup_server contains 15 bytes in 1 blocks (ref 0) 0x563a489c0460 - * ../../../src/libosmocore/src/rate_ctr.c:228 contains 1552 bytes in 1 blocks (ref 0) 0x563a489bfd40 - * logging contains 1357 bytes in 5 blocks (ref 0) 0x563a489bf440 - * struct log_target contains 228 bytes in 2 blocks (ref 0) 0x563a489bf9f0 - * struct log_category contains 68 bytes in 1 blocks (ref 0) 0x563a489bfb00 - * struct log_info contains 1128 bytes in 2 blocks (ref 0) 0x563a489bf4b0 - * struct log_info_cat contains 1088 bytes in 1 blocks (ref 0) 0x563a489bf540 - * msgb contains 0 bytes in 1 blocks (ref 0) 0x563a489bf3d0 - * (That's 12 counting the root ctx) + * talloc_total_blocks(tall_bsc_ctx) == 13 + * full talloc report on 'msc_vlr_tests_ctx' (total 4638 bytes in 13 blocks) + * struct osmo_gsup_client contains 256 bytes in 1 blocks (ref 0) 0x61300000dd20 + * struct gsm_network contains 2983 bytes in 5 blocks (ref 0) 0x61400000fea0 + * struct vlr_instance contains 320 bytes in 2 blocks (ref 0) 0x61300000dee0 + * struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e0000244c0 + * no_gsup_server contains 15 bytes in 1 blocks (ref 0) 0x60b00000af40 + * rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 + * logging contains 1399 bytes in 5 blocks (ref 0) 0x60b00000aff0 + * struct log_target contains 238 bytes in 2 blocks (ref 0) 0x61200000bf20 + * struct log_category contains 70 bytes in 1 blocks (ref 0) 0x60f00000efb0 + * struct log_info contains 1160 bytes in 2 blocks (ref 0) 0x60d00000cfd0 + * struct log_info_cat contains 1120 bytes in 1 blocks (ref 0) 0x61a00001f2e0 + * msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 + * (That's 13 counting the root ctx) */ fprintf(stderr, "talloc_total_blocks(tall_bsc_ctx) == %zu\n", talloc_total_blocks(msc_vlr_tests_ctx)); - if (talloc_total_blocks(msc_vlr_tests_ctx) != 12) + if (talloc_total_blocks(msc_vlr_tests_ctx) != 13) talloc_report_full(msc_vlr_tests_ctx, stderr); fprintf(stderr, "\n"); } -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:13:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 17:13:39 +0000 Subject: Change in osmo-msc[master]: provide software version information to gsup peer Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12178 Change subject: provide software version information to gsup peer ...................................................................... provide software version information to gsup peer Provide software version information to the GSUP peer. The version now shows up in logs like this: Software_Version='osmo-msc-1.2.0.120-1263b' Change-Id: I2eba32569349facdbb1fda201067c62cc804ccf4 Related: OS#3355 --- M src/libmsc/gsm_04_08.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12178/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 83eb22c..d36d975 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1834,6 +1834,7 @@ ipa_dev = talloc_zero(net->vlr, struct ipaccess_unit); ipa_dev->unit_name = "MSC"; ipa_dev->serno = net->msc_ipa_name; /* NULL unless configured via VTY */ + ipa_dev->swversion = PACKAGE_NAME "-" PACKAGE_VERSION; return vlr_start2(ipa_dev, net->vlr, net->gsup_server_addr_str, net->gsup_server_port); -- To view, visit https://gerrit.osmocom.org/12178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2eba32569349facdbb1fda201067c62cc804ccf4 Gerrit-Change-Number: 12178 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:21:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 17:21:34 +0000 Subject: Change in libosmocore[master]: gsm0408_test: test encoding and decoding Mobile Identity In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12151 to look at the new patch set (#4). Change subject: gsm0408_test: test encoding and decoding Mobile Identity ...................................................................... gsm0408_test: test encoding and decoding Mobile Identity One would think by now we would solidly encode and decode Mobile Identities. Well, guess again. - rc is sometimes the amount of bytes written, sometimes actual strlen(). - on string truncation, rc is sometimes strlen() (assuming nul terminated), and sometimes snprintf()-style would-be strlen(). - returned string, when truncated by not enough buffer size, is sometimes nul terminated, sometimes not. - gsm48_mi_to_string() happily reads a byte from zero-length input buffer. - gsm48_mi_to_string() happily writes to zero length output buffer. - gsm48_mi_to_string() returns nonempty string for empty input. - encoding a MI type that still has the GSM_MI_ODD flag set results in encoding an even-length MI as odd-length (hence appending a stray 'F'). I am going to tweak the implementation of gsm48 mobile identity encoding / decoding, so first pinpoint the current behavior in a unit test, and show how perforated even such a seemingly trivial API can be. Change-Id: Iaae3af87f82f1a8f2e6273984c011b2813038cf7 --- M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 358 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/51/12151/4 -- To view, visit https://gerrit.osmocom.org/12151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iaae3af87f82f1a8f2e6273984c011b2813038cf7 Gerrit-Change-Number: 12151 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:21:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 17:21:34 +0000 Subject: Change in libosmocore[master]: add osmo_bcd2str() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12153 to look at the new patch set (#4). Change subject: add osmo_bcd2str() ...................................................................... add osmo_bcd2str() Add a standalone bcd-to-string conversion function with generic parameters. Add a regression test in utils_test.c. So far there is no single universal implementation that converts a BCD to a string. I could only find gsm48_mi_to_string(), which also interprets surrounding bytes, MI type and TMSI as non-BCD value. The idea is to use this function from gsm48_mi_to_string() and similar implementations in subsequent commits. Root cause: in osmo-msc, I want to have an alternative MI-to-string function for composing an FSM name, which needs the BCD part of gsm48_mi_to_string() but not the TMSI part. Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 --- M include/osmocom/core/utils.h M src/utils.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 4 files changed, 131 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/53/12153/4 -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:21:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 17:21:34 +0000 Subject: Change in libosmocore[master]: gsm48_generate_mid(): mask out ODD flag from mi_type In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12155 to look at the new patch set (#4). Change subject: gsm48_generate_mid(): mask out ODD flag from mi_type ...................................................................... gsm48_generate_mid(): mask out ODD flag from mi_type For MI encoding, see 3GPP TS 24.008, 10.5.1.4 Mobile Identity. The 'odd' flag indicates whether the last BCD nibble is used. Of course that flag should be made sure to reflect the actual length. Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 --- M src/gsm/gsm48.c M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 3 files changed, 6 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/12155/4 -- To view, visit https://gerrit.osmocom.org/12155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 Gerrit-Change-Number: 12155 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:22:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 17:22:00 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): style tweak: break on error first In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/12158 ) Change subject: gsm48_mi_to_string(): style tweak: break on error first ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ic76bc5e84ad1278fa3b2db5f5e28cadf1d90a343 Gerrit-Change-Number: 12158 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:23:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 17:23:56 +0000 Subject: Change in libosmocore[master]: gsm0408_test: test encoding and decoding Mobile Identity In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12151 ) Change subject: gsm0408_test: test encoding and decoding Mobile Identity ...................................................................... Patch Set 4: Code-Review+2 merely comment change -- To view, visit https://gerrit.osmocom.org/12151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaae3af87f82f1a8f2e6273984c011b2813038cf7 Gerrit-Change-Number: 12151 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 17:23:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:30:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 17:30:46 +0000 Subject: Change in docker-playground[master]: bts-test: osmo-bts.cfg: Enable extended timestamp Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12179 Change subject: bts-test: osmo-bts.cfg: Enable extended timestamp ...................................................................... bts-test: osmo-bts.cfg: Enable extended timestamp This way messages appearing in log files can be easily matched against pcap captures. Change-Id: Ic59c0d7ee0d3ce71e807364d156f6e38bc0c74d1 --- M ttcn3-bts-test/osmo-bts.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/79/12179/1 diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/osmo-bts.cfg index c2ba83f..611355b 100644 --- a/ttcn3-bts-test/osmo-bts.cfg +++ b/ttcn3-bts-test/osmo-bts.cfg @@ -7,6 +7,7 @@ logging color 0 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging level rsl info logging level oml info logging level rll notice -- To view, visit https://gerrit.osmocom.org/12179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic59c0d7ee0d3ce71e807364d156f6e38bc0c74d1 Gerrit-Change-Number: 12179 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:55:42 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 17:55:42 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12177 to look at the new patch set (#2). Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... make gsup ipa name configurable in osmo-msc.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the MSC. This is a prerequisite for inter-MSC handover. Related: OS#3355 Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/test_nodes.vty 20 files changed, 188 insertions(+), 118 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/12177/2 -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:58:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 17:58:00 +0000 Subject: Change in osmo-ci[master]: master-builds: set PUBLISH=0 temporarily In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12137 ) Change subject: master-builds: set PUBLISH=0 temporarily ...................................................................... Patch Set 2: ok, if you fixed jenkins temporarily already, then we don't really need to commit this -- To view, visit https://gerrit.osmocom.org/12137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I946f2e17229d3c602bbe79a72cc37104745ea552 Gerrit-Change-Number: 12137 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 06 Dec 2018 17:58:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:58:33 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 17:58:33 +0000 Subject: Change in osmo-msc[master]: provide software version information to gsup peer In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12178 to look at the new patch set (#3). Change subject: provide software version information to gsup peer ...................................................................... provide software version information to gsup peer Provide software version information to the GSUP peer. The version now shows up in logs like this: Software_Version='osmo-msc-1.2.0.120-1263b' Change-Id: I2eba32569349facdbb1fda201067c62cc804ccf4 Depends: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Related: OS#3355 --- M src/libmsc/gsm_04_08.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12178/3 -- To view, visit https://gerrit.osmocom.org/12178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2eba32569349facdbb1fda201067c62cc804ccf4 Gerrit-Change-Number: 12178 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 17:58:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 17:58:55 +0000 Subject: Change in osmo-msc[master]: provide software version information to gsup peer In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12178 ) Change subject: provide software version information to gsup peer ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2eba32569349facdbb1fda201067c62cc804ccf4 Gerrit-Change-Number: 12178 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Dec 2018 17:58:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:08:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 18:08:27 +0000 Subject: Change in libosmocore[master]: Add osmo_sockaddr_in_to_str_and_uint() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11842 ) Change subject: Add osmo_sockaddr_in_to_str_and_uint() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie384483124d407a960ab6732e6a7fd90554389d2 Gerrit-Change-Number: 11842 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 06 Dec 2018 18:08:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:10:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 18:10:57 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): do not read from zero length input buffer In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12157 ) Change subject: gsm48_mi_to_string(): do not read from zero length input buffer ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I12cada7c2c5187146ca5a33d1ebfefb4cad65632 Gerrit-Change-Number: 12157 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 06 Dec 2018 18:10:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:12:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 18:12:39 +0000 Subject: Change in libosmocore[master]: gsm48_generate_mid(): mask out ODD flag from mi_type In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12155 ) Change subject: gsm48_generate_mid(): mask out ODD flag from mi_type ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 Gerrit-Change-Number: 12155 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 18:12:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:12:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 6 Dec 2018 18:12:53 +0000 Subject: Change in osmo-bts[master]: rsl: Send PDCH ACT NACK if TCH chan is still active Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12180 Change subject: rsl: Send PDCH ACT NACK if TCH chan is still active ...................................................................... rsl: Send PDCH ACT NACK if TCH chan is still active Fix recent commit which broke TTCN3 BTS_tests TC_dyn_ipa_pdch_tchf_act_pdch_act_nack. Prior to the breaking commit, logic was still not good, because 1- It didn't return after sending the NACK 2- It sent a NACK in all cases, while for PDCH DEACT we want to force its deactivation. Going through tests it can be seen that indeed it can deactivate it in that case: rsl.c:2206 (bts=0,trx=0,ts=3,pchan=TCH/F_PDCH as PDCH) Request to PDCH DEACT, but lchan is still in state ACTIVE ... rsl.c:2103 (bts=0,trx=0,ts=3,ss=0) Tx PDCH DEACT ACK Fixes: 133a3d96dc07ebda4dfc7899dab9c0d0c80c9fea ("rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK") Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d --- M src/common/rsl.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/80/12180/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 507e8aa..61bf6a1 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2204,6 +2204,12 @@ "%s Request to PDCH %s, but lchan is still in state %s\n", gsm_ts_and_pchan_name(ts), pdch_act? "ACT" : "DEACT", gsm_lchans_name(lchan->state)); + /* TCH takes preference over PDCH so allow forcing PDCH DEACT, + * but forbid forcing PDCH ACT if lchan still active */ + if (pdch_act) { + rsl_tx_dyn_pdch_nack(lchan, pdch_act, RSL_ERR_NORMAL_UNSPEC); + return; + } } ts->flags |= pdch_act? TS_F_PDCH_ACT_PENDING -- To view, visit https://gerrit.osmocom.org/12180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d Gerrit-Change-Number: 12180 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:14:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 18:14:06 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12177 ) Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... Patch Set 2: Code-Review+1 (3 comments) we can drop the API compat stuff. If you like also cut out the tests expectations stuff with a static ipa_dev -- even though my idea is slightly ugly (but then again we do keep a lot of global state anyway, and there will never be more than one gsm_network and vlr) https://gerrit.osmocom.org/#/c/12177/2/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12177/2/src/libmsc/gsm_04_08.c at 1834 PS2, Line 1834: ipa_dev = talloc_zero(net->vlr, struct ipaccess_unit); could use a static struct, then no talloc, and no changes in the test expectations? though ... technically your patch this is nicer https://gerrit.osmocom.org/#/c/12177/2/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12177/2/src/libmsc/msc_vty.c at 464 PS2, Line 464: "Set the IPA name of this MSC (by default, no name is set)\n" "This is transmitted as IPA Serial Number tag, which is used for GSUP routing (e.g. in OsmoHLR). For inter-MSC handover, the remote MSC's neighbor configuration requires to match this name. If no name is set, the IPA Serial Number will be the same as the Unit Name, and will be of the form 'MSC-00-00-00-00-00-00'." Feel free to use any number of lines for a doc string (only end the last one in \n), vty will automatically format the output (I hope). We can also add this text later... https://gerrit.osmocom.org/#/c/12177/2/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12177/2/src/libvlr/vlr.c at 1222 PS2, Line 1222: int vlr_start2(struct ipaccess_unit *ipa_dev, struct vlr_instance *vlr, since we're inside osmo-msc and no-one is including libvlr except the msc itself, we can just change the function signature and not be backwards compatible. -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Dec 2018 18:14:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:14:50 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 18:14:50 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): guard against zero length output buffer In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12156 ) Change subject: gsm48_mi_to_string(): guard against zero length output buffer ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I709ac3b9efb7b4258d8660715b10312e11b9b571 Gerrit-Change-Number: 12156 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 06 Dec 2018 18:14:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:17:06 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 18:17:06 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12154 ) Change subject: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1b51b72a721e1cc9d69796b804ebda741ff0f36b Gerrit-Change-Number: 12154 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 06 Dec 2018 18:17:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:22:03 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 18:22:03 +0000 Subject: Change in libosmocore[master]: add osmo_bcd2str() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12153 ) Change subject: add osmo_bcd2str() ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 06 Dec 2018 18:22:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:23:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 18:23:06 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11734 ) Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... Patch Set 7: Code-Review-1 (2 comments) before, I didn't see the static/non-static issue... https://gerrit.osmocom.org/#/c/11734/7/src/osmo-bsc/handover_fsm.c File src/osmo-bsc/handover_fsm.c: https://gerrit.osmocom.org/#/c/11734/7/src/osmo-bsc/handover_fsm.c at 806 PS7, Line 806: if (result == HO_RESULT_OK && (ho->scope & HO_INTRA_CELL || ho->scope & HO_INTRA_BSC)) would prefer braces to separate the bitwise from the boolean operators. or (ho->scope & (HO_INTRA_CELL | HO_INTRA_BSC)) https://gerrit.osmocom.org/#/c/11734/7/tests/handover/handover_test.c File tests/handover/handover_test.c: https://gerrit.osmocom.org/#/c/11734/7/tests/handover/handover_test.c at 223 PS7, Line 223: fake_msc_data.network = &fake_bsc_gsmnet; now a static struct which lives past the invocation of this function references a non-static struct that is discarded at the end of this function. potential segfault! both should be static static struct gsm_network fake_bsc_gsmnet = {}; static struct bsc_msc_data fake_msc_data = { .network = &fake_bsc_gsmnet }; or rather, isn't there a global gsmnet already in this file? -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 18:23:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:30:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 18:30:21 +0000 Subject: Change in libosmocore[master]: gsm0408_test: test encoding and decoding Mobile Identity In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12151 ) Change subject: gsm0408_test: test encoding and decoding Mobile Identity ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaae3af87f82f1a8f2e6273984c011b2813038cf7 Gerrit-Change-Number: 12151 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 06 Dec 2018 18:30:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:31:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 18:31:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11897/6/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11897/6/msc/MSC_Tests.ttcn at 2000 PS6, Line 2000: timer T := 20.0; > I think it's too much, ~5.0 seconds would be enough as there [?] compared to the other 10 iterations of dispatching pagings, 20s isn't that much, is it. -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Dec 2018 18:31:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:33:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 18:33:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 7: Code-Review+1 i have no idea about the larger implications... -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 06 Dec 2018 18:33:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:34:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 18:34:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 7: I mean, it would be nicer to allow having a ctrl for both sides, but if it fixes the status quo, this patch is ok, right? -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 06 Dec 2018 18:34:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:49:37 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 18:49:37 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12177 to look at the new patch set (#3). Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... make gsup ipa name configurable in osmo-msc.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the MSC. This is a prerequisite for inter-MSC handover. Related: OS#3355 Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/test_nodes.vty 20 files changed, 173 insertions(+), 122 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/12177/3 -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:49:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 18:49:41 +0000 Subject: Change in osmo-trx[master]: lms: Move {under, over}run checks into separate method In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12125 ) Change subject: lms: Move {under,over}run checks into separate method ...................................................................... Patch Set 2: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12125/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/#/c/12125/2/Transceiver52M/device/lms/LMSDevice.cpp at 538 PS2, Line 538: update_stream_stats(i, underrun, overrun); the under/overrun stuff now moved to above rc != len check, are your sure that is correct? https://gerrit.osmocom.org/#/c/12125/2/Transceiver52M/device/lms/LMSDevice.cpp at 544 PS2, Line 544: //if (timestamp != (TIMESTAMP)rx_metadata.timestamp) ? -- To view, visit https://gerrit.osmocom.org/12125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7f450aa79f6285d14826c40ecfdd9490d00509ef Gerrit-Change-Number: 12125 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Dec 2018 18:49:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 18:51:45 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 6 Dec 2018 18:51:45 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12177 ) Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/12177/2/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12177/2/src/libmsc/gsm_04_08.c at 1834 PS2, Line 1834: ipa_dev = talloc_zero(net->vlr, struct ipaccess_unit); > could use a static struct, then no talloc, and no changes in the test expectations? [?] The API says that ipa_dev must be allocated in the same talloc context as the one which ends up as the first argument to osmo_gsup_client_create2(). https://gerrit.osmocom.org/#/c/12177/2/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12177/2/src/libmsc/msc_vty.c at 464 PS2, Line 464: "Set the IPA name of this MSC.\n" > "This is transmitted as IPA Serial Number tag, which is used for GSUP routing (e.g. in OsmoHLR). [?] Fixed in next patch set. -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 06 Dec 2018 18:51:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 19:06:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 19:06:19 +0000 Subject: Change in osmo-bts[master]: rsl: Send PDCH ACT NACK if TCH chan is still active In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12180 ) Change subject: rsl: Send PDCH ACT NACK if TCH chan is still active ...................................................................... Patch Set 1: Code-Review+1 (3 comments) the fixing logic looks sane, but I'm still having trouble wrapping my mind around the entire issue. Also the comments sound a bit weird. https://gerrit.osmocom.org/#/c/12180/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12180/1//COMMIT_MSG at 19 PS1, Line 19: rsl.c:2103 (bts=0,trx=0,ts=3,ss=0) Tx PDCH DEACT ACK one thing I don't understand yet in the overall failure cause: is it an osmo-bsc bug? is it sending some PDCH while the ts is still active as TCH? ok wait, in this log, the TS is in PDCH mode. BSC sends a PDCH DEACT. That's quite normal and allowed; and the bug is that osmo-bts NACKs that perfectly legal situation? (I somehow wonder how my dyn TS tests when implementing it could ever work then) https://gerrit.osmocom.org/#/c/12180/1/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/#/c/12180/1/src/common/rsl.c at 2207 PS1, Line 2207: /* TCH takes preference over PDCH so allow forcing PDCH DEACT, plz explain: if a TS is in PDCH mode, sending a DEACT is not forcing anything. Doing a PDCH DEACT in PDCH is a normal expected message. Is the lchan->state not NONE in PDCH mode? I thought it is... maybe I'm confused from bsc code https://gerrit.osmocom.org/#/c/12180/1/src/common/rsl.c at 2208 PS1, Line 2208: * but forbid forcing PDCH ACT if lchan still active */ (say it without the word "forcing"?) -- To view, visit https://gerrit.osmocom.org/12180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d Gerrit-Change-Number: 12180 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Dec 2018 19:06:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 19:07:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 19:07:35 +0000 Subject: Change in osmo-trx[master]: transceiver: Log CTRL iface responses towards osmo-bts-trx In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12122 ) Change subject: transceiver: Log CTRL iface responses towards osmo-bts-trx ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8128c42e63ab1fcd2a58812f3b7cf94435b5bbd8 Gerrit-Change-Number: 12122 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Dec 2018 19:07:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 19:08:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 19:08:29 +0000 Subject: Change in docker-playground[master]: bts-test: osmo-bts.cfg: Enable extended timestamp In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12179 ) Change subject: bts-test: osmo-bts.cfg: Enable extended timestamp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic59c0d7ee0d3ce71e807364d156f6e38bc0c74d1 Gerrit-Change-Number: 12179 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 06 Dec 2018 19:08:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 19:10:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 6 Dec 2018 19:10:48 +0000 Subject: Change in osmo-trx[master]: Add CTRL log category In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12120 ) Change subject: Add CTRL log category ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12120/3/CommonLibs/debug.c File CommonLibs/debug.c: https://gerrit.osmocom.org/#/c/12120/3/CommonLibs/debug.c at 14 PS3, Line 14: .name = "DCTRL", enum value and 'name' should match. (there also is DLCTRL about the osmo ctrl interface. You're not referring to that one, right.) -- To view, visit https://gerrit.osmocom.org/12120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 Gerrit-Change-Number: 12120 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Thu, 06 Dec 2018 19:10:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 19:18:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Dec 2018 19:18:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/11897/6/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11897/6/msc/MSC_Tests.ttcn at 2000 PS6, Line 2000: timer T := 20.0; > compared to the other 10 iterations of dispatching pagings, 20s isn't that much, is it. I think the other 10 iterations wouldn't take that much time. This is not BSC, so all 10 BSSMAP Paging messages should be sent almost immediately... Am I missing something? -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Dec 2018 19:18:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 19:51:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 19:51:16 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08: Free GSM subscr conn if paging response can't be matched In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2) to the change originally created by daniel. ( https://gerrit.osmocom.org/12174 ) Change subject: gsm_04_08: Free GSM subscr conn if paging response can't be matched ...................................................................... gsm_04_08: Free GSM subscr conn if paging response can't be matched The current idea of calling gscon_release_lchans is not enough because the conn is still present. Insetad pretend we got a disconnect indication from the MSC which will call gscon_release_lchans as well as terminate the conn state machine which will clean up conn state as well. Related: OS#3680 Change-Id: Iccf5f6864ffe238189907c4bb3ea333948621b4c --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/74/12174/2 -- To view, visit https://gerrit.osmocom.org/12174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iccf5f6864ffe238189907c4bb3ea333948621b4c Gerrit-Change-Number: 12174 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 19:51:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 19:51:19 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08: Free GSM subscr conn if paging response can't be matched In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12174 ) Change subject: gsm_04_08: Free GSM subscr conn if paging response can't be matched ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iccf5f6864ffe238189907c4bb3ea333948621b4c Gerrit-Change-Number: 12174 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 06 Dec 2018 19:51:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 19:51:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 6 Dec 2018 19:51:21 +0000 Subject: Change in osmo-bsc[master]: gsm_04_08: Free GSM subscr conn if paging response can't be matched In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12174 ) Change subject: gsm_04_08: Free GSM subscr conn if paging response can't be matched ...................................................................... gsm_04_08: Free GSM subscr conn if paging response can't be matched The current idea of calling gscon_release_lchans is not enough because the conn is still present. Insetad pretend we got a disconnect indication from the MSC which will call gscon_release_lchans as well as terminate the conn state machine which will clean up conn state as well. Related: OS#3680 Change-Id: Iccf5f6864ffe238189907c4bb3ea333948621b4c --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 4be5198..f1061ef 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -951,7 +951,7 @@ /* fwd via bsc_api to send COMPLETE L3 INFO to MSC */ rc = bsc_compl_l3(lchan->conn, msg, 0); if (rc < 0) { - gscon_release_lchans(lchan->conn, true); + osmo_fsm_inst_dispatch(lchan->conn->fi, GSCON_EV_A_DISC_IND, NULL); return rc; } /* conn shall release lchan on teardown, also if this Layer 3 Complete is rejected. */ -- To view, visit https://gerrit.osmocom.org/12174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iccf5f6864ffe238189907c4bb3ea333948621b4c Gerrit-Change-Number: 12174 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 19:53:42 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Dec 2018 19:53:42 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12177 ) Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12177/3/tests/msc_vlr/Makefile.am File tests/msc_vlr/Makefile.am: https://gerrit.osmocom.org/#/c/12177/3/tests/msc_vlr/Makefile.am at 22 PS3, Line 22: osmo_gsup_client_create I think this is useless now. -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 06 Dec 2018 19:53:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 20:56:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Dec 2018 20:56:11 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: document and refactor BurstForwarder Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12181 Change subject: trx_toolkit/burst_fwd.py: document and refactor BurstForwarder ...................................................................... trx_toolkit/burst_fwd.py: document and refactor BurstForwarder Instead of having all configuration variables of BurstForwarder initialized in the class heading, let's introduce two functions for initialization (resetting to defaults) of both UL/DL params. This would allow to reset a BurstForwarder instance from the control interface in follow-up patches. Let's also introduce some basic documentation for the class fields, which were defined in the heading previously. Change-Id: I6b1bf41cf22f01a7e7ecc91c625fb0d2bf4bfeac --- M src/target/trx_toolkit/burst_fwd.py 1 file changed, 117 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/81/12181/1 diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 3834849..f3eeddd 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -4,7 +4,7 @@ # TRX Toolkit # BTS <-> BB burst forwarding # -# (C) 2017 by Vadim Yanitskiy +# (C) 2017-2018 by Vadim Yanitskiy # # All Rights Reserved # @@ -27,58 +27,136 @@ from data_msg import * class BurstForwarder: - # Timeslot filter (drop everything by default) - ts_pass = None + """ Performs burst forwarding and preprocessing between MS and BTS. - # Freq. filter - bts_freq = None - bb_freq = None + == Pass-filtering parameters - # Randomization of RSSI - randomize_dl_rssi = False - randomize_ul_rssi = False + BurstForwarder may drop or pass an UL/DL burst depending + on the following parameters: - # Randomization of ToA - randomize_dl_toa256 = False - randomize_ul_toa256 = False + - bts_freq / bb_freq - the current BTS / MS frequency + that was set using RXTUNE control command. By default, + both freq. values are set to None, so nothing is being + forwarded (i.e. bursts are getting dropped). - # Timing Advance value indicated by MS (0 by default) - # Valid range: 0..63, where each unit means - # one GSM symbol advance. - ta = 0 + FIXME: currently, we don't care about TXTUNE command + and transmit frequencies. It would be great to distinguish + between RX and TX frequencies for both BTS and MS. - # Timing of Arrival values indicated by transceiver - # in units of 1/256 of GSM symbol periods. A pair of - # base and threshold values defines a range of ToA value - # randomization: from (base - threshold) to (base + threshold). - toa256_dl_base = 0 - toa256_ul_base = 0 + - ts_pass - currently active timeslot, configured by the MS. + It can be activated or deactivated using SETSLOT control + command from the MS. - toa256_dl_threshold = 128 - toa256_ul_threshold = 128 + FIXME: only a single timeslot can be activated! + FIXME: there is no such list for the BTS side. - # RSSI values indicated by transceiver in dBm. - # A pair of base and threshold values defines a range of RSSI - # randomization: from (base - threshold) to (base + threshold). - rssi_dl_base = -60 - rssi_ul_base = -70 + == Preprocessing and measurement simulation - rssi_dl_threshold = 10 - rssi_ul_threshold = 5 + Since this is a virtual environment, we can simulate different + parameters of a virtual RF interface: - # Path loss simulation: DL/UL burst dropping - # Indicates how many bursts should be dropped - # and which dropping period is used. By default, - # period is 1, i.e. every burst (fn % 1 is always 0) - burst_dl_drop_amount = 0 - burst_ul_drop_amount = 0 - burst_dl_drop_period = 1 - burst_ul_drop_period = 1 + - ToA (Timing of Arrival) - measured difference between expected + and actual time of burst arrival in units of 1/256 of GSM symbol + periods. A pair of both base and threshold values defines a range + of ToA value randomization: + + DL: from (toa256_dl_base - toa256_dl_threshold) + to (toa256_dl_base + toa256_dl_threshold), + UL: from (toa256_ul_base - toa256_ul_threshold) + to (toa256_ul_base + toa256_ul_threshold). + + - RSSI (Received Signal Strength Indication) - measured "power" of + the signal (per burst) in dBm. A pair of both base and threshold + values defines a range of RSSI value randomization: + + DL: from (rssi_dl_base - rssi_dl_threshold) + to (rssi_dl_base + rssi_dl_threshold), + UL: from (rssi_ul_base - rssi_ul_threshold) + to (rssi_ul_base + rssi_ul_threshold). + + Please note that the randomization of both RSSI and ToA + is optional, and should be enabled manually. + + === Timing Advance handling + + The BTS is using ToA measurements for UL bursts in order to calculate + Timing Advance value, that is then indicated to a MS, which in its turn + shall apply this value to the transmitted signal in order to compensate + the delay. Basically, every burst is transmitted in advance defined by + the indicated Timing Advance value. The valid range is 0..63, where + each unit means one GSM symbol advance. The actual Timing Advance value + is set using SETTA control command from MS. By default, it's set to 0. + + === Path loss simulation - burst dropping + + In some cases, e.g. due to a weak signal or high interference, a burst + can be lost, i.e. not detected by the receiver. This can also be + simulated using FAKE_DROP command on both control interfaces: + + - burst_{dl|ul}_drop_amount - the amount of DL/UL bursts + to be dropped (i.e. not forwarded towards the MS/BTS), + + - burst_{dl|ul}_drop_period - drop every X DL/UL burst, e.g. + 1 - drop every consequent burst, 2 - drop every second burst, etc. + + """ def __init__(self, bts_link, bb_link): self.bts_link = bts_link self.bb_link = bb_link + # Randomization of RSSI + randomize_dl_rssi = False + randomize_ul_rssi = False + + # Randomization of ToA + randomize_dl_toa256 = False + randomize_ul_toa256 = False + + # Init default parameters + self.reset_dl() + self.reset_ul() + + # Initialize (or reset to) default parameters for Downlink + def reset_dl(self): + # Unset current DL freq. + self.bts_freq = None + + # Indicated RSSI / ToA values + self.toa256_dl_base = 0 + self.rssi_dl_base = -60 + + # RSSI / ToA randomization threshold + self.toa256_dl_threshold = 0 + self.rssi_dl_threshold = 0 + + # Path loss simulation (burst dropping) + self.burst_dl_drop_amount = 0 + self.burst_dl_drop_period = 1 + + # Initialize (or reset to) default parameters for Uplink + def reset_ul(self): + # Unset current DL freq. + self.bb_freq = None + + # Indicated RSSI / ToA values + self.rssi_ul_base = -70 + self.toa256_ul_base = 0 + + # RSSI / ToA randomization threshold + self.toa256_ul_threshold = 0 + self.rssi_ul_threshold = 0 + + # Path loss simulation (burst dropping) + self.burst_ul_drop_amount = 0 + self.burst_ul_drop_period = 1 + + # Init timeslot filter (drop everything by default) + self.ts_pass = None + + # Reset Timing Advance value + self.ta = 0 + # Converts TA value from symbols to # units of 1/256 of GSM symbol periods def calc_ta256(self): -- To view, visit https://gerrit.osmocom.org/12181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6b1bf41cf22f01a7e7ecc91c625fb0d2bf4bfeac Gerrit-Change-Number: 12181 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 20:56:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Dec 2018 20:56:12 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: properly pass-filter multiple time-slots Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12182 Change subject: trx_toolkit/burst_fwd.py: properly pass-filter multiple time-slots ...................................................................... trx_toolkit/burst_fwd.py: properly pass-filter multiple time-slots Previously it was only possible to configure a single time-slot that would be pass-filtered by a BurstForwarder instance. In some applications it would be useful to configure multiple time-slots, so let's refactor the time-slot pass-filtering algorithm. Change-Id: Ie1490adaf7a7c62c966aeb60c1898eaf3b5a1e84 --- M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/ctrl_if_bb.py 2 files changed, 19 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/82/12182/1 diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index f3eeddd..746b281 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -43,11 +43,10 @@ and transmit frequencies. It would be great to distinguish between RX and TX frequencies for both BTS and MS. - - ts_pass - currently active timeslot, configured by the MS. - It can be activated or deactivated using SETSLOT control - command from the MS. + - ts_pass_list - the list of active (i.e. configured) + timeslot numbers for the MS. A timeslot can be activated + or deactivated using SETSLOT control command from the MS. - FIXME: only a single timeslot can be activated! FIXME: there is no such list for the BTS side. == Preprocessing and measurement simulation @@ -152,7 +151,7 @@ self.burst_ul_drop_period = 1 # Init timeslot filter (drop everything by default) - self.ts_pass = None + self.ts_pass_list = [] # Reset Timing Advance value self.ta = 0 @@ -288,7 +287,7 @@ return None # Timeslot filter - if msg.tn != self.ts_pass: + if msg.tn not in self.ts_pass_list: return None # Path loss simulation diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index 3528c98..97a3d9d 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -109,9 +109,21 @@ # TS activation / deactivation # We don't care about ts_type if ts_type == 0: - self.burst_fwd.ts_pass = None + # Deactivate TS (remove from TS pass-filter list) + if ts in self.burst_fwd.ts_pass_list: + self.burst_fwd.ts_pass_list.remove(ts) + else: + print("[!] TS %u was not activated before" % ts) + # TODO: uncomment as soon as RESET is introduced + # return -1 else: - self.burst_fwd.ts_pass = ts + # Activate TS (add to TS pass-filter list) + if ts not in self.burst_fwd.ts_pass_list: + self.burst_fwd.ts_pass_list.append(ts) + else: + print("[!] TS %u was already activated before" % ts) + # TODO: uncomment as soon as RESET is introduced + # return -1 return 0 -- To view, visit https://gerrit.osmocom.org/12182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1490adaf7a7c62c966aeb60c1898eaf3b5a1e84 Gerrit-Change-Number: 12182 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 20:56:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Dec 2018 20:56:12 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: also pass-filter UL bursts by time-slot Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12183 Change subject: trx_toolkit/burst_fwd.py: also pass-filter UL bursts by time-slot ...................................................................... trx_toolkit/burst_fwd.py: also pass-filter UL bursts by time-slot For some reason, the time-slot pass-filtering was only done for DL bursts, but not for UL bursts. BurstForwarder shall not pass UL bursts for unconfigured time-slots too. Let's also print a warning if an UL burst is sent on a not configured time-slot, i.e. before sending SETSLOT command. Change-Id: Idb7f5b212e5814aeff8ca8bc875ad066674267cd --- M src/target/trx_toolkit/burst_fwd.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/83/12183/1 diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 746b281..6e79d44 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -326,6 +326,11 @@ if msg is None: return None + # Timeslot filter + if msg.tn not in self.ts_pass_list: + print("[!] TS %u is not configured, dropping UL burst..." % msg.tn) + return None + # Path loss simulation msg = self.path_loss_sim_ul(msg) if msg is None: -- To view, visit https://gerrit.osmocom.org/12183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idb7f5b212e5814aeff8ca8bc875ad066674267cd Gerrit-Change-Number: 12183 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 6 20:56:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 6 Dec 2018 20:56:12 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: drop randomization related cmd options Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12184 Change subject: trx_toolkit/fake_trx.py: drop randomization related cmd options ...................................................................... trx_toolkit/fake_trx.py: drop randomization related cmd options The randomization of both UL/DL RSSI and ToA values is optional, and can be configured from the control interface (see both FAKE_RSSI and FAKE_TOA commands). The command line options for enabling / disabling the randomization were redundant, so let's get rid of them and check if the corresponding treshold value is set. Change-Id: I6adc13b8989ade2fab895673525c0ca17bf9b3f2 --- M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/fake_trx.py 2 files changed, 6 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/84/12184/1 diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 6e79d44..31f882e 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -74,7 +74,7 @@ to (rssi_ul_base + rssi_ul_threshold). Please note that the randomization of both RSSI and ToA - is optional, and should be enabled manually. + is optional, and can be enabled from the control interface. === Timing Advance handling @@ -104,14 +104,6 @@ self.bts_link = bts_link self.bb_link = bb_link - # Randomization of RSSI - randomize_dl_rssi = False - randomize_ul_rssi = False - - # Randomization of ToA - randomize_dl_toa256 = False - randomize_ul_toa256 = False - # Init default parameters self.reset_dl() self.reset_ul() @@ -164,7 +156,7 @@ # Calculates a random ToA value for Downlink bursts def calc_dl_toa256(self): # Check if randomization is required - if not self.randomize_dl_toa256: + if self.toa256_dl_threshold is 0: return self.toa256_dl_base # Calculate a range for randomization @@ -179,7 +171,7 @@ # Calculates a random ToA value for Uplink bursts def calc_ul_toa256(self): # Check if randomization is required - if not self.randomize_ul_toa256: + if self.toa256_ul_threshold is 0: return self.toa256_ul_base # Calculate a range for randomization @@ -194,7 +186,7 @@ # Calculates a random RSSI value for Downlink bursts def calc_dl_rssi(self): # Check if randomization is required - if not self.randomize_dl_rssi: + if self.rssi_dl_threshold is 0: return self.rssi_dl_base # Calculate a range for randomization @@ -207,7 +199,7 @@ # Calculates a random RSSI value for Uplink bursts def calc_ul_rssi(self): # Check if randomization is required - if not self.randomize_ul_rssi: + if self.rssi_ul_threshold is 0: return self.rssi_ul_base # Calculate a range for randomization diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index b818b2a..d99186b 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -46,12 +46,6 @@ bts_base_port = 5700 bb_base_port = 6700 - # BurstForwarder field randomization - randomize_dl_toa256 = False - randomize_ul_toa256 = False - randomize_dl_rssi = False - randomize_ul_rssi = False - def __init__(self): print_copyright(CR_HOLDERS) self.parse_argv() @@ -85,10 +79,6 @@ # BTS <-> BB burst forwarding self.burst_fwd = BurstForwarder(self.bts_data, self.bb_data) - self.burst_fwd.randomize_dl_toa256 = self.randomize_dl_toa256 - self.burst_fwd.randomize_ul_toa256 = self.randomize_ul_toa256 - self.burst_fwd.randomize_dl_rssi = self.randomize_dl_rssi - self.burst_fwd.randomize_ul_rssi = self.randomize_ul_rssi # Share a BurstForwarder instance between BTS and BB self.bts_ctrl.burst_fwd = self.burst_fwd @@ -144,13 +134,7 @@ " -r --bb-addr Set BB remote address (default %s)\n" \ " -P --bts-base-port Set BTS base port number (default %d)\n" \ " -p --bb-base-port Set BB base port number (default %d)\n" \ - " -b --trx-bind-addr Set TRX bind address (default %s)\n\n" - - s += " Simulation\n" \ - " --rand-dl-rssi Enable DL RSSI randomization\n" \ - " --rand-ul-rssi Enable UL RSSI randomization\n" \ - " --rand-dl-toa Enable DL ToA randomization\n" \ - " --rand-ul-toa Enable UL ToA randomization\n" + " -b --trx-bind-addr Set TRX bind address (default %s)\n" print(s % (self.bts_addr, self.bb_addr, self.bts_base_port, self.bb_base_port, @@ -168,8 +152,6 @@ "bts-addr=", "bb-addr=", "bts-base-port=", "bb-base-port=", "trx-bind-addr=", - "rand-dl-rssi", "rand-ul-rssi", - "rand-dl-toa", "rand-ul-toa", ]) except getopt.GetoptError as err: self.print_help("[!] " + str(err)) @@ -193,16 +175,6 @@ elif o in ("-b", "--trx-bind-addr"): self.trx_bind_addr = v - # Message field randomization - elif o == "rand-dl-rssi": - self.randomize_dl_rssi = True - elif o == "rand-ul-rssi": - self.randomize_ul_rssi = True - elif o == "rand-dl-toa": - self.randomize_dl_toa256 = True - elif o == "rand-ul-toa": - self.randomize_ul_toa256 = True - # Ensure there is no overlap between ports if self.bts_base_port == self.bb_base_port: self.print_help("[!] BTS and BB base ports should be different") -- To view, visit https://gerrit.osmocom.org/12184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6adc13b8989ade2fab895673525c0ca17bf9b3f2 Gerrit-Change-Number: 12184 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 03:07:54 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 03:07:54 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: use generic logging module instead of print() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12185 Change subject: trx_toolkit: use generic logging module instead of print() ...................................................................... trx_toolkit: use generic logging module instead of print() There are multiple advantages of using Python's logging module: - advanced message formatting (file name, line number, etc.), - multiple logging targets (e.g. stderr, file, socket), - logging levels (e.g. DEBUG, INFO, ERROR), - the pythonic way ;) so, let's replace multiple print() calls by logging calls, add use the following logging message format by default: [%(levelname)s] %(filename)s:%(lineno)d %(message)s Examples: [INFO] ctrl_if_bts.py:57 Starting transceiver... [DEBUG] clck_gen.py:87 IND CLOCK 26826 [DEBUG] ctrl_if_bts.py:71 Recv POWEROFF cmd [INFO] ctrl_if_bts.py:73 Stopping transceiver... [INFO] fake_trx.py:127 Shutting down... Please note that there is no way to filter messages by logging level yet. This is to be introduced soon, together with argparse. Change-Id: I7fcafabafe8323b58990997a47afdd48b6d1f357 --- M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/burst_gen.py M src/target/trx_toolkit/burst_send.py M src/target/trx_toolkit/clck_gen.py M src/target/trx_toolkit/ctrl_cmd.py M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/ctrl_if_bb.py M src/target/trx_toolkit/ctrl_if_bts.py M src/target/trx_toolkit/data_dump.py M src/target/trx_toolkit/data_msg.py M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/trx_sniff.py 12 files changed, 145 insertions(+), 95 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/85/12185/1 diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 31f882e..3cb6acd 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -22,6 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import logging as log import random from data_msg import * @@ -214,7 +215,7 @@ # Burst dropping if self.burst_dl_drop_amount > 0: if msg.fn % self.burst_dl_drop_period == 0: - print("[~] Simulation: dropping DL burst (fn=%u %% %u == 0)" + log.info("Simulation: dropping DL burst (fn=%u %% %u == 0)" % (msg.fn, self.burst_dl_drop_period)) self.burst_dl_drop_amount -= 1 return None @@ -226,7 +227,7 @@ # Burst dropping if self.burst_ul_drop_amount > 0: if msg.fn % self.burst_ul_drop_period == 0: - print("[~] Simulation: dropping UL burst (fn=%u %% %u == 0)" + log.info("Simulation: dropping UL burst (fn=%u %% %u == 0)" % (msg.fn, self.burst_ul_drop_period)) self.burst_ul_drop_amount -= 1 return None @@ -254,7 +255,7 @@ msg_l12trx = DATAMSG_L12TRX() msg_l12trx.parse_msg(bytearray(msg_raw)) except: - print("[!] Dropping unhandled DL message...") + log.error("Dropping unhandled DL message...") return None # Compose a new message for L1 @@ -320,7 +321,7 @@ # Timeslot filter if msg.tn not in self.ts_pass_list: - print("[!] TS %u is not configured, dropping UL burst..." % msg.tn) + log.warning("TS %u is not configured, dropping UL burst..." % msg.tn) return None # Path loss simulation diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index d83f137..9a17ffa 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -26,6 +26,7 @@ from copyright import print_copyright CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +import logging as log import signal import getopt import sys @@ -64,6 +65,10 @@ # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Open requested capture file if self.output_file is not None: self.ddf = DATADumpFile(self.output_file) @@ -130,7 +135,7 @@ # Set burst msg.burst = burst - print("[i] Sending %d/%d %s burst %s to %s..." + log.info("Sending %d/%d %s burst %s to %s..." % (i + 1, self.burst_count, self.burst_type, msg.desc_hdr(), self.conn_mode)) @@ -239,7 +244,7 @@ sys.exit(2) def sig_handler(self, signum, frame): - print("Signal %d received" % signum) + log.info("Signal %d received" % signum) if signum is signal.SIGINT: sys.exit(0) diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index f6c85ba..787e0fc 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -25,6 +25,7 @@ from copyright import print_copyright CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +import logging as log import signal import getopt import sys @@ -60,6 +61,10 @@ # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Open requested capture file self.ddf = DATADumpFile(self.capture_file) @@ -88,7 +93,7 @@ if not self.msg_pass_filter(l12trx, msg): continue - print("[i] Sending a burst %s to %s..." + log.info("Sending a burst %s to %s..." % (msg.desc_hdr(), self.conn_mode)) # Send message @@ -209,7 +214,7 @@ sys.exit(2) def sig_handler(self, signum, frame): - print("Signal %d received" % signum) + log.info("Signal %d received" % signum) if signum is signal.SIGINT: sys.exit(0) diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index b488770..56207f4 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -25,6 +25,7 @@ from copyright import print_copyright CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +import logging as log import signal import time import sys @@ -83,7 +84,7 @@ link.send(payload) # Debug print - print("[T] %s" % payload) + log.debug(payload) # Increase frame count self.clck_src += self.ind_period @@ -101,13 +102,17 @@ # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + def run(self): self.link = UDPLink("127.0.0.1", 5800, "0.0.0.0", 5700) self.clck = CLCKGen([self.link], ind_period = 51) self.clck.start() def sig_handler(self, signum, frame): - print("Signal %d received" % signum) + log.info("Signal %d received" % signum) if signum is signal.SIGINT: self.clck.stop() diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py index e56105a..ec683be 100755 --- a/src/target/trx_toolkit/ctrl_cmd.py +++ b/src/target/trx_toolkit/ctrl_cmd.py @@ -26,6 +26,7 @@ from copyright import print_copyright CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +import logging as log import signal import getopt import select @@ -48,12 +49,16 @@ # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Init UDP connection self.ctrl_link = UDPLink(self.remote_addr, self.base_port + 1, self.bind_addr, self.bind_port) # Debug print - print("[i] Init CTRL interface (%s)" \ + log.info("Init CTRL interface (%s)" \ % self.ctrl_link.desc_link()) def print_help(self, msg = None): @@ -138,7 +143,7 @@ sys.stdout.flush() def sig_handler(self, signum, frame): - print("\n\nSignal %d received" % signum) + log.info("Signal %d received" % signum) if signum is signal.SIGINT: sys.exit(0) diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py index 1e569a6..b533746 100644 --- a/src/target/trx_toolkit/ctrl_if.py +++ b/src/target/trx_toolkit/ctrl_if.py @@ -22,12 +22,14 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import logging as log + from udp_link import UDPLink class CTRLInterface(UDPLink): def handle_rx(self, data, remote): if not self.verify_req(data): - print("[!] Wrong data on CTRL interface") + log.error("Wrong data on CTRL interface") return # Attempt to parse a command diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index 97a3d9d..aaa12f1 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -22,6 +22,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import logging as log + from ctrl_if import CTRLInterface class CTRLInterfaceBB(CTRLInterface): @@ -34,37 +36,37 @@ def __init__(self, remote_addr, remote_port, bind_addr, bind_port): CTRLInterface.__init__(self, remote_addr, remote_port, bind_addr, bind_port) - print("[i] Init CTRL interface for BB (%s)" % self.desc_link()) + log.info("Init CTRL interface for BB (%s)" % self.desc_link()) def parse_cmd(self, request): # Power control if self.verify_cmd(request, "POWERON", 0): - print("[i] Recv POWERON CMD") + log.debug("Recv POWERON CMD") # Ensure transceiver isn't working if self.trx_started: - print("[!] Transceiver already started") + log.error("Transceiver already started") return -1 # Ensure RX / TX freq. are set if (self.rx_freq is None) or (self.tx_freq is None): - print("[!] RX / TX freq. are not set") + log.error("RX / TX freq. are not set") return -1 - print("[i] Starting transceiver...") + log.info("Starting transceiver...") self.trx_started = True return 0 elif self.verify_cmd(request, "POWEROFF", 0): - print("[i] Recv POWEROFF cmd") + log.debug("Recv POWEROFF cmd") - print("[i] Stopping transceiver...") + log.info("Stopping transceiver...") self.trx_started = False return 0 # Tuning Control elif self.verify_cmd(request, "RXTUNE", 1): - print("[i] Recv RXTUNE cmd") + log.debug("Recv RXTUNE cmd") # TODO: check freq range self.rx_freq = int(request[1]) * 1000 @@ -72,7 +74,7 @@ return 0 elif self.verify_cmd(request, "TXTUNE", 1): - print("[i] Recv TXTUNE cmd") + log.debug("Recv TXTUNE cmd") # TODO: check freq range self.tx_freq = int(request[1]) * 1000 @@ -80,7 +82,7 @@ # Power measurement elif self.verify_cmd(request, "MEASURE", 1): - print("[i] Recv MEASURE cmd") + log.debug("Recv MEASURE cmd") if self.pm is None: return -1 @@ -92,7 +94,7 @@ return (0, [meas_dbm]) elif self.verify_cmd(request, "SETSLOT", 2): - print("[i] Recv SETSLOT cmd") + log.debug("Recv SETSLOT cmd") if self.burst_fwd is None: return -1 @@ -100,7 +102,7 @@ # Obtain TS index ts = int(request[1]) if ts not in range(0, 8): - print("[!] TS index should be in range: 0..7") + log.error("TS index should be in range: 0..7") return -1 # Parse TS type @@ -113,7 +115,7 @@ if ts in self.burst_fwd.ts_pass_list: self.burst_fwd.ts_pass_list.remove(ts) else: - print("[!] TS %u was not activated before" % ts) + log.warning("TS %u was not activated before" % ts) # TODO: uncomment as soon as RESET is introduced # return -1 else: @@ -121,7 +123,7 @@ if ts not in self.burst_fwd.ts_pass_list: self.burst_fwd.ts_pass_list.append(ts) else: - print("[!] TS %u was already activated before" % ts) + log.warning("TS %u was already activated before" % ts) # TODO: uncomment as soon as RESET is introduced # return -1 @@ -129,7 +131,7 @@ # Timing Advance elif self.verify_cmd(request, "SETTA", 1): - print("[i] Recv SETTA cmd") + log.debug("Recv SETTA cmd") # Save to the BurstForwarder instance self.burst_fwd.ta = ta @@ -138,7 +140,7 @@ # Timing of Arrival simulation for Uplink # Absolute form: CMD FAKE_TOA elif self.verify_cmd(request, "FAKE_TOA", 2): - print("[i] Recv FAKE_TOA cmd") + log.debug("Recv FAKE_TOA cmd") # Parse and apply both base and threshold self.burst_fwd.toa256_ul_base = int(request[1]) @@ -149,7 +151,7 @@ # Timing of Arrival simulation for Uplink # Relative form: CMD FAKE_TOA <+-BASE_DELTA> elif self.verify_cmd(request, "FAKE_TOA", 1): - print("[i] Recv FAKE_TOA cmd") + log.debug("Recv FAKE_TOA cmd") # Parse and apply delta self.burst_fwd.toa256_ul_base += int(request[1]) @@ -159,7 +161,7 @@ # RSSI simulation for Uplink # Absolute form: CMD FAKE_RSSI elif self.verify_cmd(request, "FAKE_RSSI", 2): - print("[i] Recv FAKE_RSSI cmd") + log.debug("Recv FAKE_RSSI cmd") # Parse and apply both base and threshold self.burst_fwd.rssi_ul_base = int(request[1]) @@ -170,7 +172,7 @@ # RSSI simulation for Uplink # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> elif self.verify_cmd(request, "FAKE_RSSI", 1): - print("[i] Recv FAKE_RSSI cmd") + log.debug("Recv FAKE_RSSI cmd") # Parse and apply delta self.burst_fwd.rssi_ul_base += int(request[1]) @@ -181,12 +183,12 @@ # Syntax: CMD FAKE_DROP # Dropping pattern: fn % 1 == 0 elif self.verify_cmd(request, "FAKE_DROP", 1): - print("[i] Recv FAKE_DROP cmd") + log.debug("Recv FAKE_DROP cmd") # Parse / validate amount of bursts num = int(request[1]) if num < 0: - print("[!] FAKE_DROP amount shall not be negative") + log.error("FAKE_DROP amount shall not be negative") return -1 self.burst_fwd.burst_ul_drop_amount = num @@ -198,18 +200,18 @@ # Syntax: CMD FAKE_DROP # Dropping pattern: fn % period == 0 elif self.verify_cmd(request, "FAKE_DROP", 2): - print("[i] Recv FAKE_DROP cmd") + log.debug("Recv FAKE_DROP cmd") # Parse / validate amount of bursts num = int(request[1]) if num < 0: - print("[!] FAKE_DROP amount shall not be negative") + log.error("FAKE_DROP amount shall not be negative") return -1 # Parse / validate period period = int(request[2]) if period <= 0: - print("[!] FAKE_DROP period shall be greater than zero") + log.error("FAKE_DROP period shall be greater than zero") return -1 self.burst_fwd.burst_ul_drop_amount = num @@ -221,5 +223,5 @@ else: # We don't care about other commands, # so let's merely ignore them ;) - print("[i] Ignore CMD %s" % request[0]) + log.debug("Ignore CMD %s" % request[0]) return 0 diff --git a/src/target/trx_toolkit/ctrl_if_bts.py b/src/target/trx_toolkit/ctrl_if_bts.py index 6ac8ffb..2dde3e3 100644 --- a/src/target/trx_toolkit/ctrl_if_bts.py +++ b/src/target/trx_toolkit/ctrl_if_bts.py @@ -22,6 +22,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import logging as log + from ctrl_if import CTRLInterface class CTRLInterfaceBTS(CTRLInterface): @@ -35,24 +37,24 @@ def __init__(self, remote_addr, remote_port, bind_addr, bind_port): CTRLInterface.__init__(self, remote_addr, remote_port, bind_addr, bind_port) - print("[i] Init CTRL interface for BTS (%s)" % self.desc_link()) + log.info("Init CTRL interface for BTS (%s)" % self.desc_link()) def parse_cmd(self, request): # Power control if self.verify_cmd(request, "POWERON", 0): - print("[i] Recv POWERON CMD") + log.debug("Recv POWERON CMD") # Ensure transceiver isn't working if self.trx_started: - print("[!] Transceiver already started") + log.error("Transceiver already started") return -1 # Ensure RX / TX freq. are set if (self.rx_freq is None) or (self.tx_freq is None): - print("[!] RX / TX freq. are not set") + log.error("RX / TX freq. are not set") return -1 - print("[i] Starting transceiver...") + log.info("Starting transceiver...") self.trx_started = True # Power emulation @@ -66,9 +68,9 @@ return 0 elif self.verify_cmd(request, "POWEROFF", 0): - print("[i] Recv POWEROFF cmd") + log.debug("Recv POWEROFF cmd") - print("[i] Stopping transceiver...") + log.info("Stopping transceiver...") self.trx_started = False # Power emulation @@ -83,14 +85,14 @@ # Tuning Control elif self.verify_cmd(request, "RXTUNE", 1): - print("[i] Recv RXTUNE cmd") + log.debug("Recv RXTUNE cmd") # TODO: check freq range self.rx_freq = int(request[1]) * 1000 return 0 elif self.verify_cmd(request, "TXTUNE", 1): - print("[i] Recv TXTUNE cmd") + log.debug("Recv TXTUNE cmd") # TODO: check freq range self.tx_freq = int(request[1]) * 1000 @@ -100,7 +102,7 @@ # Timing of Arrival simulation for Downlink # Absolute form: CMD FAKE_TOA elif self.verify_cmd(request, "FAKE_TOA", 2): - print("[i] Recv FAKE_TOA cmd") + log.debug("Recv FAKE_TOA cmd") # Parse and apply both base and threshold self.burst_fwd.toa256_dl_base = int(request[1]) @@ -111,7 +113,7 @@ # Timing of Arrival simulation for Downlink # Relative form: CMD FAKE_TOA <+-BASE_DELTA> elif self.verify_cmd(request, "FAKE_TOA", 1): - print("[i] Recv FAKE_TOA cmd") + log.debug("Recv FAKE_TOA cmd") # Parse and apply delta self.burst_fwd.toa256_dl_base += int(request[1]) @@ -121,7 +123,7 @@ # RSSI simulation for Downlink # Absolute form: CMD FAKE_RSSI elif self.verify_cmd(request, "FAKE_RSSI", 2): - print("[i] Recv FAKE_RSSI cmd") + log.debug("Recv FAKE_RSSI cmd") # Parse and apply both base and threshold self.burst_fwd.rssi_dl_base = int(request[1]) @@ -132,7 +134,7 @@ # RSSI simulation for Downlink # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> elif self.verify_cmd(request, "FAKE_RSSI", 1): - print("[i] Recv FAKE_RSSI cmd") + log.debug("Recv FAKE_RSSI cmd") # Parse and apply delta self.burst_fwd.rssi_dl_base += int(request[1]) @@ -143,12 +145,12 @@ # Syntax: CMD FAKE_DROP # Dropping pattern: fn % 1 == 0 elif self.verify_cmd(request, "FAKE_DROP", 1): - print("[i] Recv FAKE_DROP cmd") + log.debug("Recv FAKE_DROP cmd") # Parse / validate amount of bursts num = int(request[1]) if num < 0: - print("[!] FAKE_DROP amount shall not be negative") + log.error("FAKE_DROP amount shall not be negative") return -1 self.burst_fwd.burst_dl_drop_amount = num @@ -160,18 +162,18 @@ # Syntax: CMD FAKE_DROP # Dropping pattern: fn % period == 0 elif self.verify_cmd(request, "FAKE_DROP", 2): - print("[i] Recv FAKE_DROP cmd") + log.debug("Recv FAKE_DROP cmd") # Parse / validate amount of bursts num = int(request[1]) if num < 0: - print("[!] FAKE_DROP amount shall not be negative") + log.error("FAKE_DROP amount shall not be negative") return -1 # Parse / validate period period = int(request[2]) if period <= 0: - print("[!] FAKE_DROP period shall be greater than zero") + log.error("FAKE_DROP period shall be greater than zero") return -1 self.burst_fwd.burst_dl_drop_amount = num @@ -183,5 +185,5 @@ else: # We don't care about other commands, # so let's merely ignore them ;) - print("[i] Ignore CMD %s" % request[0]) + log.debug("Ignore CMD %s" % request[0]) return 0 diff --git a/src/target/trx_toolkit/data_dump.py b/src/target/trx_toolkit/data_dump.py index 1d7805e..71e1261 100644 --- a/src/target/trx_toolkit/data_dump.py +++ b/src/target/trx_toolkit/data_dump.py @@ -22,6 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import logging as log import struct from data_msg import * @@ -77,13 +78,15 @@ def __init__(self, capture): # Check if capture file is already opened if isinstance(capture, str): - print("[i] Opening capture file '%s'..." % capture) + log.info("Opening capture file '%s'..." % capture) self.f = open(capture, "a+b") else: self.f = capture def __del__(self): - print("[i] Closing the capture file") + # FIXME: this causes an Exception in Python 2 (but not in Python 3) + # AttributeError: 'NoneType' object has no attribute 'info' + log.info("Closing the capture file") self.f.close() # Moves the file descriptor before a specified message @@ -104,7 +107,7 @@ # Attempt to parse it rc = self.parse_hdr(hdr_raw) if rc is False: - print("[!] Couldn't parse a message header") + log.error("Couldn't parse a message header") return False # Expand the header @@ -129,7 +132,7 @@ # Attempt to parse it rc = self.parse_hdr(hdr_raw) if rc is False: - print("[!] Couldn't parse a message header") + log.error("Couldn't parse a message header") return None # Expand the header @@ -138,7 +141,7 @@ # Attempt to read a message msg_raw = self.f.read(msg_len) if len(msg_raw) != msg_len: - print("[!] Message length mismatch") + log.error("Message length mismatch") return None # Attempt to parse a message @@ -146,7 +149,7 @@ msg_raw = bytearray(msg_raw) msg.parse_msg(msg_raw) except: - print("[!] Couldn't parse a message, skipping...") + log.error("Couldn't parse a message, skipping...") return False # Success @@ -161,7 +164,7 @@ # Move descriptor to the begining of requested message rc = self._seek2msg(idx) if not rc: - print("[!] Couldn't find requested message") + log.error("Couldn't find requested message") return False # Attempt to parse a message @@ -181,7 +184,7 @@ else: rc = self._seek2msg(skip) if not rc: - print("[!] Couldn't find requested message") + log.error("Couldn't find requested message") return False # Read the capture in loop... @@ -224,6 +227,10 @@ from gsm_shared import * import random + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Create a temporary file tf = TemporaryFile() @@ -242,7 +249,7 @@ burst_trx2l1.append(sbit) # Generate a basic list of random messages - print("[i] Generating the reference messages") + log.info("Generating the reference messages") messages_ref = [] for i in range(100): @@ -260,9 +267,9 @@ # Append messages_ref.append(msg) - print("[i] Adding the following messages to the capture:") + log.info("Adding the following messages to the capture:") for msg in messages_ref[:3]: - print(" %s: burst_len=%d" + log.info("%s: burst_len=%d" % (msg.desc_hdr(), len(msg.burst))) # Check single message appending @@ -273,9 +280,9 @@ # Read the written messages back messages_check = ddf.parse_all() - print("[i] Read the following messages back:") + log.info("Read the following messages back:") for msg in messages_check: - print(" %s: burst_len=%d" + log.info("%s: burst_len=%d" % (msg.desc_hdr(), len(msg.burst))) # Expecting three messages @@ -291,7 +298,7 @@ # Validate a message assert(messages_check[i].validate()) - print("[?] Check append_msg(): OK") + log.info("Check append_msg(): OK") # Append the pending reference messages @@ -313,7 +320,7 @@ # Validate a message assert(messages_check[i].validate()) - print("[?] Check append_all(): OK") + log.info("Check append_all(): OK") # Check parse_msg() @@ -336,7 +343,7 @@ assert(msg0.validate()) assert(msg10.validate()) - print("[?] Check parse_msg(): OK") + log.info("Check parse_msg(): OK") # Check parse_all() with range @@ -357,4 +364,4 @@ # Validate a message assert(messages_check[i].validate()) - print("[?] Check parse_all(): OK") + log.info("Check parse_all(): OK") diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index ea415ab..95ec9dc 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -431,6 +431,12 @@ # Regression test if __name__ == '__main__': + import logging as log + + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Common reference data fn = 1024 tn = 0 @@ -446,7 +452,7 @@ sbit = random.randint(-127, 127) burst_trx2l1_ref.append(sbit) - print("[i] Generating the reference messages") + log.info("Generating the reference messages") # Create messages of both types msg_l12trx_ref = DATAMSG_L12TRX(fn = fn, tn = tn) @@ -461,13 +467,13 @@ msg_l12trx_ref.burst = burst_l12trx_ref msg_trx2l1_ref.burst = burst_trx2l1_ref - print("[i] Encoding the reference messages") + log.info("Encoding the reference messages") # Encode DATA messages l12trx_raw = msg_l12trx_ref.gen_msg() trx2l1_raw = msg_trx2l1_ref.gen_msg() - print("[i] Parsing generated messages back") + log.info("Parsing generated messages back") # Parse generated DATA messages msg_l12trx_dec = DATAMSG_L12TRX() @@ -475,13 +481,13 @@ msg_l12trx_dec.parse_msg(l12trx_raw) msg_trx2l1_dec.parse_msg(trx2l1_raw) - print("[i] Comparing decoded messages with the reference") + log.info("Comparing decoded messages with the reference") # Compare bursts assert(msg_l12trx_dec.burst == burst_l12trx_ref) assert(msg_trx2l1_dec.burst == burst_trx2l1_ref) - print("[?] Compare bursts: OK") + log.info("Compare bursts: OK") # Compare both parsed messages with the reference data assert(msg_l12trx_dec.fn == fn) @@ -489,14 +495,14 @@ assert(msg_l12trx_dec.tn == tn) assert(msg_trx2l1_dec.tn == tn) - print("[?] Compare FN / TN: OK") + log.info("Compare FN / TN: OK") # Compare message specific parts assert(msg_trx2l1_dec.rssi == msg_trx2l1_ref.rssi) assert(msg_l12trx_dec.pwr == msg_l12trx_ref.pwr) assert(msg_trx2l1_dec.toa256 == msg_trx2l1_ref.toa256) - print("[?] Compare message specific data: OK") + log.info("Compare message specific data: OK") # Validate header randomization for i in range(0, 100): @@ -506,7 +512,7 @@ assert(msg_l12trx_ref.validate()) assert(msg_trx2l1_ref.validate()) - print("[?] Validate header randomization: OK") + log.info("Validate header randomization: OK") # Bit conversation test usbits_ref = list(range(0, 256)) @@ -518,7 +524,7 @@ assert(usbits[:255] == usbits_ref[:255]) assert(usbits[255] == 254) - print("[?] Check both usbit2sbit() and sbit2usbit(): OK") + log.info("Check both usbit2sbit() and sbit2usbit(): OK") # Test both sbit2ubit() and ubit2sbit() ubits = msg_trx2l1_ref.sbit2ubit(sbits_ref) @@ -527,7 +533,7 @@ sbits = msg_trx2l1_ref.ubit2sbit(ubits) assert(sbits == ([-127] * 127 + [127] * 128)) - print("[?] Check both sbit2ubit() and ubit2sbit(): OK") + log.info("Check both sbit2ubit() and ubit2sbit(): OK") # Test message transformation msg_l12trx_dec = msg_trx2l1_ref.gen_l12trx() @@ -542,4 +548,4 @@ assert(msg_l12trx_dec.burst == msg_l12trx_dec.sbit2ubit(burst_trx2l1_ref)) assert(msg_trx2l1_dec.burst == msg_trx2l1_dec.ubit2sbit(burst_l12trx_ref)) - print("[?] Check L12TRX <-> TRX2L1 type transformations: OK") + log.info("Check L12TRX <-> TRX2L1 type transformations: OK") diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index d99186b..ced1238 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -25,6 +25,7 @@ from copyright import print_copyright CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +import logging as log import signal import getopt import select @@ -53,6 +54,10 @@ # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + def run(self): # Init TRX CTRL interface for BTS self.bts_ctrl = CTRLInterfaceBTS(self.bts_addr, self.bts_base_port + 101, @@ -90,7 +95,7 @@ self.clck_gen = CLCKGen([self.bts_clck]) self.bts_ctrl.clck_gen = self.clck_gen - print("[i] Init complete") + log.info("Init complete") # Enter main loop while True: @@ -119,7 +124,7 @@ self.bb_ctrl.handle_rx(data.decode(), addr) def shutdown(self): - print("[i] Shutting down...") + log.info("Shutting down...") # Stop clock generator self.clck_gen.stop() @@ -198,7 +203,7 @@ sys.exit(2) def sig_handler(self, signum, frame): - print("Signal %d received" % signum) + log.info("Signal %d received" % signum) if signum is signal.SIGINT: self.shutdown() sys.exit(0) diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 535bb3f..9850983 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -25,6 +25,7 @@ from copyright import print_copyright CR_HOLDERS = [("2018", "Vadim Yanitskiy ")] +import logging as log import signal import getopt import sys @@ -67,6 +68,10 @@ print_copyright(CR_HOLDERS) self.parse_argv() + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Open requested capture file if self.output_file is not None: self.ddf = DATADumpFile(self.output_file) @@ -76,7 +81,7 @@ pkt_filter = "udp and (port %d or port %d)" \ % (self.sniff_base_port + 2, self.sniff_base_port + 102) - print("[i] Listening on interface '%s'..." % self.sniff_interface) + log.info("Listening on interface '%s'..." % self.sniff_interface) # Start sniffing... scapy.all.sniff(iface = self.sniff_interface, store = 0, @@ -110,7 +115,7 @@ try: msg.parse_msg(msg_raw) except: - print("[!] Failed to parse message, dropping...") + log.warning("Failed to parse message, dropping...") self.cnt_burst_dropped_num += 1 return @@ -121,7 +126,7 @@ return # Debug print - print("[i] %s burst: %s" \ + log.debug("%s burst: %s" \ % ("L1 -> TRX" if l12trx else "TRX -> L1", msg.desc_hdr())) # Poke message handler @@ -177,22 +182,22 @@ # Stop sniffing after N bursts if self.cnt_burst_break is not None: if self.cnt_burst_num == self.cnt_burst_break: - print("[i] Collected required amount of bursts") + log.info("Collected required amount of bursts") return True # Stop sniffing after N frames if self.cnt_frame_break is not None: if self.cnt_frame_num == self.cnt_frame_break: - print("[i] Collected required amount of frames") + log.info("Collected required amount of frames") return True return False def shutdown(self): - print("[i] Shutting down...") + log.info("Shutting down...") # Print statistics - print("[i] %u bursts handled, %u dropped" \ + log.info("%u bursts handled, %u dropped" \ % (self.cnt_burst_num, self.cnt_burst_dropped_num)) # Exit -- To view, visit https://gerrit.osmocom.org/12185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7fcafabafe8323b58990997a47afdd48b6d1f357 Gerrit-Change-Number: 12185 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 03:07:54 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 03:07:54 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_gen.py: fix short version of --burst-type Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12186 Change subject: trx_toolkit/burst_gen.py: fix short version of --burst-type ...................................................................... trx_toolkit/burst_gen.py: fix short version of --burst-type Both '--bind-addr' and '--burst-type' had the same short '-b'. Let's use the upper case version for '--burst-type'. Change-Id: Ib8a46e25cbc6266c3e147582f9e8045362270151 --- M src/target/trx_toolkit/burst_gen.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/86/12186/1 diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index 9a17ffa..0268da9 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -159,7 +159,7 @@ " -p --base-port Set base port number (default %d)\n\n" s += " Burst generation\n" \ - " -b --burst-type Random burst type (NB, FB, SB, AB)\n" \ + " -B --burst-type Random burst type (NB, FB, SB, AB)\n" \ " -c --burst-count How much bursts to send (default 1)\n" \ " -f --frame-number Set frame number (default random)\n" \ " -t --timeslot Set timeslot index (default random)\n" \ @@ -176,7 +176,7 @@ def parse_argv(self): try: opts, args = getopt.getopt(sys.argv[1:], - "o:m:r:b:p:b:c:f:t:h", + "o:m:r:b:p:B:c:f:t:h", [ "help", "output-file=" @@ -213,7 +213,7 @@ elif o in ("-p", "--base-port"): self.base_port = int(v) - elif o in ("-b", "--burst-type"): + elif o in ("-B", "--burst-type"): self.burst_type = v elif o in ("-c", "--burst-count"): self.burst_count = int(v) -- To view, visit https://gerrit.osmocom.org/12186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8a46e25cbc6266c3e147582f9e8045362270151 Gerrit-Change-Number: 12186 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 03:07:56 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 03:07:56 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_gen.py: migrate from getopt to argparse Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12187 Change subject: trx_toolkit/burst_gen.py: migrate from getopt to argparse ...................................................................... trx_toolkit/burst_gen.py: migrate from getopt to argparse Change-Id: I7eb3f2e2713f1f97293bd47a2eae3b140f63fb59 --- M src/target/trx_toolkit/burst_gen.py 1 file changed, 83 insertions(+), 140 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/87/12187/1 diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index 0268da9..7625a27 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -28,7 +28,7 @@ import logging as log import signal -import getopt +import argparse import sys from rand_burst_gen import RandBurstGen @@ -38,29 +38,9 @@ from data_msg import * class Application: - # Application variables - remote_addr = "127.0.0.1" - bind_addr = "0.0.0.0" - base_port = 5700 - conn_mode = "TRX" - output_file = None - - burst_type = None - burst_count = 1 - - # Common header fields - fn = None - tn = None - - # Message specific header fields - toa256 = None - rssi = None - pwr = None - def __init__(self): print_copyright(CR_HOLDERS) - self.parse_argv() - self.check_argv() + self.argv = self.parse_argv() # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) @@ -70,32 +50,35 @@ format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") # Open requested capture file - if self.output_file is not None: - self.ddf = DATADumpFile(self.output_file) + if self.argv.output_file is not None: + self.ddf = DATADumpFile(self.argv.output_file) def run(self): # Init DATA interface with TRX or L1 - if self.conn_mode == "TRX": - self.data_if = DATAInterface(self.remote_addr, self.base_port + 2, - self.bind_addr, self.base_port + 102) - elif self.conn_mode == "L1": - self.data_if = DATAInterface(self.remote_addr, self.base_port + 102, - self.bind_addr, self.base_port + 2) + if self.argv.conn_mode == "TRX": + self.data_if = DATAInterface( + self.argv.remote_addr, self.argv.base_port + 2, + self.argv.bind_addr, self.argv.base_port + 102) + elif self.argv.conn_mode == "L1": + self.data_if = DATAInterface( + self.argv.remote_addr, self.argv.base_port + 102, + self.argv.bind_addr, self.argv.base_port + 2) # Init random burst generator burst_gen = RandBurstGen() # Init an empty DATA message - if self.conn_mode == "TRX": + if self.argv.conn_mode == "TRX": msg = DATAMSG_L12TRX() - elif self.conn_mode == "L1": + elif self.argv.conn_mode == "L1": msg = DATAMSG_TRX2L1() # Generate a random frame number or use provided one - fn_init = msg.rand_fn() if self.fn is None else self.fn + fn_init = msg.rand_fn() if self.argv.tdma_fn is None \ + else self.argv.tdma_fn # Send as much bursts as required - for i in range(self.burst_count): + for i in range(self.argv.burst_count): # Randomize the message header msg.rand_hdr() @@ -103,145 +86,105 @@ msg.fn = (fn_init + i) % GSM_HYPERFRAME # Set timeslot number - if self.tn is not None: - msg.tn = self.tn + if self.argv.tdma_tn is not None: + msg.tn = self.argv.tdma_tn # Set transmit power level - if self.pwr is not None: - msg.pwr = self.pwr + if self.argv.pwr is not None: + msg.pwr = self.argv.pwr # Set time of arrival - if self.toa256 is not None: - msg.toa256 = self.toa256 + if self.argv.toa is not None: + msg.toa256 = int(float(self.argv.toa) * 256.0 + 0.5) + elif self.argv.toa256 is not None: + msg.toa256 = self.argv.toa256 # Set RSSI - if self.rssi is not None: - msg.rssi = self.rssi + if self.argv.rssi is not None: + msg.rssi = self.argv.rssi # Generate a random burst - if self.burst_type == "NB": + if self.argv.burst_type == "NB": burst = burst_gen.gen_nb() - elif self.burst_type == "FB": + elif self.argv.burst_type == "FB": burst = burst_gen.gen_fb() - elif self.burst_type == "SB": + elif self.argv.burst_type == "SB": burst = burst_gen.gen_sb() - elif self.burst_type == "AB": + elif self.argv.burst_type == "AB": burst = burst_gen.gen_ab() # Convert to soft-bits in case of TRX -> L1 message - if self.conn_mode == "L1": + if self.argv.conn_mode == "L1": burst = msg.ubit2sbit(burst) # Set burst msg.burst = burst log.info("Sending %d/%d %s burst %s to %s..." - % (i + 1, self.burst_count, self.burst_type, - msg.desc_hdr(), self.conn_mode)) + % (i + 1, self.argv.burst_count, self.argv.burst_type, + msg.desc_hdr(), self.argv.conn_mode)) # Send message self.data_if.send_msg(msg) # Append a new message to the capture - if self.output_file is not None: + if self.argv.output_file is not None: self.ddf.append_msg(msg) - def print_help(self, msg = None): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - s += " TRX interface specific\n" \ - " -o --output-file Write bursts to a capture file\n" \ - " -m --conn-mode Send bursts to: TRX (default) / L1\n" \ - " -r --remote-addr Set remote address (default %s)\n" \ - " -b --bind-addr Set local address (default %s)\n" \ - " -p --base-port Set base port number (default %d)\n\n" - - s += " Burst generation\n" \ - " -B --burst-type Random burst type (NB, FB, SB, AB)\n" \ - " -c --burst-count How much bursts to send (default 1)\n" \ - " -f --frame-number Set frame number (default random)\n" \ - " -t --timeslot Set timeslot index (default random)\n" \ - " --pwr Set power level (default random)\n" \ - " --rssi Set RSSI (default random)\n" \ - " --toa Set ToA in symbols (default random)\n" \ - " --toa256 Set ToA in 1/256 symbol periods\n" - - print(s % (self.remote_addr, self.bind_addr, self.base_port)) - - if msg is not None: - print(msg) - def parse_argv(self): - try: - opts, args = getopt.getopt(sys.argv[1:], - "o:m:r:b:p:B:c:f:t:h", - [ - "help", - "output-file=" - "conn-mode=", - "remote-addr=", - "bind-addr=", - "base-port=", - "burst-type=", - "burst-count=", - "frame-number=", - "timeslot=", - "rssi=", - "toa=", - "toa256=", - "pwr=", - ]) - except getopt.GetoptError as err: - self.print_help("[!] " + str(err)) - sys.exit(2) + parser = argparse.ArgumentParser(prog = "burst_gen", + description = "Auxiliary tool to generate and send random bursts") - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) + trx_group = parser.add_argument_group("TRX interface") + trx_group.add_argument("-r", "--remote-addr", + dest = "remote_addr", type = str, default = "127.0.0.1", + help = "Set remote address (default %(default)s)") + trx_group.add_argument("-b", "--bind-addr", + dest = "bind_addr", type = str, default = "0.0.0.0", + help = "Set bind address (default %(default)s)") + trx_group.add_argument("-p", "--base-port", + dest = "base_port", type = int, default = 6700, + help = "Set base port number (default %(default)s)") + trx_group.add_argument("-m", "--conn-mode", + dest = "conn_mode", type = str, + choices = ["TRX", "L1"], default = "TRX", + help = "Where to send bursts (default %(default)s)") + trx_group.add_argument("-o", "--output-file", + dest = "output_file", type = str, + help = "Write bursts to a capture file") - elif o in ("-o", "--output-file"): - self.output_file = v - elif o in ("-m", "--conn-mode"): - self.conn_mode = v - elif o in ("-r", "--remote-addr"): - self.remote_addr = v - elif o in ("-b", "--bind-addr"): - self.bind_addr = v - elif o in ("-p", "--base-port"): - self.base_port = int(v) + bg_group = parser.add_argument_group("Burst generation") + bg_group.add_argument("-B", "--burst-type", + dest = "burst_type", type = str, + choices = ["NB", "FB", "SB", "AB"], default = "NB", + help = "Random burst type (default %(default)s)") + bg_group.add_argument("-c", "--burst-count", metavar = "N", + dest = "burst_count", type = int, default = 1, + help = "How many bursts to send (default %(default)s)") + bg_group.add_argument("-f", "--frame-number", metavar = "FN", + dest = "tdma_fn", type = int, + help = "Set TDMA frame number (default random)") + bg_group.add_argument("-t", "--timeslot", metavar = "TN", + dest = "tdma_tn", type = int, choices = range(0, 8), + help = "Set TDMA timeslot (default random)") - elif o in ("-B", "--burst-type"): - self.burst_type = v - elif o in ("-c", "--burst-count"): - self.burst_count = int(v) - elif o in ("-f", "--frame-number"): - self.fn = int(v) - elif o in ("-t", "--timeslot"): - self.tn = int(v) + bg_pwr_group = bg_group.add_mutually_exclusive_group() + bg_pwr_group.add_argument("--pwr", metavar = "dBm", + dest = "pwr", type = int, + help = "Set power level (default random)") + bg_pwr_group.add_argument("--rssi", metavar = "dBm", + dest = "rssi", type = int, + help = "Set RSSI (default random)") - # Message specific header fields - elif o == "--pwr": - self.pwr = int(v) - elif o == "--rssi": - self.rssi = int(v) - elif o == "--toa256": - self.toa256 = int(v) - elif o == "--toa": - self.toa256 = int(float(v) * 256.0 + 0.5) + bg_toa_group = bg_group.add_mutually_exclusive_group() + bg_toa_group.add_argument("--toa", + dest = "toa", type = int, + help = "Set Timing of Arrival in symbols (default random)") + bg_toa_group.add_argument("--toa256", + dest = "toa256", type = int, + help = "Set Timing of Arrival in 1/256 symbol periods") - def check_argv(self): - # Check connection mode - if self.conn_mode not in ("TRX", "L1"): - self.print_help("[!] Unknown connection type") - sys.exit(2) - - # Check connection mode - if self.burst_type not in ("NB", "FB", "SB", "AB"): - self.print_help("[!] Unknown burst type") - sys.exit(2) + return parser.parse_args() def sig_handler(self, signum, frame): log.info("Signal %d received" % signum) -- To view, visit https://gerrit.osmocom.org/12187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7eb3f2e2713f1f97293bd47a2eae3b140f63fb59 Gerrit-Change-Number: 12187 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 03:07:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 03:07:57 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_send.py: migrate from getopt to argparse Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12188 Change subject: trx_toolkit/burst_send.py: migrate from getopt to argparse ...................................................................... trx_toolkit/burst_send.py: migrate from getopt to argparse Change-Id: I1be66aa022a79aa1683f0e6cfebaed568b1736b1 --- M src/target/trx_toolkit/burst_send.py 1 file changed, 59 insertions(+), 127 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/88/12188/1 diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 787e0fc..499e929 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -27,7 +27,7 @@ import logging as log import signal -import getopt +import argparse import sys from data_dump import DATADumpFile @@ -36,27 +36,9 @@ from data_msg import * class Application: - # Application variables - remote_addr = "127.0.0.1" - bind_addr = "0.0.0.0" - base_port = 5700 - conn_mode = "TRX" - - # Burst source - capture_file = None - - # Count limitations - msg_skip = None - msg_count = None - - # Pass filtering - pf_fn_lt = None - pf_fn_gt = None - pf_tn = None - def __init__(self): print_copyright(CR_HOLDERS) - self.parse_argv() + self.argv = self.parse_argv() # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) @@ -66,152 +48,102 @@ format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") # Open requested capture file - self.ddf = DATADumpFile(self.capture_file) + self.ddf = DATADumpFile(self.argv.capture_file) def run(self): # Init DATA interface with TRX or L1 - if self.conn_mode == "TRX": - self.data_if = DATAInterface(self.remote_addr, self.base_port + 2, - self.bind_addr, self.base_port + 102) - l12trx = True - elif self.conn_mode == "L1": - self.data_if = DATAInterface(self.remote_addr, self.base_port + 102, - self.bind_addr, self.base_port + 2) - l12trx = False - else: - self.print_help("[!] Unknown connection type") - sys.exit(2) + if self.argv.conn_mode == "TRX": + self.data_if = DATAInterface( + self.argv.remote_addr, self.argv.base_port + 2, + self.argv.bind_addr, self.argv.base_port + 102) + elif self.argv.conn_mode == "L1": + self.data_if = DATAInterface( + self.argv.remote_addr, self.argv.base_port + 102, + self.argv.bind_addr, self.argv.base_port + 2) # Read messages from the capture messages = self.ddf.parse_all( - skip = self.msg_skip, count = self.msg_count) + skip = self.argv.cnt_skip, count = self.argv.cnt_count) if messages is False: pass # FIXME!!! for msg in messages: # Pass filter - if not self.msg_pass_filter(l12trx, msg): + if not self.msg_pass_filter(msg): continue log.info("Sending a burst %s to %s..." - % (msg.desc_hdr(), self.conn_mode)) + % (msg.desc_hdr(), self.argv.conn_mode)) # Send message self.data_if.send_msg(msg) - def msg_pass_filter(self, l12trx, msg): + def msg_pass_filter(self, msg): # Direction filter + l12trx = self.argv.conn_mode == "TRX" if isinstance(msg, DATAMSG_L12TRX) and not l12trx: return False elif isinstance(msg, DATAMSG_TRX2L1) and l12trx: return False # Timeslot filter - if self.pf_tn is not None: - if msg.tn != self.pf_tn: + if self.argv.pf_tn is not None: + if msg.tn != self.argv.pf_tn: return False # Frame number filter - if self.pf_fn_lt is not None: - if msg.fn > self.pf_fn_lt: + if self.argv.pf_fn_lt is not None: + if msg.fn > self.argv.pf_fn_lt: return False - if self.pf_fn_gt is not None: - if msg.fn < self.pf_fn_gt: + if self.argv.pf_fn_gt is not None: + if msg.fn < self.argv.pf_fn_gt: return False # Burst passed ;) return True - def print_help(self, msg = None): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - s += " TRX interface specific\n" \ - " -m --conn-mode Send bursts to: TRX (default) / L1\n" \ - " -r --remote-addr Set remote address (default %s)\n" \ - " -b --bind-addr Set bind address (default %s)\n" \ - " -p --base-port Set base port number (default %d)\n\n" - - s += " Burst source\n" \ - " -i --capture-file Read bursts from capture file\n\n" \ - - s += " Count limitations (disabled by default)\n" \ - " --msg-skip NUM Skip NUM messages before sending\n" \ - " --msg-count NUM Stop after sending NUM messages\n\n" \ - - s += " Filtering (disabled by default)\n" \ - " --timeslot NUM TDMA timeslot number [0..7]\n" \ - " --frame-num-lt NUM TDMA frame number lower than NUM\n" \ - " --frame-num-gt NUM TDMA frame number greater than NUM\n" - - print(s % (self.remote_addr, self.bind_addr, self.base_port)) - - if msg is not None: - print(msg) - def parse_argv(self): - try: - opts, args = getopt.getopt(sys.argv[1:], - "m:r:b:p:i:h", - [ - "help", - "conn-mode=", - "remote-addr=", - "bind-addr=", - "base-port=", - "capture-file=", - "msg-skip=", - "msg-count=", - "timeslot=", - "frame-num-lt=", - "frame-num-gt=", - ]) - except getopt.GetoptError as err: - self.print_help("[!] " + str(err)) - sys.exit(2) + parser = argparse.ArgumentParser(prog = "burst_send", + description = "Auxiliary tool to send (reply) captured bursts") - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) + trx_group = parser.add_argument_group("TRX interface") + trx_group.add_argument("-r", "--remote-addr", + dest = "remote_addr", type = str, default = "127.0.0.1", + help = "Set remote address (default %(default)s)") + trx_group.add_argument("-b", "--bind-addr", + dest = "bind_addr", type = str, default = "0.0.0.0", + help = "Set bind address (default %(default)s)") + trx_group.add_argument("-p", "--base-port", + dest = "base_port", type = int, default = 6700, + help = "Set base port number (default %(default)s)") + trx_group.add_argument("-m", "--conn-mode", + dest = "conn_mode", type = str, + choices = ["TRX", "L1"], default = "TRX", + help = "Where to send bursts (default %(default)s)") + trx_group.add_argument("-i", "--capture-file", metavar = "FILE", + dest = "capture_file", type = str, required = True, + help = "Capture file to read bursts from") - # Capture file - elif o in ("-i", "--capture-file"): - self.capture_file = v + cnt_group = parser.add_argument_group("Count limitations (optional)") + cnt_group.add_argument("--skip", metavar = "N", + dest = "cnt_skip", type = int, + help = "Skip N messages before sending") + cnt_group.add_argument("--count", metavar = "N", + dest = "cnt_count", type = int, + help = "Stop after sending N messages") - # TRX interface specific - elif o in ("-m", "--conn-mode"): - self.conn_mode = v - elif o in ("-r", "--remote-addr"): - self.remote_addr = v - elif o in ("-b", "--bind-addr"): - self.bind_addr = v - elif o in ("-p", "--base-port"): - self.base_port = int(v) + pf_group = parser.add_argument_group("Filtering (optional)") + cnt_group.add_argument("--timeslot", metavar = "TN", + dest = "pf_tn", type = int, choices = range(0, 8), + help = "TDMA timeslot number (equal TN)") + cnt_group.add_argument("--frame-num-lt", metavar = "FN", + dest = "pf_fn_lt", type = int, + help = "TDMA frame number (lower than FN)") + cnt_group.add_argument("--frame-num-gt", metavar = "FN", + dest = "pf_fn_gt", type = int, + help = "TDMA frame number (greater than FN)") - # Count limitations - elif o == "--msg-skip": - self.msg_skip = int(v) - elif o == "--msg-count": - self.msg_count = int(v) - - # Timeslot pass filter - elif o == "--timeslot": - self.pf_tn = int(v) - if self.pf_tn < 0 or self.pf_tn > 7: - self.print_help("[!] Wrong timeslot value") - sys.exit(2) - - # Frame number pass filter - elif o == "--frame-num-lt": - self.pf_fn_lt = int(v) - elif o == "--frame-num-gt": - self.pf_fn_gt = int(v) - - if self.capture_file is None: - self.print_help("[!] Please specify a capture file") - sys.exit(2) + return parser.parse_args() def sig_handler(self, signum, frame): log.info("Signal %d received" % signum) -- To view, visit https://gerrit.osmocom.org/12188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1be66aa022a79aa1683f0e6cfebaed568b1736b1 Gerrit-Change-Number: 12188 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 03:07:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 03:07:58 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_cmd.py: migrate from getopt to argparse Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12189 Change subject: trx_toolkit/ctrl_cmd.py: migrate from getopt to argparse ...................................................................... trx_toolkit/ctrl_cmd.py: migrate from getopt to argparse Change-Id: Ib9bf5ed7384c4f34478975cefe03880eb2fc8069 --- M src/target/trx_toolkit/ctrl_cmd.py 1 file changed, 25 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/12189/1 diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py index ec683be..43b24a3 100755 --- a/src/target/trx_toolkit/ctrl_cmd.py +++ b/src/target/trx_toolkit/ctrl_cmd.py @@ -28,23 +28,16 @@ import logging as log import signal -import getopt +import argparse import select import sys from udp_link import UDPLink class Application: - # Application variables - remote_addr = "127.0.0.1" - bind_addr = "0.0.0.0" - base_port = 5700 - bind_port = 0 - fuzzing = False - def __init__(self): print_copyright(CR_HOLDERS) - self.parse_argv() + self.argv = self.parse_argv() # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) @@ -54,61 +47,36 @@ format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") # Init UDP connection - self.ctrl_link = UDPLink(self.remote_addr, self.base_port + 1, - self.bind_addr, self.bind_port) + self.ctrl_link = UDPLink( + self.argv.remote_addr, self.argv.base_port + 1, + self.argv.bind_addr, self.argv.bind_port) # Debug print log.info("Init CTRL interface (%s)" \ % self.ctrl_link.desc_link()) - def print_help(self, msg = None): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - s += " TRX interface specific\n" \ - " -r --remote-addr Set remote address (default %s)\n" \ - " -p --base-port Set base port number (default %d)\n" \ - " -P --bind-port Set local port number (default: random)\n" \ - " -b --bind-addr Set local address (default %s)\n" \ - " -f --fuzzing Send raw payloads (without CMD)\n" \ - - print(s % (self.remote_addr, self.base_port, self.bind_addr)) - - if msg is not None: - print(msg) - def parse_argv(self): - try: - opts, args = getopt.getopt(sys.argv[1:], - "r:p:P:b:fh", - [ - "help", - "fuzzing", - "base-port=", - "bind-port=", - "bind-addr=", - "remote-addr=", - ]) - except getopt.GetoptError as err: - self.print_help("[!] " + str(err)) - sys.exit(2) + parser = argparse.ArgumentParser(prog = "ctrl_cmd", + description = "Auxiliary tool to send control commands") - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) + trx_group = parser.add_argument_group("TRX interface") + trx_group.add_argument("-r", "--remote-addr", + dest = "remote_addr", type = str, default = "127.0.0.1", + help = "Set remote address (default %(default)s)") + trx_group.add_argument("-b", "--bind-addr", + dest = "bind_addr", type = str, default = "0.0.0.0", + help = "Set bind address (default %(default)s)") + trx_group.add_argument("-p", "--base-port", + dest = "base_port", type = int, default = 6700, + help = "Set base port number (default %(default)s)") + trx_group.add_argument("-P", "--bind-port", + dest = "bind_port", type = int, default = 0, + help = "Set bind port number (default random)") + trx_group.add_argument("-f", "--fuzzing", + dest = "fuzzing", action = "store_true", + help = "Send raw payloads (without CMD)") - elif o in ("-r", "--remote-addr"): - self.remote_addr = v - elif o in ("-b", "--bind-addr"): - self.bind_addr = v - elif o in ("-p", "--base-port"): - self.base_port = int(v) - elif o in ("-P", "--bind-port"): - self.bind_port = int(v) - elif o in ("-f", "--fuzzing"): - self.fuzzing = True + return parser.parse_args() def run(self): while True: @@ -133,7 +101,7 @@ cmd = cmd.strip().strip("\0") # Send a command - if self.fuzzing: + if self.argv.fuzzing: self.ctrl_link.send("%s" % cmd) else: self.ctrl_link.send("CMD %s\0" % cmd) -- To view, visit https://gerrit.osmocom.org/12189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9bf5ed7384c4f34478975cefe03880eb2fc8069 Gerrit-Change-Number: 12189 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 03:07:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 03:07:59 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/trx_sniff.py: migrate from getopt to argparse Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12190 Change subject: trx_toolkit/trx_sniff.py: migrate from getopt to argparse ...................................................................... trx_toolkit/trx_sniff.py: migrate from getopt to argparse Change-Id: Id1dacaa32134bfa68344e6c48310390cdd85cdc9 --- M src/target/trx_toolkit/trx_sniff.py 1 file changed, 60 insertions(+), 116 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/90/12190/1 diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 9850983..9fb567e 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -27,7 +27,7 @@ import logging as log import signal -import getopt +import argparse import sys import scapy.all @@ -36,55 +36,37 @@ from data_msg import * class Application: - # Application variables - sniff_interface = "lo" - sniff_base_port = 5700 - print_bursts = False - output_file = None - # Counters cnt_burst_dropped_num = 0 - cnt_burst_break = None cnt_burst_num = 0 - cnt_frame_break = None cnt_frame_last = None cnt_frame_num = 0 - # Burst direction fliter - bf_dir_l12trx = None - - # Timeslot number filter - bf_tn_val = None - - # Frame number fliter - bf_fn_lt = None - bf_fn_gt = None - # Internal variables lo_trigger = False def __init__(self): print_copyright(CR_HOLDERS) - self.parse_argv() + self.argv = self.parse_argv() # Configure logging log.basicConfig(level = log.DEBUG, format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") # Open requested capture file - if self.output_file is not None: - self.ddf = DATADumpFile(self.output_file) + if self.argv.output_file is not None: + self.ddf = DATADumpFile(self.argv.output_file) def run(self): # Compose a packet filter pkt_filter = "udp and (port %d or port %d)" \ - % (self.sniff_base_port + 2, self.sniff_base_port + 102) + % (self.argv.base_port + 2, self.argv.base_port + 102) - log.info("Listening on interface '%s'..." % self.sniff_interface) + log.info("Listening on interface '%s'..." % self.argv.sniff_if) # Start sniffing... - scapy.all.sniff(iface = self.sniff_interface, store = 0, + scapy.all.sniff(iface = self.argv.sniff_if, store = 0, filter = pkt_filter, prn = self.pkt_handler) # Scapy registers its own signal handler @@ -92,7 +74,7 @@ def pkt_handler(self, ether): # Prevent loopback packet duplication - if self.sniff_interface == "lo": + if self.argv.sniff_if == "lo": self.lo_trigger = not self.lo_trigger if not self.lo_trigger: return @@ -139,32 +121,34 @@ def burst_pass_filter(self, l12trx, fn, tn): # Direction filter - if self.bf_dir_l12trx is not None: - if l12trx != self.bf_dir_l12trx: + if self.argv.direction is not None: + if self.argv.direction == "TRX" and not l12trx: + return False + elif self.argv.direction == "L1" and l12trx: return False # Timeslot filter - if self.bf_tn_val is not None: - if tn != self.bf_tn_val: + if self.argv.pf_tn is not None: + if tn != self.argv.pf_tn: return False # Frame number filter - if self.bf_fn_lt is not None: - if fn > self.bf_fn_lt: + if self.argv.pf_fn_lt is not None: + if fn > self.argv.pf_fn_lt: return False - if self.bf_fn_gt is not None: - if fn < self.bf_fn_gt: + if self.argv.pf_fn_gt is not None: + if fn < self.argv.pf_fn_gt: return False # Burst passed ;) return True def msg_handle(self, msg): - if self.print_bursts: + if self.argv.verbose: print(msg.burst) # Append a new message to the capture - if self.output_file is not None: + if self.argv.output_file is not None: self.ddf.append_msg(msg) def burst_count(self, fn, tn): @@ -180,14 +164,14 @@ self.cnt_burst_num += 1 # Stop sniffing after N bursts - if self.cnt_burst_break is not None: - if self.cnt_burst_num == self.cnt_burst_break: + if self.argv.burst_count is not None: + if self.cnt_burst_num == self.argv.burst_count: log.info("Collected required amount of bursts") return True # Stop sniffing after N frames - if self.cnt_frame_break is not None: - if self.cnt_frame_num == self.cnt_frame_break: + if self.argv.frame_count is not None: + if self.cnt_frame_num == self.argv.frame_count: log.info("Collected required amount of frames") return True @@ -203,88 +187,48 @@ # Exit sys.exit(0) - def print_help(self, msg = None): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - s += " Sniffing options\n" \ - " -i --sniff-interface Set network interface (default '%s')\n" \ - " -p --sniff-base-port Set base port number (default %d)\n\n" - - s += " Processing (no processing by default)\n" \ - " -o --output-file Write bursts to file\n" \ - " -v --print-bits Print burst bits to stdout\n\n" \ - - s += " Count limitations (disabled by default)\n" \ - " --frame-count NUM Stop after sniffing NUM frames\n" \ - " --burst-count NUM Stop after sniffing NUM bursts\n\n" - - s += " Filtering (disabled by default)\n" \ - " --direction DIR Burst direction: L12TRX or TRX2L1\n" \ - " --timeslot NUM TDMA timeslot number [0..7]\n" \ - " --frame-num-lt NUM TDMA frame number lower than NUM\n" \ - " --burst-num-gt NUM TDMA frame number greater than NUM\n" - - print(s % (self.sniff_interface, self.sniff_base_port)) - - if msg is not None: - print(msg) - def parse_argv(self): - try: - opts, args = getopt.getopt(sys.argv[1:], - "i:p:o:v:h", ["help", "sniff-interface=", "sniff-base-port=", - "frame-count=", "burst-count=", "direction=", - "timeslot=", "frame-num-lt=", "frame-num-gt=", - "output-file=", "print-bits"]) - except getopt.GetoptError as err: - self.print_help("[!] " + str(err)) - sys.exit(2) + parser = argparse.ArgumentParser(prog = "trx_sniff", + description = "Scapy-based TRX interface sniffer") - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) + parser.add_argument("-v", "--verbose", + dest = "verbose", action = "store_true", + help = "Print burst bits to stdout") - elif o in ("-i", "--sniff-interface"): - self.sniff_interface = v - elif o in ("-p", "--sniff-base-port"): - self.sniff_base_port = int(v) + trx_group = parser.add_argument_group("TRX interface") + trx_group.add_argument("-i", "--sniff-interface", + dest = "sniff_if", type = str, default = "lo", metavar = "IF", + help = "Set network interface (default '%(default)s')") + trx_group.add_argument("-p", "--base-port", + dest = "base_port", type = int, default = 6700, + help = "Set base port number (default %(default)s)") + trx_group.add_argument("-o", "--output-file", metavar = "FILE", + dest = "output_file", type = str, + help = "Write bursts to a capture file") - elif o in ("-o", "--output-file"): - self.output_file = v - elif o in ("-v", "--print-bits"): - self.print_bursts = True + cnt_group = parser.add_argument_group("Count limitations (optional)") + cnt_group.add_argument("--frame-count", metavar = "N", + dest = "frame_count", type = int, + help = "Stop after sniffing N frames") + cnt_group.add_argument("--burst-count", metavar = "N", + dest = "burst_count", type = int, + help = "Stop after sniffing N bursts") - # Break counters - elif o == "--frame-count": - self.cnt_frame_break = int(v) - elif o == "--burst-count": - self.cnt_burst_break = int(v) + pf_group = parser.add_argument_group("Filtering (optional)") + pf_group.add_argument("--direction", + dest = "direction", type = str, choices = ["TRX", "L1"], + help = "Burst direction") + pf_group.add_argument("--timeslot", metavar = "TN", + dest = "pf_tn", type = int, choices = range(0, 8), + help = "TDMA timeslot number (equal TN)") + pf_group.add_argument("--frame-num-lt", metavar = "FN", + dest = "pf_fn_lt", type = int, + help = "TDMA frame number (lower than FN)") + pf_group.add_argument("--frame-num-gt", metavar = "FN", + dest = "pf_fn_gt", type = int, + help = "TDMA frame number (greater than FN)") - # Direction filter - elif o == "--direction": - if v == "L12TRX": - self.bf_dir_l12trx = True - elif v == "TRX2L1": - self.bf_dir_l12trx = False - else: - self.print_help("[!] Wrong direction argument") - sys.exit(2) - - # Timeslot pass filter - elif o == "--timeslot": - self.bf_tn_val = int(v) - if self.bf_tn_val < 0 or self.bf_tn_val > 7: - self.print_help("[!] Wrong timeslot value") - sys.exit(2) - - # Frame number pass filter - elif o == "--frame-num-lt": - self.bf_fn_lt = int(v) - elif o == "--frame-num-gt": - self.bf_fn_gt = int(v) + return parser.parse_args() if __name__ == '__main__': app = Application() -- To view, visit https://gerrit.osmocom.org/12190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id1dacaa32134bfa68344e6c48310390cdd85cdc9 Gerrit-Change-Number: 12190 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 03:07:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 03:07:59 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: migrate from getopt to argparse Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12191 Change subject: trx_toolkit/fake_trx.py: migrate from getopt to argparse ...................................................................... trx_toolkit/fake_trx.py: migrate from getopt to argparse Change-Id: I0218a328671c591b20b0666dc7c39ba865892acc --- M src/target/trx_toolkit/fake_trx.py 1 file changed, 40 insertions(+), 86 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/91/12191/1 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index ced1238..1c991ce 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -27,7 +27,7 @@ import logging as log import signal -import getopt +import argparse import select import sys @@ -40,16 +40,9 @@ from clck_gen import CLCKGen class Application: - # Application variables - bts_addr = "127.0.0.1" - bb_addr = "127.0.0.1" - trx_bind_addr = "0.0.0.0" - bts_base_port = 5700 - bb_base_port = 6700 - def __init__(self): print_copyright(CR_HOLDERS) - self.parse_argv() + self.argv = self.parse_argv() # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) @@ -60,12 +53,14 @@ def run(self): # Init TRX CTRL interface for BTS - self.bts_ctrl = CTRLInterfaceBTS(self.bts_addr, self.bts_base_port + 101, - self.trx_bind_addr, self.bts_base_port + 1) + self.bts_ctrl = CTRLInterfaceBTS( + self.argv.bts_addr, self.argv.bts_base_port + 101, + self.argv.trx_bind_addr, self.argv.bts_base_port + 1) # Init TRX CTRL interface for BB - self.bb_ctrl = CTRLInterfaceBB(self.bb_addr, self.bb_base_port + 101, - self.trx_bind_addr, self.bb_base_port + 1) + self.bb_ctrl = CTRLInterfaceBB( + self.argv.bb_addr, self.argv.bb_base_port + 101, + self.argv.trx_bind_addr, self.argv.bb_base_port + 1) # Power measurement emulation # Noise: -120 .. -105 @@ -77,10 +72,12 @@ self.bb_ctrl.pm = self.pm # Init DATA links - self.bts_data = UDPLink(self.bts_addr, self.bts_base_port + 102, - self.trx_bind_addr, self.bts_base_port + 2) - self.bb_data = UDPLink(self.bb_addr, self.bb_base_port + 102, - self.trx_bind_addr, self.bb_base_port + 2) + self.bts_data = UDPLink( + self.argv.bts_addr, self.argv.bts_base_port + 102, + self.argv.trx_bind_addr, self.argv.bts_base_port + 2) + self.bb_data = UDPLink( + self.argv.bb_addr, self.argv.bb_base_port + 102, + self.argv.trx_bind_addr, self.argv.bb_base_port + 2) # BTS <-> BB burst forwarding self.burst_fwd = BurstForwarder(self.bts_data, self.bb_data) @@ -90,8 +87,9 @@ self.bb_ctrl.burst_fwd = self.burst_fwd # Provide clock to BTS - self.bts_clck = UDPLink(self.bts_addr, self.bts_base_port + 100, - self.trx_bind_addr, self.bts_base_port) + self.bts_clck = UDPLink( + self.argv.bts_addr, self.argv.bts_base_port + 100, + self.argv.trx_bind_addr, self.argv.bts_base_port) self.clck_gen = CLCKGen([self.bts_clck]) self.bts_ctrl.clck_gen = self.clck_gen @@ -129,78 +127,34 @@ # Stop clock generator self.clck_gen.stop() - def print_help(self, msg = None): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - s += " TRX interface specific\n" \ - " -R --bts-addr Set BTS remote address (default %s)\n" \ - " -r --bb-addr Set BB remote address (default %s)\n" \ - " -P --bts-base-port Set BTS base port number (default %d)\n" \ - " -p --bb-base-port Set BB base port number (default %d)\n" \ - " -b --trx-bind-addr Set TRX bind address (default %s)\n" - - print(s % (self.bts_addr, self.bb_addr, - self.bts_base_port, self.bb_base_port, - self.trx_bind_addr)) - - if msg is not None: - print(msg) - def parse_argv(self): - try: - opts, args = getopt.getopt(sys.argv[1:], - "R:r:P:p:b:h", - [ - "help", - "bts-addr=", "bb-addr=", - "bts-base-port=", "bb-base-port=", - "trx-bind-addr=", - ]) - except getopt.GetoptError as err: - self.print_help("[!] " + str(err)) - sys.exit(2) + parser = argparse.ArgumentParser(prog = "fake_trx", + description = "Virtual Um-interface (fake transceiver)") - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) + trx_group = parser.add_argument_group("TRX interface") + trx_group.add_argument("-b", "--trx-bind-addr", + dest = "trx_bind_addr", type = str, default = "0.0.0.0", + help = "Set FakeTRX bind address (default %(default)s)") + trx_group.add_argument("-R", "--bts-addr", + dest = "bts_addr", type = str, default = "127.0.0.1", + help = "Set BTS remote address (default %(default)s)") + trx_group.add_argument("-r", "--bb-addr", + dest = "bb_addr", type = str, default = "127.0.0.1", + help = "Set BB remote address (default %(default)s)") + trx_group.add_argument("-P", "--bts-base-port", + dest = "bts_base_port", type = int, default = 5700, + help = "Set BTS base port number (default %(default)s)") + trx_group.add_argument("-p", "--bb-base-port", + dest = "bb_base_port", type = int, default = 6700, + help = "Set BB base port number (default %(default)s)") - elif o in ("-R", "--bts-addr"): - self.bts_addr = v - elif o in ("-r", "--bb-addr"): - self.bb_addr = v + argv = parser.parse_args() - elif o in ("-P", "--bts-base-port"): - self.bts_base_port = int(v) - elif o in ("-p", "--bb-base-port"): - self.bb_base_port = int(v) + # Make sure there is no overlap between ports + if argv.bts_base_port == argv.bb_base_port: + parser.error("BTS and BB base ports shall be different") - elif o in ("-b", "--trx-bind-addr"): - self.trx_bind_addr = v - - # Ensure there is no overlap between ports - if self.bts_base_port == self.bb_base_port: - self.print_help("[!] BTS and BB base ports should be different") - sys.exit(2) - - bts_ports = [ - self.bts_base_port + 0, self.bts_base_port + 100, - self.bts_base_port + 1, self.bts_base_port + 101, - self.bts_base_port + 2, self.bts_base_port + 102, - ] - - bb_ports = [ - self.bb_base_port + 0, self.bb_base_port + 100, - self.bb_base_port + 1, self.bb_base_port + 101, - self.bb_base_port + 2, self.bb_base_port + 102, - ] - - for p in bb_ports: - if p in bts_ports: - self.print_help("[!] BTS and BB ports overlap detected") - sys.exit(2) + return argv def sig_handler(self, signum, frame): log.info("Signal %d received" % signum) -- To view, visit https://gerrit.osmocom.org/12191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0218a328671c591b20b0666dc7c39ba865892acc Gerrit-Change-Number: 12191 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 03:07:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 03:07:59 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: introduce logging configuration arguments Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12192 Change subject: trx_toolkit: introduce logging configuration arguments ...................................................................... trx_toolkit: introduce logging configuration arguments Change-Id: Ic3b0440cd73946ad444bd7e48feb7a92d45f6488 --- A src/target/trx_toolkit/app_common.py M src/target/trx_toolkit/burst_gen.py M src/target/trx_toolkit/burst_send.py M src/target/trx_toolkit/ctrl_cmd.py M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/trx_sniff.py 6 files changed, 97 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/92/12192/1 diff --git a/src/target/trx_toolkit/app_common.py b/src/target/trx_toolkit/app_common.py new file mode 100644 index 0000000..ed6878f --- /dev/null +++ b/src/target/trx_toolkit/app_common.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# TRX Toolkit +# Common helpers for applications +# +# (C) 2018 by Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import logging as log + +class ApplicationBase: + # Osmocom-style logging message format + # Example: [DEBUG] ctrl_if_bts.py:71 Recv POWEROFF cmd + LOG_FMT_DEFAULT = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s" + + def app_init_logging(self, argv): + # Default logging handler (stderr) + sh = log.StreamHandler() + sh.setLevel(log.getLevelName(argv.log_level)) + sh.setFormatter(log.Formatter(argv.log_fmt)) + log.root.addHandler(sh) + + # Optional file handler + if argv.log_file_name is not None: + fh = log.FileHandler(argv.log_file_name) + fh.setLevel(log.getLevelName(argv.log_file_level)) + fh.setFormatter(log.Formatter(argv.log_file_fmt)) + log.root.addHandler(fh) + + # Set DEBUG for the root logger + log.root.setLevel(log.DEBUG) + + def app_reg_logging_options(self, parser): + parser.add_argument("--log-lvl", metavar = "LVL", + dest = "log_level", type = str, default = "DEBUG", + choices = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], + help = "Set logging level (default %(default)s)") + parser.add_argument("--log-fmt", metavar = "FMT", + dest = "log_fmt", type = str, default = self.LOG_FMT_DEFAULT, + help = "Set logging message format") + + parser.add_argument("--log-file-name", metavar = "FILE", + dest = "log_file_name", type = str, + help = "Set logging file name") + parser.add_argument("--log-file-lvl", metavar = "LVL", + dest = "log_file_level", type = str, default = "DEBUG", + choices = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], + help = "Set logging level for file (default %(default)s)") + parser.add_argument("--log-file-fmt", metavar = "FMT", + dest = "log_file_fmt", type = str, default = self.LOG_FMT_DEFAULT, + help = "Set logging message format for file") diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index 7625a27..1c18b3c 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -31,13 +31,14 @@ import argparse import sys +from app_common import ApplicationBase from rand_burst_gen import RandBurstGen from data_dump import DATADumpFile from data_if import DATAInterface from gsm_shared import * from data_msg import * -class Application: +class Application(ApplicationBase): def __init__(self): print_copyright(CR_HOLDERS) self.argv = self.parse_argv() @@ -46,8 +47,7 @@ signal.signal(signal.SIGINT, self.sig_handler) # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + self.app_init_logging(self.argv) # Open requested capture file if self.argv.output_file is not None: @@ -135,6 +135,9 @@ parser = argparse.ArgumentParser(prog = "burst_gen", description = "Auxiliary tool to generate and send random bursts") + # Register common logging options + self.app_reg_logging_options(parser) + trx_group = parser.add_argument_group("TRX interface") trx_group.add_argument("-r", "--remote-addr", dest = "remote_addr", type = str, default = "127.0.0.1", diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 499e929..16db222 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -30,12 +30,13 @@ import argparse import sys +from app_common import ApplicationBase from data_dump import DATADumpFile from data_if import DATAInterface from gsm_shared import * from data_msg import * -class Application: +class Application(ApplicationBase): def __init__(self): print_copyright(CR_HOLDERS) self.argv = self.parse_argv() @@ -44,8 +45,7 @@ signal.signal(signal.SIGINT, self.sig_handler) # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + self.app_init_logging(self.argv) # Open requested capture file self.ddf = DATADumpFile(self.argv.capture_file) @@ -106,6 +106,9 @@ parser = argparse.ArgumentParser(prog = "burst_send", description = "Auxiliary tool to send (reply) captured bursts") + # Register common logging options + self.app_reg_logging_options(parser) + trx_group = parser.add_argument_group("TRX interface") trx_group.add_argument("-r", "--remote-addr", dest = "remote_addr", type = str, default = "127.0.0.1", diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py index 43b24a3..ffc3e46 100755 --- a/src/target/trx_toolkit/ctrl_cmd.py +++ b/src/target/trx_toolkit/ctrl_cmd.py @@ -32,9 +32,10 @@ import select import sys +from app_common import ApplicationBase from udp_link import UDPLink -class Application: +class Application(ApplicationBase): def __init__(self): print_copyright(CR_HOLDERS) self.argv = self.parse_argv() @@ -43,8 +44,7 @@ signal.signal(signal.SIGINT, self.sig_handler) # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + self.app_init_logging(self.argv) # Init UDP connection self.ctrl_link = UDPLink( @@ -59,6 +59,9 @@ parser = argparse.ArgumentParser(prog = "ctrl_cmd", description = "Auxiliary tool to send control commands") + # Register common logging options + self.app_reg_logging_options(parser) + trx_group = parser.add_argument_group("TRX interface") trx_group.add_argument("-r", "--remote-addr", dest = "remote_addr", type = str, default = "127.0.0.1", diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 1c991ce..a45ce20 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -31,6 +31,7 @@ import select import sys +from app_common import ApplicationBase from ctrl_if_bts import CTRLInterfaceBTS from ctrl_if_bb import CTRLInterfaceBB from burst_fwd import BurstForwarder @@ -39,7 +40,7 @@ from udp_link import UDPLink from clck_gen import CLCKGen -class Application: +class Application(ApplicationBase): def __init__(self): print_copyright(CR_HOLDERS) self.argv = self.parse_argv() @@ -48,8 +49,7 @@ signal.signal(signal.SIGINT, self.sig_handler) # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + self.app_init_logging(self.argv) def run(self): # Init TRX CTRL interface for BTS @@ -131,6 +131,9 @@ parser = argparse.ArgumentParser(prog = "fake_trx", description = "Virtual Um-interface (fake transceiver)") + # Register common logging options + self.app_reg_logging_options(parser) + trx_group = parser.add_argument_group("TRX interface") trx_group.add_argument("-b", "--trx-bind-addr", dest = "trx_bind_addr", type = str, default = "0.0.0.0", diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 9fb567e..7a87351 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -32,10 +32,11 @@ import scapy.all +from app_common import ApplicationBase from data_dump import DATADumpFile from data_msg import * -class Application: +class Application(ApplicationBase): # Counters cnt_burst_dropped_num = 0 cnt_burst_num = 0 @@ -51,8 +52,7 @@ self.argv = self.parse_argv() # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + self.app_init_logging(self.argv) # Open requested capture file if self.argv.output_file is not None: @@ -195,6 +195,9 @@ dest = "verbose", action = "store_true", help = "Print burst bits to stdout") + # Register common logging options + self.app_reg_logging_options(parser) + trx_group = parser.add_argument_group("TRX interface") trx_group.add_argument("-i", "--sniff-interface", dest = "sniff_if", type = str, default = "lo", metavar = "IF", -- To view, visit https://gerrit.osmocom.org/12192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3b0440cd73946ad444bd7e48feb7a92d45f6488 Gerrit-Change-Number: 12192 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 03:08:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 03:08:00 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: merge copyright.py into app_common.py Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12193 Change subject: trx_toolkit: merge copyright.py into app_common.py ...................................................................... trx_toolkit: merge copyright.py into app_common.py Change-Id: I8b70ec2dd08cb2ffed733d2c4e1215b094f8d3d5 --- M src/target/trx_toolkit/app_common.py M src/target/trx_toolkit/burst_gen.py M src/target/trx_toolkit/burst_send.py M src/target/trx_toolkit/clck_gen.py D src/target/trx_toolkit/copyright.py M src/target/trx_toolkit/ctrl_cmd.py M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/trx_sniff.py 8 files changed, 25 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/93/12193/1 diff --git a/src/target/trx_toolkit/app_common.py b/src/target/trx_toolkit/app_common.py index ed6878f..146956b 100644 --- a/src/target/trx_toolkit/app_common.py +++ b/src/target/trx_toolkit/app_common.py @@ -29,6 +29,17 @@ # Example: [DEBUG] ctrl_if_bts.py:71 Recv POWEROFF cmd LOG_FMT_DEFAULT = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s" + def app_print_copyright(self, holders = []): + # Print copyright holders if any + for date, author in holders: + print("Copyright (C) %s by %s" % (date, author)) + + # Print the license header itself + print("License GPLv2+: GNU GPL version 2 or later " \ + "\n" \ + "This is free software: you are free to change and redistribute it.\n" \ + "There is NO WARRANTY, to the extent permitted by law.\n") + def app_init_logging(self, argv): # Default logging handler (stderr) sh = log.StreamHandler() diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index 1c18b3c..b62f48c 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -23,8 +23,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from copyright import print_copyright -CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] import logging as log import signal @@ -40,7 +39,7 @@ class Application(ApplicationBase): def __init__(self): - print_copyright(CR_HOLDERS) + self.app_print_copyright(APP_CR_HOLDERS) self.argv = self.parse_argv() # Set up signal handlers diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 16db222..3745b39 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -22,8 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from copyright import print_copyright -CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] import logging as log import signal @@ -38,7 +37,7 @@ class Application(ApplicationBase): def __init__(self): - print_copyright(CR_HOLDERS) + self.app_print_copyright(APP_CR_HOLDERS) self.argv = self.parse_argv() # Set up signal handlers diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index 56207f4..40964dd 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -22,14 +22,14 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from copyright import print_copyright -CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] import logging as log import signal import time import sys +from app_common import ApplicationBase from threading import Timer from udp_link import UDPLink from gsm_shared import * @@ -94,10 +94,10 @@ self.timer.start() # Just a wrapper for independent usage -class Application: +class Application(ApplicationBase): def __init__(self): # Print copyright - print_copyright(CR_HOLDERS) + self.app_print_copyright(APP_CR_HOLDERS) # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) diff --git a/src/target/trx_toolkit/copyright.py b/src/target/trx_toolkit/copyright.py deleted file mode 100644 index 3d3597f..0000000 --- a/src/target/trx_toolkit/copyright.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env python2 -# -*- coding: utf-8 -*- - -def print_copyright(holders = []): - # Print copyright holders if any - for date, author in holders: - print("Copyright (C) %s by %s" % (date, author)) - - # Print the license header itself - print("License GPLv2+: GNU GPL version 2 or later " \ - "\n" \ - "This is free software: you are free to change and redistribute it.\n" \ - "There is NO WARRANTY, to the extent permitted by law.\n") diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py index ffc3e46..28815c2 100755 --- a/src/target/trx_toolkit/ctrl_cmd.py +++ b/src/target/trx_toolkit/ctrl_cmd.py @@ -23,8 +23,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from copyright import print_copyright -CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] import logging as log import signal @@ -37,7 +36,7 @@ class Application(ApplicationBase): def __init__(self): - print_copyright(CR_HOLDERS) + self.app_print_copyright(APP_CR_HOLDERS) self.argv = self.parse_argv() # Set up signal handlers diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index a45ce20..d73b566 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -22,8 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from copyright import print_copyright -CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] import logging as log import signal @@ -42,7 +41,7 @@ class Application(ApplicationBase): def __init__(self): - print_copyright(CR_HOLDERS) + self.app_print_copyright(APP_CR_HOLDERS) self.argv = self.parse_argv() # Set up signal handlers diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 7a87351..e169c72 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -22,8 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from copyright import print_copyright -CR_HOLDERS = [("2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2018", "Vadim Yanitskiy ")] import logging as log import signal @@ -48,7 +47,7 @@ lo_trigger = False def __init__(self): - print_copyright(CR_HOLDERS) + self.app_print_copyright(APP_CR_HOLDERS) self.argv = self.parse_argv() # Configure logging -- To view, visit https://gerrit.osmocom.org/12193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8b70ec2dd08cb2ffed733d2c4e1215b094f8d3d5 Gerrit-Change-Number: 12193 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 09:38:58 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 7 Dec 2018 09:38:58 +0000 Subject: Change in libosmocore[master]: Add osmo_sockaddr_in_to_str_and_uint() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11842 ) Change subject: Add osmo_sockaddr_in_to_str_and_uint() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie384483124d407a960ab6732e6a7fd90554389d2 Gerrit-Change-Number: 11842 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 07 Dec 2018 09:38:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Dec 7 09:49:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 7 Dec 2018 09:49:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-mgw_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#1884?= Message-ID: <687797417.1144.1544176147429.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 327.62 KB...] am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp_client' make[4]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp_client' (cd mgcp && make top_distdir=../../osmo-mgw-1.4.0.81-68023 distdir=../../osmo-mgw-1.4.0.81-68023/tests/mgcp \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp' make[4]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp' make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests' (cd contrib && make top_distdir=../osmo-mgw-1.4.0.81-68023 distdir=../osmo-mgw-1.4.0.81-68023/contrib \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib' (cd systemd && make top_distdir=../../osmo-mgw-1.4.0.81-68023 distdir=../../osmo-mgw-1.4.0.81-68023/contrib/systemd \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib/systemd' make[4]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib/systemd' make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib' make \ top_distdir="osmo-mgw-1.4.0.81-68023" distdir="osmo-mgw-1.4.0.81-68023" \ dist-hook make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build' echo 1.4.0.81-68023 > osmo-mgw-1.4.0.81-68023/.tarball-version make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build' test -n "" \ || find "osmo-mgw-1.4.0.81-68023" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec /bin/bash /build/osmo-mgw-1.4.0.81-68023/install-sh -c -m a+r {} {} \; \ || chmod -R a+r "osmo-mgw-1.4.0.81-68023" tardir=osmo-mgw-1.4.0.81-68023 && ${TAR-tar} chof - "$tardir" | BZIP2=${BZIP2--9} bzip2 -c >osmo-mgw-1.4.0.81-68023.tar.bz2 tardir=osmo-mgw-1.4.0.81-68023 && ${TAR-tar} chof - "$tardir" | GZIP=--best gzip -c >osmo-mgw-1.4.0.81-68023.tar.gz make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build' if test -d "osmo-mgw-1.4.0.81-68023"; then find "osmo-mgw-1.4.0.81-68023" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-mgw-1.4.0.81-68023" || { sleep 5 && rm -rf "osmo-mgw-1.4.0.81-68023"; }; else :; fi make[1]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build' make[1]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build' Making distclean in doc make[2]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc' Making distclean in examples make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc/examples' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../doc/examples" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc/examples' Making distclean in manuals make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc/manuals' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../doc/manuals" || test -z "" || rm -f rm -rf osmomgw-usermanual__*.png osmomgw-usermanual__*.svg osmomgw-usermanual.check osmomgw-usermanual.pdf osmomgw-usermanual.html osmomgw-vty-reference.pdf osmomgw-vty-reference.lint generated common build rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc/manuals' make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../doc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc' rm -f Makefile make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/doc' Making distclean in include make[2]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/include' Making distclean in osmocom make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom' Making distclean in mgcp_client make[4]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom/mgcp_client' test -z "mgcp_common.h" || rm -f mgcp_common.h rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/mgcp_client" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom/mgcp_client' Making distclean in mgcp make[4]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom/mgcp' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../include/osmocom/mgcp" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[4]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom/mgcp' make[4]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include/osmocom" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom' rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/include/osmocom' make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/include' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/include' rm -f Makefile make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/include' Making distclean in src make[2]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/src' Making distclean in libosmo-mgcp-client make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/src/libosmo-mgcp-client' test -z "libosmo-mgcp-client.la " || rm -f libosmo-mgcp-client.la rm -f ./so_locations rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libosmo-mgcp-client" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/src/libosmo-mgcp-client' Making distclean in libosmo-mgcp make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/src/libosmo-mgcp' rm -rf .libs _libs test -z "libosmo-mgcp.a " || rm -f libosmo-mgcp.a rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/libosmo-mgcp" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/src/libosmo-mgcp' Making distclean in osmo-mgw make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/src/osmo-mgw' rm -f osmo-mgw rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src/osmo-mgw" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/src/osmo-mgw' make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/src' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/src' rm -f Makefile make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/src' Making distclean in tests make[2]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests' Making distclean in mgcp_client make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp_client' rm -rf .libs _libs rm -f mgcp_client_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/mgcp_client" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp_client' Making distclean in mgcp make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp' rm -rf .libs _libs rm -f mgcp_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../tests/mgcp" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests/mgcp' make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests' rm -rf .libs _libs test ! -f '../../tests/testsuite' || \ /bin/bash '../../tests/testsuite' --clean rm -f *.lo test -z "atlocal" || rm -f atlocal test . = "../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests' rm -f Makefile make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/tests' Making distclean in contrib make[2]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib' Making distclean in systemd make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib/systemd' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib/systemd' make[3]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib' rm -f Makefile make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build/contrib' make[2]: Entering directory '/build/osmo-mgw-1.4.0.81-68023/_build' rm -rf .libs _libs rm -f *.lo test -z "libosmo-mgcp-client.pc" || rm -f libosmo-mgcp-client.pc test . = ".." || test -z "" || rm -f rm -f bscconfig.h stamp-h1 rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory '/build/osmo-mgw-1.4.0.81-68023/_build' if test -d "osmo-mgw-1.4.0.81-68023"; then find "osmo-mgw-1.4.0.81-68023" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-mgw-1.4.0.81-68023" || { sleep 5 && rm -rf "osmo-mgw-1.4.0.81-68023"; }; else :; fi ========================================================= osmo-mgw-1.4.0.81-68023 archives ready for distribution: osmo-mgw-1.4.0.81-68023.tar.gz osmo-mgw-1.4.0.81-68023.tar.bz2 ========================================================= + '[' 1 = 1 ']' + '[' 1 = 1 ']' + make -C /build/doc/manuals publish make: Entering directory '/build/doc/manuals' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] make: *** [publish] Error 255 /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/doc/manuals' Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Fri Dec 7 09:51:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 7 Dec 2018 09:51:47 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-mgw_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#1885?= In-Reply-To: <687797417.1144.1544176147429.JavaMail.jenkins@jenkins.osmocom.org> References: <687797417.1144.1544176147429.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <603878993.1145.1544176307387.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Dec 7 09:54:09 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 7 Dec 2018 09:54:09 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-hlr_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#1681?= Message-ID: <1730056977.1146.1544176449940.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 375.27 KB...] make[4]: Leaving directory ' make[3]: Leaving directory ' (cd tests && make top_distdir=../osmo-hlr-0.2.1.86-55f5 distdir=../osmo-hlr-0.2.1.86-55f5/tests \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory ' (cd auc && make top_distdir=../../osmo-hlr-0.2.1.86-55f5 distdir=../../osmo-hlr-0.2.1.86-55f5/tests/auc \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' (cd gen_ts_55_205_test_sets && make top_distdir=../../../osmo-hlr-0.2.1.86-55f5 distdir=../../../osmo-hlr-0.2.1.86-55f5/tests/auc/gen_ts_55_205_test_sets \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[5]: Entering directory ' make[5]: Leaving directory ' make[4]: Leaving directory ' (cd gsup_server && make top_distdir=../../osmo-hlr-0.2.1.86-55f5 distdir=../../osmo-hlr-0.2.1.86-55f5/tests/gsup_server \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' (cd db && make top_distdir=../../osmo-hlr-0.2.1.86-55f5 distdir=../../osmo-hlr-0.2.1.86-55f5/tests/db \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' (cd gsup && make top_distdir=../../osmo-hlr-0.2.1.86-55f5 distdir=../../osmo-hlr-0.2.1.86-55f5/tests/gsup \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[4]: Entering directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make \ top_distdir="osmo-hlr-0.2.1.86-55f5" distdir="osmo-hlr-0.2.1.86-55f5" \ dist-hook make[3]: Entering directory ' echo 0.2.1.86-55f5 > osmo-hlr-0.2.1.86-55f5/.tarball-version make[3]: Leaving directory ' test -n "" \ || find "osmo-hlr-0.2.1.86-55f5" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec /bin/bash -c -m a+r {} {} \; \ || chmod -R a+r "osmo-hlr-0.2.1.86-55f5" tardir=osmo-hlr-0.2.1.86-55f5 && ${TAR-tar} chof - "$tardir" | BZIP2=${BZIP2--9} bzip2 -c >osmo-hlr-0.2.1.86-55f5.tar.bz2 make[2]: Leaving directory ' if test -d "osmo-hlr-0.2.1.86-55f5"; then find "osmo-hlr-0.2.1.86-55f5" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-hlr-0.2.1.86-55f5" || { sleep 5 && rm -rf "osmo-hlr-0.2.1.86-55f5"; }; else :; fi make[1]: Leaving directory ' make[1]: Entering directory ' Making distclean in doc make[2]: Entering directory ' Making distclean in examples make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../doc/examples" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory ' Making distclean in manuals make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../doc/manuals" || test -z "" || rm -f rm -rf osmohlr-usermanual__*.png osmohlr-usermanual__*.svg osmohlr-usermanual.check osmohlr-usermanual.pdf osmohlr-usermanual.html osmohlr-vty-reference.pdf osmohlr-vty-reference.lint generated common build rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../doc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' Making distclean in src make[2]: Entering directory ' Making distclean in gsupclient make[3]: Entering directory ' test -z "libosmo-gsup-client.la" || rm -f libosmo-gsup-client.la rm -f ./so_locations rm -rf .libs _libs rm -f gsup-test-client rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../src/gsupclient" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -f osmo-hlr osmo-hlr-db-tool osmo-euse-demo test -z "db_bootstrap.h " || rm -f db_bootstrap.h rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../src" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -rf ./.deps rm -f Makefile make[2]: Leaving directory ' Making distclean in include make[2]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../include" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f Makefile make[2]: Leaving directory ' Making distclean in sql make[2]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../sql" || test -z "" || rm -f rm -f Makefile make[2]: Leaving directory ' Making distclean in contrib make[2]: Entering directory ' Making distclean in systemd make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../contrib/systemd" || test -z "" || rm -f rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../contrib" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' Making distclean in tests make[2]: Entering directory ' Making distclean in auc make[3]: Entering directory ' Making distclean in gen_ts_55_205_test_sets make[4]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "" || rm -f test . = "../../../../../tests/auc/gen_ts_55_205_test_sets" || test -z "" || rm -f rm -f Makefile make[4]: Leaving directory ' make[4]: Entering directory ' rm -f auc_ts_55_205_test_sets rm -rf .libs _libs rm -f auc_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/auc" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[4]: Leaving directory ' rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' Making distclean in gsup_server make[3]: Entering directory ' rm -rf .libs _libs rm -f gsup_server_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/gsup_server" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' Making distclean in db make[3]: Entering directory ' rm -f db_test rm -rf .libs _libs rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/db" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' Making distclean in gsup make[3]: Entering directory ' rm -rf .libs _libs rm -f gsup_test rm -f *.o rm -f *.lo rm -f *.tab.c test -z "" || rm -f test . = "../../../../tests/gsup" || test -z "" || rm -f rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -rf ./.deps rm -f Makefile make[3]: Leaving directory ' make[3]: Entering directory ' rm -rf .libs _libs test ! -f '../../../tests/testsuite' || \ /bin/bash '../../../tests/testsuite' --clean rm -f *.lo test -z "" || rm -f test . = "../../../tests" || test -z "" || rm -f test -z "atconfig " || rm -f atconfig rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags make[3]: Leaving directory ' rm -f Makefile make[2]: Leaving directory ' make[2]: Entering directory ' rm -rf .libs _libs rm -f *.lo test -z "libosmo-gsup-client.pc" || rm -f libosmo-gsup-client.pc test . = "../.." || test -z "" || rm -f rm -f libtool config.lt rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags rm -f cscope.out cscope.in.out cscope.po.out cscope.files make[2]: Leaving directory ' rm -f config.status config.cache config.log configure.lineno config.status.lineno rm -f Makefile make[1]: Leaving directory ' if test -d "osmo-hlr-0.2.1.86-55f5"; then find "osmo-hlr-0.2.1.86-55f5" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "osmo-hlr-0.2.1.86-55f5" || { sleep 5 && rm -rf "osmo-hlr-0.2.1.86-55f5"; }; else :; fi ======================================================== osmo-hlr-0.2.1.86-55f5 archives ready for distribution: osmo-hlr-0.2.1.86-55f5.tar.bz2 ======================================================== + [ 1 = 1 ] + [ 1 = 1 ] + make -C publish make: Entering directory ' mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile= -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] :25: recipe for target 'publish' failed make: *** [publish] Error 255 make: Leaving directory ' Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Fri Dec 7 09:57:10 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 7 Dec 2018 09:57:10 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-hlr_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#1682?= In-Reply-To: <1730056977.1146.1544176449940.JavaMail.jenkins@jenkins.osmocom.org> References: <1730056977.1146.1544176449940.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <130309191.1147.1544176630081.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Dec 7 09:59:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 09:59:29 +0000 Subject: Change in libosmocore[master]: Add osmo_sockaddr_in_to_str_and_uint() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11842 ) Change subject: Add osmo_sockaddr_in_to_str_and_uint() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie384483124d407a960ab6732e6a7fd90554389d2 Gerrit-Change-Number: 11842 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 07 Dec 2018 09:59:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 10:08:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 7 Dec 2018 10:08:17 +0000 Subject: Change in libasn1c[master]: jenkins.sh: disable parallel build Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12194 Change subject: jenkins.sh: disable parallel build ...................................................................... jenkins.sh: disable parallel build Avoid a race condition that causes the build to fail on Jenkins with: asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ Change-Id: Ib853a93bffc4cd78d4f08624fb1e56772ce68ce5 --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/94/12194/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 7d68736..dbdfda6 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -14,7 +14,10 @@ autoreconf --install --force ./configure --enable-werror -$MAKE $PARALLEL_MAKE + +# Parallel make is disabled due to a race condition. On Jenkins, it often +# aborts the build with: "asn1p_y.y:357:13: error: 'param' undeclared" +$MAKE -j1 $MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/12194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib853a93bffc4cd78d4f08624fb1e56772ce68ce5 Gerrit-Change-Number: 12194 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 10:10:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 10:10:05 +0000 Subject: Change in osmo-trx[master]: lms: Move {under, over}run checks into separate method In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12125 ) Change subject: lms: Move {under,over}run checks into separate method ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12125/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/#/c/12125/2/Transceiver52M/device/lms/LMSDevice.cpp at 538 PS2, Line 538: update_stream_stats(i, underrun, overrun); > the under/overrun stuff now moved to above rc != len check, are your sure that is correct? Yes, that's fine too, but needs proper explanation, I'll add it to next commit. https://gerrit.osmocom.org/#/c/12125/2/Transceiver52M/device/lms/LMSDevice.cpp at 544 PS2, Line 544: //if (timestamp != (TIMESTAMP)rx_metadata.timestamp) > ? My bad, some local state sneaked in. -- To view, visit https://gerrit.osmocom.org/12125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7f450aa79f6285d14826c40ecfdd9490d00509ef Gerrit-Change-Number: 12125 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 10:10:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 10:14:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 10:14:42 +0000 Subject: Change in osmo-trx[master]: Add CTRL log category In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12120 to look at the new patch set (#4). Change subject: Add CTRL log category ...................................................................... Add CTRL log category This log category is applied to messages related to TRX CTRL socket interface, and it's printed in yellow, same color used in osmo-bts-trx for TRX category (so same messages are printed with same color in both sides). Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 --- M CommonLibs/debug.c M CommonLibs/debug.h M Transceiver52M/Transceiver.cpp 3 files changed, 14 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/20/12120/4 -- To view, visit https://gerrit.osmocom.org/12120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 Gerrit-Change-Number: 12120 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 10:14:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 10:14:42 +0000 Subject: Change in osmo-trx[master]: lms: Move {under, over}run checks into separate method In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12125 to look at the new patch set (#3). Change subject: lms: Move {under,over}run checks into separate method ...................................................................... lms: Move {under,over}run checks into separate method Change-Id: I7f450aa79f6285d14826c40ecfdd9490d00509ef --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 2 files changed, 17 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/25/12125/3 -- To view, visit https://gerrit.osmocom.org/12125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7f450aa79f6285d14826c40ecfdd9490d00509ef Gerrit-Change-Number: 12125 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 10:14:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 10:14:43 +0000 Subject: Change in osmo-trx[master]: lms: Do {under, over}run checks even if LMS_RecvStream fails Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12195 Change subject: lms: Do {under,over}run checks even if LMS_RecvStream fails ...................................................................... lms: Do {under,over}run checks even if LMS_RecvStream fails Under failure, it could still be that stream status is updated, so let's father that in all cases. Change-Id: I4e2b8be06d2993db1bab233948a8ee774b8ac4ee --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/95/12195/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 3dd48ab..76da056 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -535,6 +535,7 @@ for (i = 0; i Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 10:26:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 10:27:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 7 Dec 2018 10:27:20 +0000 Subject: Change in osmo-msc[master]: provide software version information to gsup peer In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12178 ) Change subject: provide software version information to gsup peer ...................................................................... Patch Set 4: > Patch Set 4: Verified-1 > > Build Failed > > https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-msc/992/ : FAILURE Something is wrong on the jenkins bot: CCLD msc_vlr_test_umts_authen /bin/bash: line 1: 7890 Illegal instruction (core dumped) /bin/bash ../../libtool --silent --tag=CC --mode=link gcc -Wall -ggdb3 -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libsmpp34/include/ -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmo-abis/include/ -I/build/deps/install/stow/libosmo-sccp/include/ -I/build/deps/install/stow/osmo-mgw/include/ -I/build/deps/install/stow/osmo-hlr/include/ -g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess -Wl,--wrap=osmo_gsup_client_create -Wl,--wrap=osmo_gsup_client_create2 -Wl,--wrap=osmo_gsup_client_send -Wl,--wrap=a_iface_tx_dtap -Wl,--wrap=a_iface_tx_clear_cmd -Wl,--wrap=a_iface_tx_paging -Wl,--wrap=ranap_iu_tx -Wl,--wrap=ranap_iu_tx_release -Wl,--wrap=ranap_iu_tx_common_id -Wl,--wrap=ranap_iu_page_cs -Wl,--wrap=msc_stop_paging -Wl,--wrap=gsm340_gen_scts -Wl,--wrap=osmo_get_rand_id -Wl,--wrap=msc_mgcp_call_release -Wl,--wrap=msc_mgcp_call_assignment -Wl,--wrap=a_iface_tx_cipher_mode -Wl,--wrap=ranap_iu_tx_sec_mode_cmd -Wl,--wrap=osmo_sccp_tx_data_msg -o msc_vlr_test_ss msc_vlr_test_ss.o msc_vlr_tests.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -L/build/deps/install/stow/libsmpp34/lib -lsmpp34 -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmocore -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmogsm -losmocore -L/build/deps/install/stow/libosmocore/lib -ltalloc -losmovty -losmocore -L/build/deps/install/stow/libosmo-abis/lib -losmoabis -L/build/deps/install/stow/libosmo-sccp/lib -losmo-sigtran -L/build/deps/install/stow/osmo-mgw/lib -losmo-mgcp-client -L/build/deps/install/stow/osmo-hlr/lib -losmo-gsup-client -ldbi -lrt Makefile:731: recipe for target 'msc_vlr_test_ss' failed -- To view, visit https://gerrit.osmocom.org/12178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2eba32569349facdbb1fda201067c62cc804ccf4 Gerrit-Change-Number: 12178 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 07 Dec 2018 10:27:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 10:33:29 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 7 Dec 2018 10:33:29 +0000 Subject: Change in libosmocore[master]: Add osmo_sockaddr_in_to_str_and_uint() In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11842 ) Change subject: Add osmo_sockaddr_in_to_str_and_uint() ...................................................................... Add osmo_sockaddr_in_to_str_and_uint() It's similar to osmo_sockaddr_to_str_and_uint() but does not require odd typecasting for AF_INET case. Make osmo_sockaddr_to_str_and_uint() into wrapper around new function and make sure to check for address family before typecasting. Also use proper return type. Change-Id: Ie384483124d407a960ab6732e6a7fd90554389d2 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 23 insertions(+), 5 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 28f89a5..79a61bb 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -11,6 +11,7 @@ #include #include +struct sockaddr_in; struct sockaddr; struct osmo_fd; @@ -49,6 +50,8 @@ unsigned int osmo_sockaddr_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port, const struct sockaddr *sa); +size_t osmo_sockaddr_in_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port, + const struct sockaddr_in *sin); 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 0e17a28..e804ab5 100644 --- a/src/socket.c +++ b/src/socket.c @@ -569,6 +569,25 @@ return 0; } +/*! Convert sockaddr_in to IP address as char string and port as uint16_t. + * \param[out] addr String buffer to write IP address to, or NULL. + * \param[out] addr_len Size of \a addr. + * \param[out] port Pointer to uint16_t to write the port number to, or NULL. + * \param[in] sin Sockaddr to convert. + * \returns the required string buffer size, like osmo_strlcpy(), or 0 if \a addr is NULL. + */ +size_t osmo_sockaddr_in_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port, + const struct sockaddr_in *sin) +{ + if (port) + *port = ntohs(sin->sin_port); + + if (addr) + return osmo_strlcpy(addr, inet_ntoa(sin->sin_addr), addr_len); + + return 0; +} + /*! Convert sockaddr to IP address as char string and port as uint16_t. * \param[out] addr String buffer to write IP address to, or NULL. * \param[out] addr_len Size of \a addr. @@ -581,11 +600,7 @@ { const struct sockaddr_in *sin = (const struct sockaddr_in *)sa; - if (port) - *port = ntohs(sin->sin_port); - if (addr) - return osmo_strlcpy(addr, inet_ntoa(sin->sin_addr), addr_len); - return 0; + return osmo_sockaddr_in_to_str_and_uint(addr, addr_len, port, sin); } /*! Initialize a unix domain socket (including bind/connect) -- To view, visit https://gerrit.osmocom.org/11842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie384483124d407a960ab6732e6a7fd90554389d2 Gerrit-Change-Number: 11842 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 10:48:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 10:48:45 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: document and refactor BurstForwarder In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12181 ) Change subject: trx_toolkit/burst_fwd.py: document and refactor BurstForwarder ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12181/1/src/target/trx_toolkit/burst_fwd.py File src/target/trx_toolkit/burst_fwd.py: https://gerrit.osmocom.org/#/c/12181/1/src/target/trx_toolkit/burst_fwd.py at 108 PS1, Line 108: # Randomization of RSSI May be worth explaining why those below are not moved inside reset_dl and reset_ul. -- To view, visit https://gerrit.osmocom.org/12181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6b1bf41cf22f01a7e7ecc91c625fb0d2bf4bfeac Gerrit-Change-Number: 12181 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 10:48:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 10:55:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 10:55:50 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: properly pass-filter multiple time-slots In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12182 ) Change subject: trx_toolkit/burst_fwd.py: properly pass-filter multiple time-slots ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1490adaf7a7c62c966aeb60c1898eaf3b5a1e84 Gerrit-Change-Number: 12182 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 10:55:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 11:04:36 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 7 Dec 2018 11:04:36 +0000 Subject: Change in osmo-hlr[master]: store timestamp of last location update seen from subscriber In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12121 ) Change subject: store timestamp of last location update seen from subscriber ...................................................................... Patch Set 5: (4 comments) https://gerrit.osmocom.org/#/c/12121/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12121/5//COMMIT_MSG at 11 PS5, Line 11: in the 'subscriber' table, in granularity of seconds. > (imho what the value means should be in a code comment and not so much in a commit log) The value is indeed UTC. The conversion from local time to UTC is done by SQlite. I wrote a patch to convert to UTC in our C code, but with that patch the conversion happens twice, so I had to discard this patch. Instead I have added a comment which documents what SQlite will do with the timestamp. https://gerrit.osmocom.org/#/c/12121/5//COMMIT_MSG at 19 PS5, Line 19: 901990000000001|2018-12-04 14:17:12 > I wonder why we don't store it as num of seconds since 1970. [?] Our code only deals with seconds since epoch. SQlite is transforming from seconds since epoch to a string. The reverse transformation can probably be done by SQlite as well; if not, we could easily do it in C. I think storing the time as a string is great for users because an epoch timestamp is meaningless to humans. It also makes future VTY timestamp display trivial (just print a string). https://gerrit.osmocom.org/#/c/12121/5/sql/hlr.sql File sql/hlr.sql: https://gerrit.osmocom.org/#/c/12121/5/sql/hlr.sql at 42 PS5, Line 42: last_lu_seen TIMESTAMP default NULL > found https://www.sqlite.org/lang_datefunc. [?] I also noticed that documentation seems to be lacking here. My tests are producing good results though. https://gerrit.osmocom.org/#/c/12121/5/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12121/5/src/db_hlr.c at 637 PS5, Line 637: "Cannot update LU timestamp for subscriber ID=%"PRId64": SQL error: (%d) %s\n", > Be careful in general with interleavin strings and PRId64 type of strings, I recall seeing compilers [?] This problem also affects many other existing strings in this file. So I would defer this to a separate patch. -- To view, visit https://gerrit.osmocom.org/12121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Gerrit-Change-Number: 12121 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 07 Dec 2018 11:04:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 11:07:23 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 7 Dec 2018 11:07:23 +0000 Subject: Change in osmo-hlr[master]: store a timestamp of the last location update seen from a subscriber In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12121 to look at the new patch set (#6). Change subject: store a timestamp of the last location update seen from a subscriber ...................................................................... store a timestamp of the last location update seen from a subscriber Timestamps are stored in the HLR DB in the new 'last_lu_seen' column of the 'subscriber' table, in UTC and in granularity of seconds. At present, osmo-hlr only records these timestamps but otherwise makes no use of them. Because the timestamps are stored in a human-readable form, they may already provide value to external processes which need this information. For example: sqlite> select imsi,last_lu_seen from subscriber; 901990000000001|2018-12-04 14:17:12 I didn't bother adding additional tests because the code added with this commit is already being exercised by several calls to db_subscr_lu() in db_test.c. This change requires a HLR DB schema update. Existing databases won't be upgraded automatically. However, osmo-hlr will refuse to operate with databases which are not upgraded. Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Related: OS#2838 --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c 4 files changed, 108 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/21/12121/6 -- To view, visit https://gerrit.osmocom.org/12121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Gerrit-Change-Number: 12121 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 11:18:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 11:18:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix TC_paging_resp_unsol Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12196 Change subject: bsc: Fix TC_paging_resp_unsol ...................................................................... bsc: Fix TC_paging_resp_unsol TC_paging_resp_unsol spent some time in gerrit before being merged. As a result, other commits were merged in between the test was submitted (tested) and merged. As a result, commit a5302c8151d1da2e43ed52efc0544d70bffab911 was merged while this test was still in gerrit and thus was not updated accordingly. Similar stuff happened with the osmo-bsc commit fixing the scenario this test was showcasing: The osmo-bsc patch (77cd1129931928d2a6e7667d0374feeeed71b0ce) had merge conflict with other osmo-bsc commits merged in-between, and was merged even later than the commit introducing this TTCN3 test, so failures were expected for this test for a while. Change-Id: I933cba41912640eb7e15be4a27bda5b4dd489962 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/12196/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 962d6c6..81cf23e 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1519,7 +1519,7 @@ f_ipa_tx(0, ts_RSL_EST_IND(dt.rsl_chan_nr, valueof(ts_RslLinkID_DCCH(0)), enc_PDU_ML3_MS_NW(l3))); /* expect BSC to disable the channel */ - f_expect_chan_rel(0, dt.rsl_chan_nr); + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/12196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I933cba41912640eb7e15be4a27bda5b4dd489962 Gerrit-Change-Number: 12196 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 11:34:02 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 11:34:02 +0000 Subject: Change in libosmocore[master]: cosmetic apn: correct whitespace error Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12197 Change subject: cosmetic apn: correct whitespace error ...................................................................... cosmetic apn: correct whitespace error there is a whitespace between the * and osmo_apn_to_str(). Lets remove this. Change-Id: I094e6eb08eacf2d6459c47a7370837601aa92925 --- M include/osmocom/gsm/apn.h M src/gsm/apn.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/97/12197/1 diff --git a/include/osmocom/gsm/apn.h b/include/osmocom/gsm/apn.h index 8d35324..288b229 100644 --- a/include/osmocom/gsm/apn.h +++ b/include/osmocom/gsm/apn.h @@ -18,4 +18,4 @@ const char *ni, int have_3dig_mnc); int osmo_apn_from_str(uint8_t *apn_enc, size_t max_apn_enc_len, const char *str); -char * osmo_apn_to_str(char *out_str, const uint8_t *apn_enc, size_t apn_enc_len); +char *osmo_apn_to_str(char *out_str, const uint8_t *apn_enc, size_t apn_enc_len); diff --git a/src/gsm/apn.c b/src/gsm/apn.c index e6632dd..2674663 100644 --- a/src/gsm/apn.c +++ b/src/gsm/apn.c @@ -68,7 +68,7 @@ * * \returns out_str on success and NULL otherwise */ -char * osmo_apn_to_str(char *out_str, const uint8_t *apn_enc, size_t apn_enc_len) +char *osmo_apn_to_str(char *out_str, const uint8_t *apn_enc, size_t apn_enc_len) { char *str = out_str; size_t rest_chars = apn_enc_len; -- To view, visit https://gerrit.osmocom.org/12197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I094e6eb08eacf2d6459c47a7370837601aa92925 Gerrit-Change-Number: 12197 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 11:34:03 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 11:34:03 +0000 Subject: Change in libosmocore[master]: gsm_29_118.h: Add constant for default port Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12198 Change subject: gsm_29_118.h: Add constant for default port ...................................................................... gsm_29_118.h: Add constant for default port The specification defines a default port where the SGs interface should be reachable. Lets add a define-constant for it. Change-Id: Ia4b9f547dd980411d15b2691b7f535fa0463f0f1 Related: OS#3615 --- M include/osmocom/gsm/protocol/gsm_29_118.h 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/98/12198/1 diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h index 97a9c43..70f1500 100644 --- a/include/osmocom/gsm/protocol/gsm_29_118.h +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -170,4 +170,7 @@ #define SGS_NS10_DEFAULT 2 #define SGS_NS12_DEFAULT 2 +/* TS 29.118 Section 6.3 */ +#define SGS_PORT_DEFAULT 29118 + const struct tlv_definition sgsap_ie_tlvdef; -- To view, visit https://gerrit.osmocom.org/12198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4b9f547dd980411d15b2691b7f535fa0463f0f1 Gerrit-Change-Number: 12198 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 11:34:03 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 11:34:03 +0000 Subject: Change in libosmocore[master]: gsm29118: add generator functions for GSM29118 messages Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12199 Change subject: gsm29118: add generator functions for GSM29118 messages ...................................................................... gsm29118: add generator functions for GSM29118 messages We already have some GSM29118 related definitions and functions in libosmocore. Lets also add some functions to generate GSM29118 messages (similar to those we have for GSM0808). Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Related: OS#3615 --- M include/Makefile.am A include/osmocom/gsm/gsm29118.h M include/osmocom/gsm/protocol/gsm_29_118.h M src/gsm/gsm29118.c M src/gsm/libosmogsm.map 5 files changed, 344 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/99/12199/1 diff --git a/include/Makefile.am b/include/Makefile.am index 59a5fed..366fd70 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -88,6 +88,7 @@ osmocom/gsm/gsm0808.h \ osmocom/gsm/gsm0808_utils.h \ osmocom/gsm/gsm23003.h \ + osmocom/gsm/gsm29118.h \ osmocom/gsm/gsm48.h \ osmocom/gsm/gsm48_ie.h \ osmocom/gsm/gsm_utils.h \ diff --git a/include/osmocom/gsm/gsm29118.h b/include/osmocom/gsm/gsm29118.h new file mode 100644 index 0000000..e81cce4 --- /dev/null +++ b/include/osmocom/gsm/gsm29118.h @@ -0,0 +1,65 @@ +/*! \file gsm23003.h */ + +/* (C) 2018 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Harald Welte, Philipp Maier + * + * 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. + * + */ + +#pragma once + +#include +#include +#include +#include + +/*! 3GPP TS 3GPP TS 29.018 8.14 SGsAP-PAGING-REQUEST. */ +struct gsm29118_paging_req { + char imsi[GSM48_MI_SIZE]; + char vlr_name[SGS_VLR_NAME_MAXLEN + 1]; + uint8_t serv_ind; + + bool lai_present; + struct osmo_location_area_id lai; +}; + +/*! 3GPP TS 3GPP TS 29.018 8.15 SGsAP-RESET-ACK and 8.16 SGsAP-RESET-INDICATION. */ +struct gsm29118_reset_msg { + bool vlr_name_present; + char vlr_name[SGS_VLR_NAME_MAXLEN + 1]; + bool mme_name_present; + char mme_name[SGS_MME_NAME_LEN + 1]; +}; + +struct msgb *gsm29118_msgb_alloc(void); +struct msgb *gsm29118_create_alert_req(const char *imsi); +struct msgb *gsm29118_create_dl_ud(const char *imsi, struct msgb *nas_msg); +struct msgb *gsm29118_create_eps_det_ack(const char *imsi); +struct msgb *gsm29118_create_imsi_det_ack(const char *imsi); +struct msgb *gsm29118_create_lu_ack(const char *imsi, const struct osmo_location_area_id *lai, const uint8_t *new_id, + unsigned int new_id_len); +struct msgb *gsm29118_create_lu_rej(const char *imsi, uint8_t rej_cause, const struct osmo_location_area_id *lai); +struct msgb *gsm29118_create_mm_info_req(const char *imsi, const uint8_t *mm_info, uint8_t mm_info_len); +struct msgb *gsm29118_create_paging_req(struct gsm29118_paging_req *params); +struct msgb *gsm29118_create_reset_ack(struct gsm29118_reset_msg *params); +struct msgb *gsm29118_create_reset_ind(struct gsm29118_reset_msg *params); +struct msgb *gsm29118_create_status(const char *imsi, enum sgsap_sgs_cause cause, const struct msgb *err_msg); +struct msgb *gsm29118_create_release_req(const char *imsi, const uint8_t sgs_cause); +struct msgb *gsm29118_create_service_abort_req(const char *imsi); diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h index 70f1500..cfe772a 100644 --- a/include/osmocom/gsm/protocol/gsm_29_118.h +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -173,4 +173,11 @@ /* TS 29.118 Section 6.3 */ #define SGS_PORT_DEFAULT 29118 +/* TS 29.118 Section 9.4.13 MME Name */ +#define SGS_MME_NAME_LEN 55 + +/* TS 29.118 Section 9.4.22 VLR name + * See also: RFC1123 Section 2.1 Host Names and Numbers */ +#define SGS_VLR_NAME_MAXLEN 255 + const struct tlv_definition sgsap_ie_tlvdef; diff --git a/src/gsm/gsm29118.c b/src/gsm/gsm29118.c index 3898be6..17456b6 100644 --- a/src/gsm/gsm29118.c +++ b/src/gsm/gsm29118.c @@ -1,7 +1,32 @@ +/* (C) 2018 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Harald Welte, Philipp Maier + * + * 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. + */ + #include #include #include +#include +#include +#include const struct value_string sgsap_msg_type_names[] = { { SGSAP_MSGT_PAGING_REQ, "PAGING-REQUEST" }, @@ -156,3 +181,234 @@ [SGSAP_IE_TMSI_BASED_NRI_CONT] = { TLV_TYPE_TLV }, }, }; + + +/* Allocate an empty message buffer, suitable to hold a complite SGsAP msg. */ +struct msgb *gsm29118_msgb_alloc(void) +{ + /* by far sufficient for the maximum size message of 298 bytes + * (9+7+5+3+10+253+10+1) SGsAP-UP-UD */ + return msgb_alloc_headroom(1024, 128, "SGsAP"); +} + +/* Encode VLR/MME name from string and append to SGsAP msg */ +static void msgb_sgsap_name_put(struct msgb *msg, enum sgsap_iei iei, const char *name) +{ + uint8_t buf[APN_MAXLEN]; + uint8_t len; + /* encoding is like DNS names, which is like APN fields */ + memset(buf, 0, sizeof(buf)); + len = osmo_apn_from_str(buf, sizeof(buf), name); + + /* Note: While the VLR-Name (see 3GPP TS 29.118, chapter 9.4.22) has + * a flexible length, the MME-Name has a fixed size of 55 octets. (see + * 3GPP TS 29.118, chapter 9.4.13). */ + if (iei == SGSAP_IE_MME_NAME) + len = 55; + msgb_tlv_put(msg, iei, len, buf); +} + +/* Encode IMSI from string representation and append to SGSaAP msg */ +static void msgb_sgsap_imsi_put(struct msgb *msg, const char *imsi) +{ + uint8_t buf[16]; + uint8_t len; + /* encoding is just like TS 04.08 */ + len = gsm48_generate_mid_from_imsi(buf, imsi); + /* skip first two bytes (tag+length) so we can use msgb_tlv_put */ + msgb_tlv_put(msg, SGSAP_IE_IMSI, len - 2, buf + 2); +} + +/* Encode LAI from struct representation and append to SGSaAP msg */ +static void msgb_sgsap_lai_put(struct msgb *msg, const struct osmo_location_area_id *lai) +{ + struct gsm48_loc_area_id lai_enc; + gsm48_generate_lai2(&lai_enc, lai); + msgb_tlv_put(msg, SGSAP_IE_LAI, 5, (uint8_t *) & lai_enc); +} + +/* Many messages consist only of a message type and an imsi */ +static struct msgb *create_simple_msg(enum sgsap_msg_type msg_type, const char *imsi) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_push_u8(msg, msg_type); + return msg; +} + +/* 8.3 SGsAP-ALERT-REQUEST. + * \param[in] imsi IMSI of the subscriber. + * \returns callee-allocated msgb with the encoded message.*/ +struct msgb *gsm29118_create_alert_req(const char *imsi) +{ + return create_simple_msg(SGSAP_MSGT_ALERT_REQ, imsi); +} + +/* 8.4 SGsAP-DOWNLINK-UNITDATA. + * \param[in] imsi IMSI of the subscriber. + * \param[in] nas_msg user provided message buffer with L3 message. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_dl_ud(const char *imsi, struct msgb *nas_msg) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_tlv_put(msg, SGSAP_IE_NAS_MSG_CONTAINER, nas_msg->len, nas_msg->data); + msgb_push_u8(msg, SGSAP_MSGT_DL_UD); + return msg; +} + +/* 8.5 SGsAP-EPS-DETACH-ACK. + * \param[in] imsi IMSI of the subscriber. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_eps_det_ack(const char *imsi) +{ + return create_simple_msg(SGSAP_MSGT_EPS_DET_ACK, imsi); +} + +/* 8.7 SGsAP-IMSI-DETACH-ACK. + * \param[in] imsi IMSI of the subscriber. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_imsi_det_ack(const char *imsi) +{ + return create_simple_msg(SGSAP_MSGT_IMSI_DET_ACK, imsi); +} + +/*! 8.9 SGsAP-LOCATION-UPDATE-ACCEPT. + * \param[in] imsi IMSI of the subscriber. + * \param[in] lai Location Area Identity (optional, may be NULL). + * \param[in] new_id value part of new Mobile Identity (optional, may be NULL). + * \param[in] new_id_len length of \a new_id in octets. + * \returns callee-allocated msgb with the encoded message */ +struct msgb *gsm29118_create_lu_ack(const char *imsi, const struct osmo_location_area_id *lai, const uint8_t *new_id, + unsigned int new_id_len) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_sgsap_lai_put(msg, lai); + if (new_id && new_id_len) + msgb_tlv_put(msg, SGSAP_IE_MOBILE_ID, new_id_len, new_id); + msgb_push_u8(msg, SGSAP_MSGT_LOC_UPD_ACK); + return msg; +} + +/* 8.10 SGsAP-LOCATION-UPDATE-REJECT. + * \param[in] imsi IMSI of the subscriber. + * \param[in] rej_cause LU cause code, see also 3GPP TS 29.018, subclause 18.4.21. + * \param[in] lai location area identifier. + * \returns callee-allocated msgb with the encoded message */ +struct msgb *gsm29118_create_lu_rej(const char *imsi, uint8_t rej_cause, const struct osmo_location_area_id *lai) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_tlv_put(msg, SGSAP_IE_REJECT_CAUSE, 1, &rej_cause); + if (lai) + msgb_sgsap_lai_put(msg, lai); + msgb_push_u8(msg, SGSAP_MSGT_LOC_UPD_REJ); + return msg; +} + +/* 8.12 SGsAP-MM-INFORMATION-REQUEST. + * \param[in] imsi IMSI of the subscriber. + * \param[in] mm_info MM information, see also 3GPP TS 29.018, subclause 18.4.16. + * \param[in] mm_info_len length of \a mm_info in octets. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_mm_info_req(const char *imsi, const uint8_t *mm_info, uint8_t mm_info_len) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_tlv_put(msg, SGSAP_IE_MM_INFO, mm_info_len, mm_info); + msgb_push_u8(msg, SGSAP_MSGT_MM_INFO_REQ); + return msg; +} + +/* 8.14 SGsAP-PAGING-REQUEST. + * \param[in] params user provided memory with message contents to encode. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_paging_req(struct gsm29118_paging_req *params) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, params->imsi); + msgb_sgsap_name_put(msg, SGSAP_IE_VLR_NAME, params->vlr_name); + msgb_tlv_put(msg, SGSAP_IE_SERVICE_INDICATOR, 1, ¶ms->serv_ind); + if (params->lai_present) + msgb_sgsap_lai_put(msg, ¶ms->lai); + msgb_push_u8(msg, SGSAP_MSGT_PAGING_REQ); + return msg; +} + +/* 8.15 SGsAP-RESET-ACK. + * \param[in] params user provided memory with message contents to encode. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_reset_ack(struct gsm29118_reset_msg *params) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + if (params->vlr_name_present && params->mme_name_present == false) + msgb_sgsap_name_put(msg, SGSAP_IE_VLR_NAME, params->vlr_name); + else if (params->mme_name_present && params->vlr_name_present == false) + msgb_sgsap_name_put(msg, SGSAP_IE_MME_NAME, params->mme_name); + else + OSMO_ASSERT(false); + msgb_push_u8(msg, SGSAP_MSGT_RESET_ACK); + return msg; +} + +/* 8.16 SGsAP-RESET-INDICATION. + * \param[in] params user provided memory with message contents to encode. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_reset_ind(struct gsm29118_reset_msg *params) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + if (params->vlr_name_present && params->mme_name_present == false) + msgb_sgsap_name_put(msg, SGSAP_IE_VLR_NAME, params->vlr_name); + else if (params->mme_name_present && params->vlr_name_present == false) + msgb_sgsap_name_put(msg, SGSAP_IE_MME_NAME, params->mme_name); + else + OSMO_ASSERT(false); + msgb_push_u8(msg, SGSAP_MSGT_RESET_IND); + return msg; +} + +/* 8.18 SGsAP-STATUS. + * \param[in] imsi IMSI of the subscriber. + * \param[in] cause sgs related cause code. + * \param[in] err_msg user provided message buffer containing the errornous message. + * \returns callee-allocated msgb with the encoded message */ +struct msgb *gsm29118_create_status(const char *imsi, enum sgsap_sgs_cause cause, const struct msgb *err_msg) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + uint8_t c8 = cause; + unsigned int err_msg_len; + msgb_tlv_put(msg, SGSAP_IE_SGS_CAUSE, 1, &c8); + if (imsi) + msgb_sgsap_imsi_put(msg, imsi); + if (err_msg) { + err_msg_len = msgb_l2len(err_msg); + if (err_msg_len > 255) + err_msg_len = 255; + msgb_tlv_put(msg, SGSAP_IE_ERR_MSG, err_msg_len, msgb_l2(err_msg)); + } + msgb_push_u8(msg, SGSAP_MSGT_STATUS); + return msg; +} + +/* 8.23 SGsAP-RELEASE-REQUEST. + * \param[in] imsi IMSI of the subscriber. + * \param[in] cause sgs related cause code. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_release_req(const char *imsi, const uint8_t sgs_cause) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + if (sgs_cause) + msgb_tlv_put(msg, SGSAP_IE_SGS_CAUSE, 1, &sgs_cause); + msgb_push_u8(msg, SGSAP_MSGT_RELEASE_REQ); + return msg; +} + +/* 8.24 SGsAP-SERVICE-ABORT-REQUEST. + * \param[in] imsi IMSI of the subscriber. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_service_abort_req(const char *imsi) +{ + return create_simple_msg(SGSAP_MSGT_SERVICE_ABORT_REQ, imsi); +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 04a9826..e9a9e4f 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -219,6 +219,21 @@ gsm0808_lcls_control_names; gsm0808_lcls_status_names; +gsm29118_msgb_alloc; +gsm29118_create_alert_req; +gsm29118_create_dl_ud; +gsm29118_create_eps_det_ack; +gsm29118_create_imsi_det_ack; +gsm29118_create_lu_ack; +gsm29118_create_lu_rej; +gsm29118_create_mm_info_req; +gsm29118_create_paging_req; +gsm29118_create_reset_ack; +gsm29118_create_reset_ind; +gsm29118_create_status; +gsm29118_create_release_req; +gsm29118_create_service_abort_req; + gsm0858_rsl_ul_meas_enc; gsm338_get_sms_alphabet; -- To view, visit https://gerrit.osmocom.org/12199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Gerrit-Change-Number: 12199 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 11:49:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 11:49:17 +0000 Subject: Change in osmo-hlr[master]: store a timestamp of the last location update seen from a subscriber In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12121 ) Change subject: store a timestamp of the last location update seen from a subscriber ...................................................................... Patch Set 6: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12121/5/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12121/5/src/db_hlr.c at 637 PS5, Line 637: LOGP(DAUC, LOGL_ERROR, > This problem also affects many other existing strings in this file. [?] Fine, just keep that in mind for next patches. -- To view, visit https://gerrit.osmocom.org/12121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Gerrit-Change-Number: 12121 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 07 Dec 2018 11:49:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 11:49:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 11:49:57 +0000 Subject: Change in libosmocore[master]: cosmetic apn: correct whitespace error In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12197 ) Change subject: cosmetic apn: correct whitespace error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I094e6eb08eacf2d6459c47a7370837601aa92925 Gerrit-Change-Number: 12197 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 11:49:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 11:50:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 11:50:23 +0000 Subject: Change in libosmocore[master]: gsm_29_118.h: Add constant for default port In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12198 ) Change subject: gsm_29_118.h: Add constant for default port ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia4b9f547dd980411d15b2691b7f535fa0463f0f1 Gerrit-Change-Number: 12198 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 11:50:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 11:53:23 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 11:53:23 +0000 Subject: Change in libosmocore[master]: cosmetic apn: correct whitespace error In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/12197 ) Change subject: cosmetic apn: correct whitespace error ...................................................................... cosmetic apn: correct whitespace error there is a whitespace between the * and osmo_apn_to_str(). Lets remove this. Change-Id: I094e6eb08eacf2d6459c47a7370837601aa92925 --- M include/osmocom/gsm/apn.h M src/gsm/apn.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/apn.h b/include/osmocom/gsm/apn.h index 8d35324..288b229 100644 --- a/include/osmocom/gsm/apn.h +++ b/include/osmocom/gsm/apn.h @@ -18,4 +18,4 @@ const char *ni, int have_3dig_mnc); int osmo_apn_from_str(uint8_t *apn_enc, size_t max_apn_enc_len, const char *str); -char * osmo_apn_to_str(char *out_str, const uint8_t *apn_enc, size_t apn_enc_len); +char *osmo_apn_to_str(char *out_str, const uint8_t *apn_enc, size_t apn_enc_len); diff --git a/src/gsm/apn.c b/src/gsm/apn.c index e6632dd..2674663 100644 --- a/src/gsm/apn.c +++ b/src/gsm/apn.c @@ -68,7 +68,7 @@ * * \returns out_str on success and NULL otherwise */ -char * osmo_apn_to_str(char *out_str, const uint8_t *apn_enc, size_t apn_enc_len) +char *osmo_apn_to_str(char *out_str, const uint8_t *apn_enc, size_t apn_enc_len) { char *str = out_str; size_t rest_chars = apn_enc_len; -- To view, visit https://gerrit.osmocom.org/12197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I094e6eb08eacf2d6459c47a7370837601aa92925 Gerrit-Change-Number: 12197 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:03:45 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 12:03:45 +0000 Subject: Change in libosmocore[master]: gsm_29_118.h: Add constant for default port In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/12198 ) Change subject: gsm_29_118.h: Add constant for default port ...................................................................... gsm_29_118.h: Add constant for default port The specification defines a default port where the SGs interface should be reachable. Lets add a define-constant for it. Change-Id: Ia4b9f547dd980411d15b2691b7f535fa0463f0f1 Related: OS#3615 --- M include/osmocom/gsm/protocol/gsm_29_118.h 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h index 97a9c43..70f1500 100644 --- a/include/osmocom/gsm/protocol/gsm_29_118.h +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -170,4 +170,7 @@ #define SGS_NS10_DEFAULT 2 #define SGS_NS12_DEFAULT 2 +/* TS 29.118 Section 6.3 */ +#define SGS_PORT_DEFAULT 29118 + const struct tlv_definition sgsap_ie_tlvdef; -- To view, visit https://gerrit.osmocom.org/12198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia4b9f547dd980411d15b2691b7f535fa0463f0f1 Gerrit-Change-Number: 12198 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:06:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 12:06:03 +0000 Subject: Change in libosmocore[master]: gsm29118: add generator functions for GSM29118 messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12199 ) Change subject: gsm29118: add generator functions for GSM29118 messages ...................................................................... Patch Set 1: (6 comments) https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c File src/gsm/gsm29118.c: https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 186 PS1, Line 186: /* Allocate an empty message buffer, suitable to hold a complite SGsAP msg. */ typo: complete? https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 191 PS1, Line 191: return msgb_alloc_headroom(1024, 128, "SGsAP"); So 512 seems far more reasonable, right? https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 207 PS1, Line 207: len = 55; Probably makes sense to at least print an error if strlen(name) > 55 in this case. https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 219 PS1, Line 219: msgb_tlv_put(msg, SGSAP_IE_IMSI, len - 2, buf + 2); why not using msgb_put() if we already have the whole TLV in buf? because the TAG is different? https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 227 PS1, Line 227: msgb_tlv_put(msg, SGSAP_IE_LAI, 5, (uint8_t *) & lai_enc); sizeof(lai_enc) instead of 5 probably? https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 251 PS1, Line 251: struct msgb *gsm29118_create_dl_ud(const char *imsi, struct msgb *nas_msg) does it make sense to require a msgb here API-wise? probably a pointer + len makes more sense. This way if caller doesn't have a msgb doesn't need to create an extra one. -- To view, visit https://gerrit.osmocom.org/12199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Gerrit-Change-Number: 12199 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 12:06:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:14:41 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:14:41 +0000 Subject: Change in osmo-trx[master]: Add TRXCTRL log category In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12120 ) Change subject: Add TRXCTRL log category ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 Gerrit-Change-Number: 12120 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Fri, 07 Dec 2018 12:14:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:15:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 12:15:10 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: also pass-filter UL bursts by time-slot In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12183 ) Change subject: trx_toolkit/burst_fwd.py: also pass-filter UL bursts by time-slot ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb7f5b212e5814aeff8ca8bc875ad066674267cd Gerrit-Change-Number: 12183 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 12:15:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:15:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:15:36 +0000 Subject: Change in osmo-trx[master]: transceiver: Log TRXCTRL iface responses towards osmo-bts-trx In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12122 ) Change subject: transceiver: Log TRXCTRL iface responses towards osmo-bts-trx ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8128c42e63ab1fcd2a58812f3b7cf94435b5bbd8 Gerrit-Change-Number: 12122 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Dec 2018 12:15:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:18:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 12:18:23 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: drop randomization related cmd options In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12184 ) Change subject: trx_toolkit/fake_trx.py: drop randomization related cmd options ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6adc13b8989ade2fab895673525c0ca17bf9b3f2 Gerrit-Change-Number: 12184 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 12:18:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:22:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 12:22:07 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: use generic logging module instead of print() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12185 ) Change subject: trx_toolkit: use generic logging module instead of print() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7fcafabafe8323b58990997a47afdd48b6d1f357 Gerrit-Change-Number: 12185 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 12:22:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:23:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 12:23:01 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_gen.py: fix short version of --burst-type In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12186 ) Change subject: trx_toolkit/burst_gen.py: fix short version of --burst-type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib8a46e25cbc6266c3e147582f9e8045362270151 Gerrit-Change-Number: 12186 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 12:23:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:24:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 12:24:36 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_gen.py: migrate from getopt to argparse In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12187 ) Change subject: trx_toolkit/burst_gen.py: migrate from getopt to argparse ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7eb3f2e2713f1f97293bd47a2eae3b140f63fb59 Gerrit-Change-Number: 12187 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 12:24:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:24:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 12:24:54 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_send.py: migrate from getopt to argparse In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12188 ) Change subject: trx_toolkit/burst_send.py: migrate from getopt to argparse ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1be66aa022a79aa1683f0e6cfebaed568b1736b1 Gerrit-Change-Number: 12188 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 12:24:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:25:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 12:25:23 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_cmd.py: migrate from getopt to argparse In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12189 ) Change subject: trx_toolkit/ctrl_cmd.py: migrate from getopt to argparse ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9bf5ed7384c4f34478975cefe03880eb2fc8069 Gerrit-Change-Number: 12189 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 12:25:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:26:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 12:26:14 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/trx_sniff.py: migrate from getopt to argparse In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12190 ) Change subject: trx_toolkit/trx_sniff.py: migrate from getopt to argparse ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id1dacaa32134bfa68344e6c48310390cdd85cdc9 Gerrit-Change-Number: 12190 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 12:26:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:27:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 12:27:02 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: migrate from getopt to argparse In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12191 ) Change subject: trx_toolkit/fake_trx.py: migrate from getopt to argparse ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0218a328671c591b20b0666dc7c39ba865892acc Gerrit-Change-Number: 12191 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 12:27:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:32:09 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:32:09 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: document and refactor BurstForwarder In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12181 ) Change subject: trx_toolkit/burst_fwd.py: document and refactor BurstForwarder ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12181/1/src/target/trx_toolkit/burst_fwd.py File src/target/trx_toolkit/burst_fwd.py: https://gerrit.osmocom.org/#/c/12181/1/src/target/trx_toolkit/burst_fwd.py at 108 PS1, Line 108: # Randomization of RSSI > May be worth explaining why those below are not moved inside reset_dl and reset_ul. The motivation for this change was introducing RESET CTRL command. Since those flags below are set from the command line, they should not be reseted from the control interface. Moreover, they are going to be removed in the following changes. Let's just merge it. -- To view, visit https://gerrit.osmocom.org/12181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6b1bf41cf22f01a7e7ecc91c625fb0d2bf4bfeac Gerrit-Change-Number: 12181 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Dec 2018 12:32:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:32:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 12:32:40 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: document and refactor BurstForwarder In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12181 ) Change subject: trx_toolkit/burst_fwd.py: document and refactor BurstForwarder ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6b1bf41cf22f01a7e7ecc91c625fb0d2bf4bfeac Gerrit-Change-Number: 12181 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Dec 2018 12:32:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:34:55 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:34:55 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: document and refactor BurstForwarder In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12181 ) Change subject: trx_toolkit/burst_fwd.py: document and refactor BurstForwarder ...................................................................... trx_toolkit/burst_fwd.py: document and refactor BurstForwarder Instead of having all configuration variables of BurstForwarder initialized in the class heading, let's introduce two functions for initialization (resetting to defaults) of both UL/DL params. This would allow to reset a BurstForwarder instance from the control interface in follow-up patches. Let's also introduce some basic documentation for the class fields, which were defined in the heading previously. Change-Id: I6b1bf41cf22f01a7e7ecc91c625fb0d2bf4bfeac --- M src/target/trx_toolkit/burst_fwd.py 1 file changed, 117 insertions(+), 39 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 3834849..f3eeddd 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -4,7 +4,7 @@ # TRX Toolkit # BTS <-> BB burst forwarding # -# (C) 2017 by Vadim Yanitskiy +# (C) 2017-2018 by Vadim Yanitskiy # # All Rights Reserved # @@ -27,58 +27,136 @@ from data_msg import * class BurstForwarder: - # Timeslot filter (drop everything by default) - ts_pass = None + """ Performs burst forwarding and preprocessing between MS and BTS. - # Freq. filter - bts_freq = None - bb_freq = None + == Pass-filtering parameters - # Randomization of RSSI - randomize_dl_rssi = False - randomize_ul_rssi = False + BurstForwarder may drop or pass an UL/DL burst depending + on the following parameters: - # Randomization of ToA - randomize_dl_toa256 = False - randomize_ul_toa256 = False + - bts_freq / bb_freq - the current BTS / MS frequency + that was set using RXTUNE control command. By default, + both freq. values are set to None, so nothing is being + forwarded (i.e. bursts are getting dropped). - # Timing Advance value indicated by MS (0 by default) - # Valid range: 0..63, where each unit means - # one GSM symbol advance. - ta = 0 + FIXME: currently, we don't care about TXTUNE command + and transmit frequencies. It would be great to distinguish + between RX and TX frequencies for both BTS and MS. - # Timing of Arrival values indicated by transceiver - # in units of 1/256 of GSM symbol periods. A pair of - # base and threshold values defines a range of ToA value - # randomization: from (base - threshold) to (base + threshold). - toa256_dl_base = 0 - toa256_ul_base = 0 + - ts_pass - currently active timeslot, configured by the MS. + It can be activated or deactivated using SETSLOT control + command from the MS. - toa256_dl_threshold = 128 - toa256_ul_threshold = 128 + FIXME: only a single timeslot can be activated! + FIXME: there is no such list for the BTS side. - # RSSI values indicated by transceiver in dBm. - # A pair of base and threshold values defines a range of RSSI - # randomization: from (base - threshold) to (base + threshold). - rssi_dl_base = -60 - rssi_ul_base = -70 + == Preprocessing and measurement simulation - rssi_dl_threshold = 10 - rssi_ul_threshold = 5 + Since this is a virtual environment, we can simulate different + parameters of a virtual RF interface: - # Path loss simulation: DL/UL burst dropping - # Indicates how many bursts should be dropped - # and which dropping period is used. By default, - # period is 1, i.e. every burst (fn % 1 is always 0) - burst_dl_drop_amount = 0 - burst_ul_drop_amount = 0 - burst_dl_drop_period = 1 - burst_ul_drop_period = 1 + - ToA (Timing of Arrival) - measured difference between expected + and actual time of burst arrival in units of 1/256 of GSM symbol + periods. A pair of both base and threshold values defines a range + of ToA value randomization: + + DL: from (toa256_dl_base - toa256_dl_threshold) + to (toa256_dl_base + toa256_dl_threshold), + UL: from (toa256_ul_base - toa256_ul_threshold) + to (toa256_ul_base + toa256_ul_threshold). + + - RSSI (Received Signal Strength Indication) - measured "power" of + the signal (per burst) in dBm. A pair of both base and threshold + values defines a range of RSSI value randomization: + + DL: from (rssi_dl_base - rssi_dl_threshold) + to (rssi_dl_base + rssi_dl_threshold), + UL: from (rssi_ul_base - rssi_ul_threshold) + to (rssi_ul_base + rssi_ul_threshold). + + Please note that the randomization of both RSSI and ToA + is optional, and should be enabled manually. + + === Timing Advance handling + + The BTS is using ToA measurements for UL bursts in order to calculate + Timing Advance value, that is then indicated to a MS, which in its turn + shall apply this value to the transmitted signal in order to compensate + the delay. Basically, every burst is transmitted in advance defined by + the indicated Timing Advance value. The valid range is 0..63, where + each unit means one GSM symbol advance. The actual Timing Advance value + is set using SETTA control command from MS. By default, it's set to 0. + + === Path loss simulation - burst dropping + + In some cases, e.g. due to a weak signal or high interference, a burst + can be lost, i.e. not detected by the receiver. This can also be + simulated using FAKE_DROP command on both control interfaces: + + - burst_{dl|ul}_drop_amount - the amount of DL/UL bursts + to be dropped (i.e. not forwarded towards the MS/BTS), + + - burst_{dl|ul}_drop_period - drop every X DL/UL burst, e.g. + 1 - drop every consequent burst, 2 - drop every second burst, etc. + + """ def __init__(self, bts_link, bb_link): self.bts_link = bts_link self.bb_link = bb_link + # Randomization of RSSI + randomize_dl_rssi = False + randomize_ul_rssi = False + + # Randomization of ToA + randomize_dl_toa256 = False + randomize_ul_toa256 = False + + # Init default parameters + self.reset_dl() + self.reset_ul() + + # Initialize (or reset to) default parameters for Downlink + def reset_dl(self): + # Unset current DL freq. + self.bts_freq = None + + # Indicated RSSI / ToA values + self.toa256_dl_base = 0 + self.rssi_dl_base = -60 + + # RSSI / ToA randomization threshold + self.toa256_dl_threshold = 0 + self.rssi_dl_threshold = 0 + + # Path loss simulation (burst dropping) + self.burst_dl_drop_amount = 0 + self.burst_dl_drop_period = 1 + + # Initialize (or reset to) default parameters for Uplink + def reset_ul(self): + # Unset current DL freq. + self.bb_freq = None + + # Indicated RSSI / ToA values + self.rssi_ul_base = -70 + self.toa256_ul_base = 0 + + # RSSI / ToA randomization threshold + self.toa256_ul_threshold = 0 + self.rssi_ul_threshold = 0 + + # Path loss simulation (burst dropping) + self.burst_ul_drop_amount = 0 + self.burst_ul_drop_period = 1 + + # Init timeslot filter (drop everything by default) + self.ts_pass = None + + # Reset Timing Advance value + self.ta = 0 + # Converts TA value from symbols to # units of 1/256 of GSM symbol periods def calc_ta256(self): -- To view, visit https://gerrit.osmocom.org/12181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6b1bf41cf22f01a7e7ecc91c625fb0d2bf4bfeac Gerrit-Change-Number: 12181 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:34:56 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:34:56 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: properly pass-filter multiple time-slots In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12182 ) Change subject: trx_toolkit/burst_fwd.py: properly pass-filter multiple time-slots ...................................................................... trx_toolkit/burst_fwd.py: properly pass-filter multiple time-slots Previously it was only possible to configure a single time-slot that would be pass-filtered by a BurstForwarder instance. In some applications it would be useful to configure multiple time-slots, so let's refactor the time-slot pass-filtering algorithm. Change-Id: Ie1490adaf7a7c62c966aeb60c1898eaf3b5a1e84 --- M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/ctrl_if_bb.py 2 files changed, 19 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index f3eeddd..746b281 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -43,11 +43,10 @@ and transmit frequencies. It would be great to distinguish between RX and TX frequencies for both BTS and MS. - - ts_pass - currently active timeslot, configured by the MS. - It can be activated or deactivated using SETSLOT control - command from the MS. + - ts_pass_list - the list of active (i.e. configured) + timeslot numbers for the MS. A timeslot can be activated + or deactivated using SETSLOT control command from the MS. - FIXME: only a single timeslot can be activated! FIXME: there is no such list for the BTS side. == Preprocessing and measurement simulation @@ -152,7 +151,7 @@ self.burst_ul_drop_period = 1 # Init timeslot filter (drop everything by default) - self.ts_pass = None + self.ts_pass_list = [] # Reset Timing Advance value self.ta = 0 @@ -288,7 +287,7 @@ return None # Timeslot filter - if msg.tn != self.ts_pass: + if msg.tn not in self.ts_pass_list: return None # Path loss simulation diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index 3528c98..97a3d9d 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -109,9 +109,21 @@ # TS activation / deactivation # We don't care about ts_type if ts_type == 0: - self.burst_fwd.ts_pass = None + # Deactivate TS (remove from TS pass-filter list) + if ts in self.burst_fwd.ts_pass_list: + self.burst_fwd.ts_pass_list.remove(ts) + else: + print("[!] TS %u was not activated before" % ts) + # TODO: uncomment as soon as RESET is introduced + # return -1 else: - self.burst_fwd.ts_pass = ts + # Activate TS (add to TS pass-filter list) + if ts not in self.burst_fwd.ts_pass_list: + self.burst_fwd.ts_pass_list.append(ts) + else: + print("[!] TS %u was already activated before" % ts) + # TODO: uncomment as soon as RESET is introduced + # return -1 return 0 -- To view, visit https://gerrit.osmocom.org/12182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie1490adaf7a7c62c966aeb60c1898eaf3b5a1e84 Gerrit-Change-Number: 12182 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:34:56 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:34:56 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: also pass-filter UL bursts by time-slot In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12183 ) Change subject: trx_toolkit/burst_fwd.py: also pass-filter UL bursts by time-slot ...................................................................... trx_toolkit/burst_fwd.py: also pass-filter UL bursts by time-slot For some reason, the time-slot pass-filtering was only done for DL bursts, but not for UL bursts. BurstForwarder shall not pass UL bursts for unconfigured time-slots too. Let's also print a warning if an UL burst is sent on a not configured time-slot, i.e. before sending SETSLOT command. Change-Id: Idb7f5b212e5814aeff8ca8bc875ad066674267cd --- M src/target/trx_toolkit/burst_fwd.py 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 746b281..6e79d44 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -326,6 +326,11 @@ if msg is None: return None + # Timeslot filter + if msg.tn not in self.ts_pass_list: + print("[!] TS %u is not configured, dropping UL burst..." % msg.tn) + return None + # Path loss simulation msg = self.path_loss_sim_ul(msg) if msg is None: -- To view, visit https://gerrit.osmocom.org/12183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idb7f5b212e5814aeff8ca8bc875ad066674267cd Gerrit-Change-Number: 12183 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:34:56 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:34:56 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: drop randomization related cmd options In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12184 ) Change subject: trx_toolkit/fake_trx.py: drop randomization related cmd options ...................................................................... trx_toolkit/fake_trx.py: drop randomization related cmd options The randomization of both UL/DL RSSI and ToA values is optional, and can be configured from the control interface (see both FAKE_RSSI and FAKE_TOA commands). The command line options for enabling / disabling the randomization were redundant, so let's get rid of them and check if the corresponding treshold value is set. Change-Id: I6adc13b8989ade2fab895673525c0ca17bf9b3f2 --- M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/fake_trx.py 2 files changed, 6 insertions(+), 42 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 6e79d44..31f882e 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -74,7 +74,7 @@ to (rssi_ul_base + rssi_ul_threshold). Please note that the randomization of both RSSI and ToA - is optional, and should be enabled manually. + is optional, and can be enabled from the control interface. === Timing Advance handling @@ -104,14 +104,6 @@ self.bts_link = bts_link self.bb_link = bb_link - # Randomization of RSSI - randomize_dl_rssi = False - randomize_ul_rssi = False - - # Randomization of ToA - randomize_dl_toa256 = False - randomize_ul_toa256 = False - # Init default parameters self.reset_dl() self.reset_ul() @@ -164,7 +156,7 @@ # Calculates a random ToA value for Downlink bursts def calc_dl_toa256(self): # Check if randomization is required - if not self.randomize_dl_toa256: + if self.toa256_dl_threshold is 0: return self.toa256_dl_base # Calculate a range for randomization @@ -179,7 +171,7 @@ # Calculates a random ToA value for Uplink bursts def calc_ul_toa256(self): # Check if randomization is required - if not self.randomize_ul_toa256: + if self.toa256_ul_threshold is 0: return self.toa256_ul_base # Calculate a range for randomization @@ -194,7 +186,7 @@ # Calculates a random RSSI value for Downlink bursts def calc_dl_rssi(self): # Check if randomization is required - if not self.randomize_dl_rssi: + if self.rssi_dl_threshold is 0: return self.rssi_dl_base # Calculate a range for randomization @@ -207,7 +199,7 @@ # Calculates a random RSSI value for Uplink bursts def calc_ul_rssi(self): # Check if randomization is required - if not self.randomize_ul_rssi: + if self.rssi_ul_threshold is 0: return self.rssi_ul_base # Calculate a range for randomization diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index b818b2a..d99186b 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -46,12 +46,6 @@ bts_base_port = 5700 bb_base_port = 6700 - # BurstForwarder field randomization - randomize_dl_toa256 = False - randomize_ul_toa256 = False - randomize_dl_rssi = False - randomize_ul_rssi = False - def __init__(self): print_copyright(CR_HOLDERS) self.parse_argv() @@ -85,10 +79,6 @@ # BTS <-> BB burst forwarding self.burst_fwd = BurstForwarder(self.bts_data, self.bb_data) - self.burst_fwd.randomize_dl_toa256 = self.randomize_dl_toa256 - self.burst_fwd.randomize_ul_toa256 = self.randomize_ul_toa256 - self.burst_fwd.randomize_dl_rssi = self.randomize_dl_rssi - self.burst_fwd.randomize_ul_rssi = self.randomize_ul_rssi # Share a BurstForwarder instance between BTS and BB self.bts_ctrl.burst_fwd = self.burst_fwd @@ -144,13 +134,7 @@ " -r --bb-addr Set BB remote address (default %s)\n" \ " -P --bts-base-port Set BTS base port number (default %d)\n" \ " -p --bb-base-port Set BB base port number (default %d)\n" \ - " -b --trx-bind-addr Set TRX bind address (default %s)\n\n" - - s += " Simulation\n" \ - " --rand-dl-rssi Enable DL RSSI randomization\n" \ - " --rand-ul-rssi Enable UL RSSI randomization\n" \ - " --rand-dl-toa Enable DL ToA randomization\n" \ - " --rand-ul-toa Enable UL ToA randomization\n" + " -b --trx-bind-addr Set TRX bind address (default %s)\n" print(s % (self.bts_addr, self.bb_addr, self.bts_base_port, self.bb_base_port, @@ -168,8 +152,6 @@ "bts-addr=", "bb-addr=", "bts-base-port=", "bb-base-port=", "trx-bind-addr=", - "rand-dl-rssi", "rand-ul-rssi", - "rand-dl-toa", "rand-ul-toa", ]) except getopt.GetoptError as err: self.print_help("[!] " + str(err)) @@ -193,16 +175,6 @@ elif o in ("-b", "--trx-bind-addr"): self.trx_bind_addr = v - # Message field randomization - elif o == "rand-dl-rssi": - self.randomize_dl_rssi = True - elif o == "rand-ul-rssi": - self.randomize_ul_rssi = True - elif o == "rand-dl-toa": - self.randomize_dl_toa256 = True - elif o == "rand-ul-toa": - self.randomize_ul_toa256 = True - # Ensure there is no overlap between ports if self.bts_base_port == self.bb_base_port: self.print_help("[!] BTS and BB base ports should be different") -- To view, visit https://gerrit.osmocom.org/12184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6adc13b8989ade2fab895673525c0ca17bf9b3f2 Gerrit-Change-Number: 12184 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:34:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:34:57 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: use generic logging module instead of print() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12185 ) Change subject: trx_toolkit: use generic logging module instead of print() ...................................................................... trx_toolkit: use generic logging module instead of print() There are multiple advantages of using Python's logging module: - advanced message formatting (file name, line number, etc.), - multiple logging targets (e.g. stderr, file, socket), - logging levels (e.g. DEBUG, INFO, ERROR), - the pythonic way ;) so, let's replace multiple print() calls by logging calls, add use the following logging message format by default: [%(levelname)s] %(filename)s:%(lineno)d %(message)s Examples: [INFO] ctrl_if_bts.py:57 Starting transceiver... [DEBUG] clck_gen.py:87 IND CLOCK 26826 [DEBUG] ctrl_if_bts.py:71 Recv POWEROFF cmd [INFO] ctrl_if_bts.py:73 Stopping transceiver... [INFO] fake_trx.py:127 Shutting down... Please note that there is no way to filter messages by logging level yet. This is to be introduced soon, together with argparse. Change-Id: I7fcafabafe8323b58990997a47afdd48b6d1f357 --- M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/burst_gen.py M src/target/trx_toolkit/burst_send.py M src/target/trx_toolkit/clck_gen.py M src/target/trx_toolkit/ctrl_cmd.py M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/ctrl_if_bb.py M src/target/trx_toolkit/ctrl_if_bts.py M src/target/trx_toolkit/data_dump.py M src/target/trx_toolkit/data_msg.py M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/trx_sniff.py 12 files changed, 145 insertions(+), 95 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 31f882e..3cb6acd 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -22,6 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import logging as log import random from data_msg import * @@ -214,7 +215,7 @@ # Burst dropping if self.burst_dl_drop_amount > 0: if msg.fn % self.burst_dl_drop_period == 0: - print("[~] Simulation: dropping DL burst (fn=%u %% %u == 0)" + log.info("Simulation: dropping DL burst (fn=%u %% %u == 0)" % (msg.fn, self.burst_dl_drop_period)) self.burst_dl_drop_amount -= 1 return None @@ -226,7 +227,7 @@ # Burst dropping if self.burst_ul_drop_amount > 0: if msg.fn % self.burst_ul_drop_period == 0: - print("[~] Simulation: dropping UL burst (fn=%u %% %u == 0)" + log.info("Simulation: dropping UL burst (fn=%u %% %u == 0)" % (msg.fn, self.burst_ul_drop_period)) self.burst_ul_drop_amount -= 1 return None @@ -254,7 +255,7 @@ msg_l12trx = DATAMSG_L12TRX() msg_l12trx.parse_msg(bytearray(msg_raw)) except: - print("[!] Dropping unhandled DL message...") + log.error("Dropping unhandled DL message...") return None # Compose a new message for L1 @@ -320,7 +321,7 @@ # Timeslot filter if msg.tn not in self.ts_pass_list: - print("[!] TS %u is not configured, dropping UL burst..." % msg.tn) + log.warning("TS %u is not configured, dropping UL burst..." % msg.tn) return None # Path loss simulation diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index d83f137..9a17ffa 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -26,6 +26,7 @@ from copyright import print_copyright CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +import logging as log import signal import getopt import sys @@ -64,6 +65,10 @@ # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Open requested capture file if self.output_file is not None: self.ddf = DATADumpFile(self.output_file) @@ -130,7 +135,7 @@ # Set burst msg.burst = burst - print("[i] Sending %d/%d %s burst %s to %s..." + log.info("Sending %d/%d %s burst %s to %s..." % (i + 1, self.burst_count, self.burst_type, msg.desc_hdr(), self.conn_mode)) @@ -239,7 +244,7 @@ sys.exit(2) def sig_handler(self, signum, frame): - print("Signal %d received" % signum) + log.info("Signal %d received" % signum) if signum is signal.SIGINT: sys.exit(0) diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index f6c85ba..787e0fc 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -25,6 +25,7 @@ from copyright import print_copyright CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +import logging as log import signal import getopt import sys @@ -60,6 +61,10 @@ # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Open requested capture file self.ddf = DATADumpFile(self.capture_file) @@ -88,7 +93,7 @@ if not self.msg_pass_filter(l12trx, msg): continue - print("[i] Sending a burst %s to %s..." + log.info("Sending a burst %s to %s..." % (msg.desc_hdr(), self.conn_mode)) # Send message @@ -209,7 +214,7 @@ sys.exit(2) def sig_handler(self, signum, frame): - print("Signal %d received" % signum) + log.info("Signal %d received" % signum) if signum is signal.SIGINT: sys.exit(0) diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index b488770..56207f4 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -25,6 +25,7 @@ from copyright import print_copyright CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +import logging as log import signal import time import sys @@ -83,7 +84,7 @@ link.send(payload) # Debug print - print("[T] %s" % payload) + log.debug(payload) # Increase frame count self.clck_src += self.ind_period @@ -101,13 +102,17 @@ # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + def run(self): self.link = UDPLink("127.0.0.1", 5800, "0.0.0.0", 5700) self.clck = CLCKGen([self.link], ind_period = 51) self.clck.start() def sig_handler(self, signum, frame): - print("Signal %d received" % signum) + log.info("Signal %d received" % signum) if signum is signal.SIGINT: self.clck.stop() diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py index e56105a..ec683be 100755 --- a/src/target/trx_toolkit/ctrl_cmd.py +++ b/src/target/trx_toolkit/ctrl_cmd.py @@ -26,6 +26,7 @@ from copyright import print_copyright CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +import logging as log import signal import getopt import select @@ -48,12 +49,16 @@ # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Init UDP connection self.ctrl_link = UDPLink(self.remote_addr, self.base_port + 1, self.bind_addr, self.bind_port) # Debug print - print("[i] Init CTRL interface (%s)" \ + log.info("Init CTRL interface (%s)" \ % self.ctrl_link.desc_link()) def print_help(self, msg = None): @@ -138,7 +143,7 @@ sys.stdout.flush() def sig_handler(self, signum, frame): - print("\n\nSignal %d received" % signum) + log.info("Signal %d received" % signum) if signum is signal.SIGINT: sys.exit(0) diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py index 1e569a6..b533746 100644 --- a/src/target/trx_toolkit/ctrl_if.py +++ b/src/target/trx_toolkit/ctrl_if.py @@ -22,12 +22,14 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import logging as log + from udp_link import UDPLink class CTRLInterface(UDPLink): def handle_rx(self, data, remote): if not self.verify_req(data): - print("[!] Wrong data on CTRL interface") + log.error("Wrong data on CTRL interface") return # Attempt to parse a command diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index 97a3d9d..aaa12f1 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -22,6 +22,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import logging as log + from ctrl_if import CTRLInterface class CTRLInterfaceBB(CTRLInterface): @@ -34,37 +36,37 @@ def __init__(self, remote_addr, remote_port, bind_addr, bind_port): CTRLInterface.__init__(self, remote_addr, remote_port, bind_addr, bind_port) - print("[i] Init CTRL interface for BB (%s)" % self.desc_link()) + log.info("Init CTRL interface for BB (%s)" % self.desc_link()) def parse_cmd(self, request): # Power control if self.verify_cmd(request, "POWERON", 0): - print("[i] Recv POWERON CMD") + log.debug("Recv POWERON CMD") # Ensure transceiver isn't working if self.trx_started: - print("[!] Transceiver already started") + log.error("Transceiver already started") return -1 # Ensure RX / TX freq. are set if (self.rx_freq is None) or (self.tx_freq is None): - print("[!] RX / TX freq. are not set") + log.error("RX / TX freq. are not set") return -1 - print("[i] Starting transceiver...") + log.info("Starting transceiver...") self.trx_started = True return 0 elif self.verify_cmd(request, "POWEROFF", 0): - print("[i] Recv POWEROFF cmd") + log.debug("Recv POWEROFF cmd") - print("[i] Stopping transceiver...") + log.info("Stopping transceiver...") self.trx_started = False return 0 # Tuning Control elif self.verify_cmd(request, "RXTUNE", 1): - print("[i] Recv RXTUNE cmd") + log.debug("Recv RXTUNE cmd") # TODO: check freq range self.rx_freq = int(request[1]) * 1000 @@ -72,7 +74,7 @@ return 0 elif self.verify_cmd(request, "TXTUNE", 1): - print("[i] Recv TXTUNE cmd") + log.debug("Recv TXTUNE cmd") # TODO: check freq range self.tx_freq = int(request[1]) * 1000 @@ -80,7 +82,7 @@ # Power measurement elif self.verify_cmd(request, "MEASURE", 1): - print("[i] Recv MEASURE cmd") + log.debug("Recv MEASURE cmd") if self.pm is None: return -1 @@ -92,7 +94,7 @@ return (0, [meas_dbm]) elif self.verify_cmd(request, "SETSLOT", 2): - print("[i] Recv SETSLOT cmd") + log.debug("Recv SETSLOT cmd") if self.burst_fwd is None: return -1 @@ -100,7 +102,7 @@ # Obtain TS index ts = int(request[1]) if ts not in range(0, 8): - print("[!] TS index should be in range: 0..7") + log.error("TS index should be in range: 0..7") return -1 # Parse TS type @@ -113,7 +115,7 @@ if ts in self.burst_fwd.ts_pass_list: self.burst_fwd.ts_pass_list.remove(ts) else: - print("[!] TS %u was not activated before" % ts) + log.warning("TS %u was not activated before" % ts) # TODO: uncomment as soon as RESET is introduced # return -1 else: @@ -121,7 +123,7 @@ if ts not in self.burst_fwd.ts_pass_list: self.burst_fwd.ts_pass_list.append(ts) else: - print("[!] TS %u was already activated before" % ts) + log.warning("TS %u was already activated before" % ts) # TODO: uncomment as soon as RESET is introduced # return -1 @@ -129,7 +131,7 @@ # Timing Advance elif self.verify_cmd(request, "SETTA", 1): - print("[i] Recv SETTA cmd") + log.debug("Recv SETTA cmd") # Save to the BurstForwarder instance self.burst_fwd.ta = ta @@ -138,7 +140,7 @@ # Timing of Arrival simulation for Uplink # Absolute form: CMD FAKE_TOA elif self.verify_cmd(request, "FAKE_TOA", 2): - print("[i] Recv FAKE_TOA cmd") + log.debug("Recv FAKE_TOA cmd") # Parse and apply both base and threshold self.burst_fwd.toa256_ul_base = int(request[1]) @@ -149,7 +151,7 @@ # Timing of Arrival simulation for Uplink # Relative form: CMD FAKE_TOA <+-BASE_DELTA> elif self.verify_cmd(request, "FAKE_TOA", 1): - print("[i] Recv FAKE_TOA cmd") + log.debug("Recv FAKE_TOA cmd") # Parse and apply delta self.burst_fwd.toa256_ul_base += int(request[1]) @@ -159,7 +161,7 @@ # RSSI simulation for Uplink # Absolute form: CMD FAKE_RSSI elif self.verify_cmd(request, "FAKE_RSSI", 2): - print("[i] Recv FAKE_RSSI cmd") + log.debug("Recv FAKE_RSSI cmd") # Parse and apply both base and threshold self.burst_fwd.rssi_ul_base = int(request[1]) @@ -170,7 +172,7 @@ # RSSI simulation for Uplink # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> elif self.verify_cmd(request, "FAKE_RSSI", 1): - print("[i] Recv FAKE_RSSI cmd") + log.debug("Recv FAKE_RSSI cmd") # Parse and apply delta self.burst_fwd.rssi_ul_base += int(request[1]) @@ -181,12 +183,12 @@ # Syntax: CMD FAKE_DROP # Dropping pattern: fn % 1 == 0 elif self.verify_cmd(request, "FAKE_DROP", 1): - print("[i] Recv FAKE_DROP cmd") + log.debug("Recv FAKE_DROP cmd") # Parse / validate amount of bursts num = int(request[1]) if num < 0: - print("[!] FAKE_DROP amount shall not be negative") + log.error("FAKE_DROP amount shall not be negative") return -1 self.burst_fwd.burst_ul_drop_amount = num @@ -198,18 +200,18 @@ # Syntax: CMD FAKE_DROP # Dropping pattern: fn % period == 0 elif self.verify_cmd(request, "FAKE_DROP", 2): - print("[i] Recv FAKE_DROP cmd") + log.debug("Recv FAKE_DROP cmd") # Parse / validate amount of bursts num = int(request[1]) if num < 0: - print("[!] FAKE_DROP amount shall not be negative") + log.error("FAKE_DROP amount shall not be negative") return -1 # Parse / validate period period = int(request[2]) if period <= 0: - print("[!] FAKE_DROP period shall be greater than zero") + log.error("FAKE_DROP period shall be greater than zero") return -1 self.burst_fwd.burst_ul_drop_amount = num @@ -221,5 +223,5 @@ else: # We don't care about other commands, # so let's merely ignore them ;) - print("[i] Ignore CMD %s" % request[0]) + log.debug("Ignore CMD %s" % request[0]) return 0 diff --git a/src/target/trx_toolkit/ctrl_if_bts.py b/src/target/trx_toolkit/ctrl_if_bts.py index 6ac8ffb..2dde3e3 100644 --- a/src/target/trx_toolkit/ctrl_if_bts.py +++ b/src/target/trx_toolkit/ctrl_if_bts.py @@ -22,6 +22,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import logging as log + from ctrl_if import CTRLInterface class CTRLInterfaceBTS(CTRLInterface): @@ -35,24 +37,24 @@ def __init__(self, remote_addr, remote_port, bind_addr, bind_port): CTRLInterface.__init__(self, remote_addr, remote_port, bind_addr, bind_port) - print("[i] Init CTRL interface for BTS (%s)" % self.desc_link()) + log.info("Init CTRL interface for BTS (%s)" % self.desc_link()) def parse_cmd(self, request): # Power control if self.verify_cmd(request, "POWERON", 0): - print("[i] Recv POWERON CMD") + log.debug("Recv POWERON CMD") # Ensure transceiver isn't working if self.trx_started: - print("[!] Transceiver already started") + log.error("Transceiver already started") return -1 # Ensure RX / TX freq. are set if (self.rx_freq is None) or (self.tx_freq is None): - print("[!] RX / TX freq. are not set") + log.error("RX / TX freq. are not set") return -1 - print("[i] Starting transceiver...") + log.info("Starting transceiver...") self.trx_started = True # Power emulation @@ -66,9 +68,9 @@ return 0 elif self.verify_cmd(request, "POWEROFF", 0): - print("[i] Recv POWEROFF cmd") + log.debug("Recv POWEROFF cmd") - print("[i] Stopping transceiver...") + log.info("Stopping transceiver...") self.trx_started = False # Power emulation @@ -83,14 +85,14 @@ # Tuning Control elif self.verify_cmd(request, "RXTUNE", 1): - print("[i] Recv RXTUNE cmd") + log.debug("Recv RXTUNE cmd") # TODO: check freq range self.rx_freq = int(request[1]) * 1000 return 0 elif self.verify_cmd(request, "TXTUNE", 1): - print("[i] Recv TXTUNE cmd") + log.debug("Recv TXTUNE cmd") # TODO: check freq range self.tx_freq = int(request[1]) * 1000 @@ -100,7 +102,7 @@ # Timing of Arrival simulation for Downlink # Absolute form: CMD FAKE_TOA elif self.verify_cmd(request, "FAKE_TOA", 2): - print("[i] Recv FAKE_TOA cmd") + log.debug("Recv FAKE_TOA cmd") # Parse and apply both base and threshold self.burst_fwd.toa256_dl_base = int(request[1]) @@ -111,7 +113,7 @@ # Timing of Arrival simulation for Downlink # Relative form: CMD FAKE_TOA <+-BASE_DELTA> elif self.verify_cmd(request, "FAKE_TOA", 1): - print("[i] Recv FAKE_TOA cmd") + log.debug("Recv FAKE_TOA cmd") # Parse and apply delta self.burst_fwd.toa256_dl_base += int(request[1]) @@ -121,7 +123,7 @@ # RSSI simulation for Downlink # Absolute form: CMD FAKE_RSSI elif self.verify_cmd(request, "FAKE_RSSI", 2): - print("[i] Recv FAKE_RSSI cmd") + log.debug("Recv FAKE_RSSI cmd") # Parse and apply both base and threshold self.burst_fwd.rssi_dl_base = int(request[1]) @@ -132,7 +134,7 @@ # RSSI simulation for Downlink # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> elif self.verify_cmd(request, "FAKE_RSSI", 1): - print("[i] Recv FAKE_RSSI cmd") + log.debug("Recv FAKE_RSSI cmd") # Parse and apply delta self.burst_fwd.rssi_dl_base += int(request[1]) @@ -143,12 +145,12 @@ # Syntax: CMD FAKE_DROP # Dropping pattern: fn % 1 == 0 elif self.verify_cmd(request, "FAKE_DROP", 1): - print("[i] Recv FAKE_DROP cmd") + log.debug("Recv FAKE_DROP cmd") # Parse / validate amount of bursts num = int(request[1]) if num < 0: - print("[!] FAKE_DROP amount shall not be negative") + log.error("FAKE_DROP amount shall not be negative") return -1 self.burst_fwd.burst_dl_drop_amount = num @@ -160,18 +162,18 @@ # Syntax: CMD FAKE_DROP # Dropping pattern: fn % period == 0 elif self.verify_cmd(request, "FAKE_DROP", 2): - print("[i] Recv FAKE_DROP cmd") + log.debug("Recv FAKE_DROP cmd") # Parse / validate amount of bursts num = int(request[1]) if num < 0: - print("[!] FAKE_DROP amount shall not be negative") + log.error("FAKE_DROP amount shall not be negative") return -1 # Parse / validate period period = int(request[2]) if period <= 0: - print("[!] FAKE_DROP period shall be greater than zero") + log.error("FAKE_DROP period shall be greater than zero") return -1 self.burst_fwd.burst_dl_drop_amount = num @@ -183,5 +185,5 @@ else: # We don't care about other commands, # so let's merely ignore them ;) - print("[i] Ignore CMD %s" % request[0]) + log.debug("Ignore CMD %s" % request[0]) return 0 diff --git a/src/target/trx_toolkit/data_dump.py b/src/target/trx_toolkit/data_dump.py index 1d7805e..71e1261 100644 --- a/src/target/trx_toolkit/data_dump.py +++ b/src/target/trx_toolkit/data_dump.py @@ -22,6 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import logging as log import struct from data_msg import * @@ -77,13 +78,15 @@ def __init__(self, capture): # Check if capture file is already opened if isinstance(capture, str): - print("[i] Opening capture file '%s'..." % capture) + log.info("Opening capture file '%s'..." % capture) self.f = open(capture, "a+b") else: self.f = capture def __del__(self): - print("[i] Closing the capture file") + # FIXME: this causes an Exception in Python 2 (but not in Python 3) + # AttributeError: 'NoneType' object has no attribute 'info' + log.info("Closing the capture file") self.f.close() # Moves the file descriptor before a specified message @@ -104,7 +107,7 @@ # Attempt to parse it rc = self.parse_hdr(hdr_raw) if rc is False: - print("[!] Couldn't parse a message header") + log.error("Couldn't parse a message header") return False # Expand the header @@ -129,7 +132,7 @@ # Attempt to parse it rc = self.parse_hdr(hdr_raw) if rc is False: - print("[!] Couldn't parse a message header") + log.error("Couldn't parse a message header") return None # Expand the header @@ -138,7 +141,7 @@ # Attempt to read a message msg_raw = self.f.read(msg_len) if len(msg_raw) != msg_len: - print("[!] Message length mismatch") + log.error("Message length mismatch") return None # Attempt to parse a message @@ -146,7 +149,7 @@ msg_raw = bytearray(msg_raw) msg.parse_msg(msg_raw) except: - print("[!] Couldn't parse a message, skipping...") + log.error("Couldn't parse a message, skipping...") return False # Success @@ -161,7 +164,7 @@ # Move descriptor to the begining of requested message rc = self._seek2msg(idx) if not rc: - print("[!] Couldn't find requested message") + log.error("Couldn't find requested message") return False # Attempt to parse a message @@ -181,7 +184,7 @@ else: rc = self._seek2msg(skip) if not rc: - print("[!] Couldn't find requested message") + log.error("Couldn't find requested message") return False # Read the capture in loop... @@ -224,6 +227,10 @@ from gsm_shared import * import random + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Create a temporary file tf = TemporaryFile() @@ -242,7 +249,7 @@ burst_trx2l1.append(sbit) # Generate a basic list of random messages - print("[i] Generating the reference messages") + log.info("Generating the reference messages") messages_ref = [] for i in range(100): @@ -260,9 +267,9 @@ # Append messages_ref.append(msg) - print("[i] Adding the following messages to the capture:") + log.info("Adding the following messages to the capture:") for msg in messages_ref[:3]: - print(" %s: burst_len=%d" + log.info("%s: burst_len=%d" % (msg.desc_hdr(), len(msg.burst))) # Check single message appending @@ -273,9 +280,9 @@ # Read the written messages back messages_check = ddf.parse_all() - print("[i] Read the following messages back:") + log.info("Read the following messages back:") for msg in messages_check: - print(" %s: burst_len=%d" + log.info("%s: burst_len=%d" % (msg.desc_hdr(), len(msg.burst))) # Expecting three messages @@ -291,7 +298,7 @@ # Validate a message assert(messages_check[i].validate()) - print("[?] Check append_msg(): OK") + log.info("Check append_msg(): OK") # Append the pending reference messages @@ -313,7 +320,7 @@ # Validate a message assert(messages_check[i].validate()) - print("[?] Check append_all(): OK") + log.info("Check append_all(): OK") # Check parse_msg() @@ -336,7 +343,7 @@ assert(msg0.validate()) assert(msg10.validate()) - print("[?] Check parse_msg(): OK") + log.info("Check parse_msg(): OK") # Check parse_all() with range @@ -357,4 +364,4 @@ # Validate a message assert(messages_check[i].validate()) - print("[?] Check parse_all(): OK") + log.info("Check parse_all(): OK") diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index ea415ab..95ec9dc 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -431,6 +431,12 @@ # Regression test if __name__ == '__main__': + import logging as log + + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Common reference data fn = 1024 tn = 0 @@ -446,7 +452,7 @@ sbit = random.randint(-127, 127) burst_trx2l1_ref.append(sbit) - print("[i] Generating the reference messages") + log.info("Generating the reference messages") # Create messages of both types msg_l12trx_ref = DATAMSG_L12TRX(fn = fn, tn = tn) @@ -461,13 +467,13 @@ msg_l12trx_ref.burst = burst_l12trx_ref msg_trx2l1_ref.burst = burst_trx2l1_ref - print("[i] Encoding the reference messages") + log.info("Encoding the reference messages") # Encode DATA messages l12trx_raw = msg_l12trx_ref.gen_msg() trx2l1_raw = msg_trx2l1_ref.gen_msg() - print("[i] Parsing generated messages back") + log.info("Parsing generated messages back") # Parse generated DATA messages msg_l12trx_dec = DATAMSG_L12TRX() @@ -475,13 +481,13 @@ msg_l12trx_dec.parse_msg(l12trx_raw) msg_trx2l1_dec.parse_msg(trx2l1_raw) - print("[i] Comparing decoded messages with the reference") + log.info("Comparing decoded messages with the reference") # Compare bursts assert(msg_l12trx_dec.burst == burst_l12trx_ref) assert(msg_trx2l1_dec.burst == burst_trx2l1_ref) - print("[?] Compare bursts: OK") + log.info("Compare bursts: OK") # Compare both parsed messages with the reference data assert(msg_l12trx_dec.fn == fn) @@ -489,14 +495,14 @@ assert(msg_l12trx_dec.tn == tn) assert(msg_trx2l1_dec.tn == tn) - print("[?] Compare FN / TN: OK") + log.info("Compare FN / TN: OK") # Compare message specific parts assert(msg_trx2l1_dec.rssi == msg_trx2l1_ref.rssi) assert(msg_l12trx_dec.pwr == msg_l12trx_ref.pwr) assert(msg_trx2l1_dec.toa256 == msg_trx2l1_ref.toa256) - print("[?] Compare message specific data: OK") + log.info("Compare message specific data: OK") # Validate header randomization for i in range(0, 100): @@ -506,7 +512,7 @@ assert(msg_l12trx_ref.validate()) assert(msg_trx2l1_ref.validate()) - print("[?] Validate header randomization: OK") + log.info("Validate header randomization: OK") # Bit conversation test usbits_ref = list(range(0, 256)) @@ -518,7 +524,7 @@ assert(usbits[:255] == usbits_ref[:255]) assert(usbits[255] == 254) - print("[?] Check both usbit2sbit() and sbit2usbit(): OK") + log.info("Check both usbit2sbit() and sbit2usbit(): OK") # Test both sbit2ubit() and ubit2sbit() ubits = msg_trx2l1_ref.sbit2ubit(sbits_ref) @@ -527,7 +533,7 @@ sbits = msg_trx2l1_ref.ubit2sbit(ubits) assert(sbits == ([-127] * 127 + [127] * 128)) - print("[?] Check both sbit2ubit() and ubit2sbit(): OK") + log.info("Check both sbit2ubit() and ubit2sbit(): OK") # Test message transformation msg_l12trx_dec = msg_trx2l1_ref.gen_l12trx() @@ -542,4 +548,4 @@ assert(msg_l12trx_dec.burst == msg_l12trx_dec.sbit2ubit(burst_trx2l1_ref)) assert(msg_trx2l1_dec.burst == msg_trx2l1_dec.ubit2sbit(burst_l12trx_ref)) - print("[?] Check L12TRX <-> TRX2L1 type transformations: OK") + log.info("Check L12TRX <-> TRX2L1 type transformations: OK") diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index d99186b..ced1238 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -25,6 +25,7 @@ from copyright import print_copyright CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +import logging as log import signal import getopt import select @@ -53,6 +54,10 @@ # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + def run(self): # Init TRX CTRL interface for BTS self.bts_ctrl = CTRLInterfaceBTS(self.bts_addr, self.bts_base_port + 101, @@ -90,7 +95,7 @@ self.clck_gen = CLCKGen([self.bts_clck]) self.bts_ctrl.clck_gen = self.clck_gen - print("[i] Init complete") + log.info("Init complete") # Enter main loop while True: @@ -119,7 +124,7 @@ self.bb_ctrl.handle_rx(data.decode(), addr) def shutdown(self): - print("[i] Shutting down...") + log.info("Shutting down...") # Stop clock generator self.clck_gen.stop() @@ -198,7 +203,7 @@ sys.exit(2) def sig_handler(self, signum, frame): - print("Signal %d received" % signum) + log.info("Signal %d received" % signum) if signum is signal.SIGINT: self.shutdown() sys.exit(0) diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 535bb3f..9850983 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -25,6 +25,7 @@ from copyright import print_copyright CR_HOLDERS = [("2018", "Vadim Yanitskiy ")] +import logging as log import signal import getopt import sys @@ -67,6 +68,10 @@ print_copyright(CR_HOLDERS) self.parse_argv() + # Configure logging + log.basicConfig(level = log.DEBUG, + format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Open requested capture file if self.output_file is not None: self.ddf = DATADumpFile(self.output_file) @@ -76,7 +81,7 @@ pkt_filter = "udp and (port %d or port %d)" \ % (self.sniff_base_port + 2, self.sniff_base_port + 102) - print("[i] Listening on interface '%s'..." % self.sniff_interface) + log.info("Listening on interface '%s'..." % self.sniff_interface) # Start sniffing... scapy.all.sniff(iface = self.sniff_interface, store = 0, @@ -110,7 +115,7 @@ try: msg.parse_msg(msg_raw) except: - print("[!] Failed to parse message, dropping...") + log.warning("Failed to parse message, dropping...") self.cnt_burst_dropped_num += 1 return @@ -121,7 +126,7 @@ return # Debug print - print("[i] %s burst: %s" \ + log.debug("%s burst: %s" \ % ("L1 -> TRX" if l12trx else "TRX -> L1", msg.desc_hdr())) # Poke message handler @@ -177,22 +182,22 @@ # Stop sniffing after N bursts if self.cnt_burst_break is not None: if self.cnt_burst_num == self.cnt_burst_break: - print("[i] Collected required amount of bursts") + log.info("Collected required amount of bursts") return True # Stop sniffing after N frames if self.cnt_frame_break is not None: if self.cnt_frame_num == self.cnt_frame_break: - print("[i] Collected required amount of frames") + log.info("Collected required amount of frames") return True return False def shutdown(self): - print("[i] Shutting down...") + log.info("Shutting down...") # Print statistics - print("[i] %u bursts handled, %u dropped" \ + log.info("%u bursts handled, %u dropped" \ % (self.cnt_burst_num, self.cnt_burst_dropped_num)) # Exit -- To view, visit https://gerrit.osmocom.org/12185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7fcafabafe8323b58990997a47afdd48b6d1f357 Gerrit-Change-Number: 12185 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:34:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:34:57 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_gen.py: fix short version of --burst-type In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12186 ) Change subject: trx_toolkit/burst_gen.py: fix short version of --burst-type ...................................................................... trx_toolkit/burst_gen.py: fix short version of --burst-type Both '--bind-addr' and '--burst-type' had the same short '-b'. Let's use the upper case version for '--burst-type'. Change-Id: Ib8a46e25cbc6266c3e147582f9e8045362270151 --- M src/target/trx_toolkit/burst_gen.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index 9a17ffa..0268da9 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -159,7 +159,7 @@ " -p --base-port Set base port number (default %d)\n\n" s += " Burst generation\n" \ - " -b --burst-type Random burst type (NB, FB, SB, AB)\n" \ + " -B --burst-type Random burst type (NB, FB, SB, AB)\n" \ " -c --burst-count How much bursts to send (default 1)\n" \ " -f --frame-number Set frame number (default random)\n" \ " -t --timeslot Set timeslot index (default random)\n" \ @@ -176,7 +176,7 @@ def parse_argv(self): try: opts, args = getopt.getopt(sys.argv[1:], - "o:m:r:b:p:b:c:f:t:h", + "o:m:r:b:p:B:c:f:t:h", [ "help", "output-file=" @@ -213,7 +213,7 @@ elif o in ("-p", "--base-port"): self.base_port = int(v) - elif o in ("-b", "--burst-type"): + elif o in ("-B", "--burst-type"): self.burst_type = v elif o in ("-c", "--burst-count"): self.burst_count = int(v) -- To view, visit https://gerrit.osmocom.org/12186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib8a46e25cbc6266c3e147582f9e8045362270151 Gerrit-Change-Number: 12186 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:34:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:34:57 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_gen.py: migrate from getopt to argparse In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12187 ) Change subject: trx_toolkit/burst_gen.py: migrate from getopt to argparse ...................................................................... trx_toolkit/burst_gen.py: migrate from getopt to argparse Change-Id: I7eb3f2e2713f1f97293bd47a2eae3b140f63fb59 --- M src/target/trx_toolkit/burst_gen.py 1 file changed, 83 insertions(+), 140 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index 0268da9..7625a27 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -28,7 +28,7 @@ import logging as log import signal -import getopt +import argparse import sys from rand_burst_gen import RandBurstGen @@ -38,29 +38,9 @@ from data_msg import * class Application: - # Application variables - remote_addr = "127.0.0.1" - bind_addr = "0.0.0.0" - base_port = 5700 - conn_mode = "TRX" - output_file = None - - burst_type = None - burst_count = 1 - - # Common header fields - fn = None - tn = None - - # Message specific header fields - toa256 = None - rssi = None - pwr = None - def __init__(self): print_copyright(CR_HOLDERS) - self.parse_argv() - self.check_argv() + self.argv = self.parse_argv() # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) @@ -70,32 +50,35 @@ format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") # Open requested capture file - if self.output_file is not None: - self.ddf = DATADumpFile(self.output_file) + if self.argv.output_file is not None: + self.ddf = DATADumpFile(self.argv.output_file) def run(self): # Init DATA interface with TRX or L1 - if self.conn_mode == "TRX": - self.data_if = DATAInterface(self.remote_addr, self.base_port + 2, - self.bind_addr, self.base_port + 102) - elif self.conn_mode == "L1": - self.data_if = DATAInterface(self.remote_addr, self.base_port + 102, - self.bind_addr, self.base_port + 2) + if self.argv.conn_mode == "TRX": + self.data_if = DATAInterface( + self.argv.remote_addr, self.argv.base_port + 2, + self.argv.bind_addr, self.argv.base_port + 102) + elif self.argv.conn_mode == "L1": + self.data_if = DATAInterface( + self.argv.remote_addr, self.argv.base_port + 102, + self.argv.bind_addr, self.argv.base_port + 2) # Init random burst generator burst_gen = RandBurstGen() # Init an empty DATA message - if self.conn_mode == "TRX": + if self.argv.conn_mode == "TRX": msg = DATAMSG_L12TRX() - elif self.conn_mode == "L1": + elif self.argv.conn_mode == "L1": msg = DATAMSG_TRX2L1() # Generate a random frame number or use provided one - fn_init = msg.rand_fn() if self.fn is None else self.fn + fn_init = msg.rand_fn() if self.argv.tdma_fn is None \ + else self.argv.tdma_fn # Send as much bursts as required - for i in range(self.burst_count): + for i in range(self.argv.burst_count): # Randomize the message header msg.rand_hdr() @@ -103,145 +86,105 @@ msg.fn = (fn_init + i) % GSM_HYPERFRAME # Set timeslot number - if self.tn is not None: - msg.tn = self.tn + if self.argv.tdma_tn is not None: + msg.tn = self.argv.tdma_tn # Set transmit power level - if self.pwr is not None: - msg.pwr = self.pwr + if self.argv.pwr is not None: + msg.pwr = self.argv.pwr # Set time of arrival - if self.toa256 is not None: - msg.toa256 = self.toa256 + if self.argv.toa is not None: + msg.toa256 = int(float(self.argv.toa) * 256.0 + 0.5) + elif self.argv.toa256 is not None: + msg.toa256 = self.argv.toa256 # Set RSSI - if self.rssi is not None: - msg.rssi = self.rssi + if self.argv.rssi is not None: + msg.rssi = self.argv.rssi # Generate a random burst - if self.burst_type == "NB": + if self.argv.burst_type == "NB": burst = burst_gen.gen_nb() - elif self.burst_type == "FB": + elif self.argv.burst_type == "FB": burst = burst_gen.gen_fb() - elif self.burst_type == "SB": + elif self.argv.burst_type == "SB": burst = burst_gen.gen_sb() - elif self.burst_type == "AB": + elif self.argv.burst_type == "AB": burst = burst_gen.gen_ab() # Convert to soft-bits in case of TRX -> L1 message - if self.conn_mode == "L1": + if self.argv.conn_mode == "L1": burst = msg.ubit2sbit(burst) # Set burst msg.burst = burst log.info("Sending %d/%d %s burst %s to %s..." - % (i + 1, self.burst_count, self.burst_type, - msg.desc_hdr(), self.conn_mode)) + % (i + 1, self.argv.burst_count, self.argv.burst_type, + msg.desc_hdr(), self.argv.conn_mode)) # Send message self.data_if.send_msg(msg) # Append a new message to the capture - if self.output_file is not None: + if self.argv.output_file is not None: self.ddf.append_msg(msg) - def print_help(self, msg = None): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - s += " TRX interface specific\n" \ - " -o --output-file Write bursts to a capture file\n" \ - " -m --conn-mode Send bursts to: TRX (default) / L1\n" \ - " -r --remote-addr Set remote address (default %s)\n" \ - " -b --bind-addr Set local address (default %s)\n" \ - " -p --base-port Set base port number (default %d)\n\n" - - s += " Burst generation\n" \ - " -B --burst-type Random burst type (NB, FB, SB, AB)\n" \ - " -c --burst-count How much bursts to send (default 1)\n" \ - " -f --frame-number Set frame number (default random)\n" \ - " -t --timeslot Set timeslot index (default random)\n" \ - " --pwr Set power level (default random)\n" \ - " --rssi Set RSSI (default random)\n" \ - " --toa Set ToA in symbols (default random)\n" \ - " --toa256 Set ToA in 1/256 symbol periods\n" - - print(s % (self.remote_addr, self.bind_addr, self.base_port)) - - if msg is not None: - print(msg) - def parse_argv(self): - try: - opts, args = getopt.getopt(sys.argv[1:], - "o:m:r:b:p:B:c:f:t:h", - [ - "help", - "output-file=" - "conn-mode=", - "remote-addr=", - "bind-addr=", - "base-port=", - "burst-type=", - "burst-count=", - "frame-number=", - "timeslot=", - "rssi=", - "toa=", - "toa256=", - "pwr=", - ]) - except getopt.GetoptError as err: - self.print_help("[!] " + str(err)) - sys.exit(2) + parser = argparse.ArgumentParser(prog = "burst_gen", + description = "Auxiliary tool to generate and send random bursts") - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) + trx_group = parser.add_argument_group("TRX interface") + trx_group.add_argument("-r", "--remote-addr", + dest = "remote_addr", type = str, default = "127.0.0.1", + help = "Set remote address (default %(default)s)") + trx_group.add_argument("-b", "--bind-addr", + dest = "bind_addr", type = str, default = "0.0.0.0", + help = "Set bind address (default %(default)s)") + trx_group.add_argument("-p", "--base-port", + dest = "base_port", type = int, default = 6700, + help = "Set base port number (default %(default)s)") + trx_group.add_argument("-m", "--conn-mode", + dest = "conn_mode", type = str, + choices = ["TRX", "L1"], default = "TRX", + help = "Where to send bursts (default %(default)s)") + trx_group.add_argument("-o", "--output-file", + dest = "output_file", type = str, + help = "Write bursts to a capture file") - elif o in ("-o", "--output-file"): - self.output_file = v - elif o in ("-m", "--conn-mode"): - self.conn_mode = v - elif o in ("-r", "--remote-addr"): - self.remote_addr = v - elif o in ("-b", "--bind-addr"): - self.bind_addr = v - elif o in ("-p", "--base-port"): - self.base_port = int(v) + bg_group = parser.add_argument_group("Burst generation") + bg_group.add_argument("-B", "--burst-type", + dest = "burst_type", type = str, + choices = ["NB", "FB", "SB", "AB"], default = "NB", + help = "Random burst type (default %(default)s)") + bg_group.add_argument("-c", "--burst-count", metavar = "N", + dest = "burst_count", type = int, default = 1, + help = "How many bursts to send (default %(default)s)") + bg_group.add_argument("-f", "--frame-number", metavar = "FN", + dest = "tdma_fn", type = int, + help = "Set TDMA frame number (default random)") + bg_group.add_argument("-t", "--timeslot", metavar = "TN", + dest = "tdma_tn", type = int, choices = range(0, 8), + help = "Set TDMA timeslot (default random)") - elif o in ("-B", "--burst-type"): - self.burst_type = v - elif o in ("-c", "--burst-count"): - self.burst_count = int(v) - elif o in ("-f", "--frame-number"): - self.fn = int(v) - elif o in ("-t", "--timeslot"): - self.tn = int(v) + bg_pwr_group = bg_group.add_mutually_exclusive_group() + bg_pwr_group.add_argument("--pwr", metavar = "dBm", + dest = "pwr", type = int, + help = "Set power level (default random)") + bg_pwr_group.add_argument("--rssi", metavar = "dBm", + dest = "rssi", type = int, + help = "Set RSSI (default random)") - # Message specific header fields - elif o == "--pwr": - self.pwr = int(v) - elif o == "--rssi": - self.rssi = int(v) - elif o == "--toa256": - self.toa256 = int(v) - elif o == "--toa": - self.toa256 = int(float(v) * 256.0 + 0.5) + bg_toa_group = bg_group.add_mutually_exclusive_group() + bg_toa_group.add_argument("--toa", + dest = "toa", type = int, + help = "Set Timing of Arrival in symbols (default random)") + bg_toa_group.add_argument("--toa256", + dest = "toa256", type = int, + help = "Set Timing of Arrival in 1/256 symbol periods") - def check_argv(self): - # Check connection mode - if self.conn_mode not in ("TRX", "L1"): - self.print_help("[!] Unknown connection type") - sys.exit(2) - - # Check connection mode - if self.burst_type not in ("NB", "FB", "SB", "AB"): - self.print_help("[!] Unknown burst type") - sys.exit(2) + return parser.parse_args() def sig_handler(self, signum, frame): log.info("Signal %d received" % signum) -- To view, visit https://gerrit.osmocom.org/12187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7eb3f2e2713f1f97293bd47a2eae3b140f63fb59 Gerrit-Change-Number: 12187 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:34:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:34:57 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_send.py: migrate from getopt to argparse In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12188 ) Change subject: trx_toolkit/burst_send.py: migrate from getopt to argparse ...................................................................... trx_toolkit/burst_send.py: migrate from getopt to argparse Change-Id: I1be66aa022a79aa1683f0e6cfebaed568b1736b1 --- M src/target/trx_toolkit/burst_send.py 1 file changed, 59 insertions(+), 127 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 787e0fc..499e929 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -27,7 +27,7 @@ import logging as log import signal -import getopt +import argparse import sys from data_dump import DATADumpFile @@ -36,27 +36,9 @@ from data_msg import * class Application: - # Application variables - remote_addr = "127.0.0.1" - bind_addr = "0.0.0.0" - base_port = 5700 - conn_mode = "TRX" - - # Burst source - capture_file = None - - # Count limitations - msg_skip = None - msg_count = None - - # Pass filtering - pf_fn_lt = None - pf_fn_gt = None - pf_tn = None - def __init__(self): print_copyright(CR_HOLDERS) - self.parse_argv() + self.argv = self.parse_argv() # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) @@ -66,152 +48,102 @@ format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") # Open requested capture file - self.ddf = DATADumpFile(self.capture_file) + self.ddf = DATADumpFile(self.argv.capture_file) def run(self): # Init DATA interface with TRX or L1 - if self.conn_mode == "TRX": - self.data_if = DATAInterface(self.remote_addr, self.base_port + 2, - self.bind_addr, self.base_port + 102) - l12trx = True - elif self.conn_mode == "L1": - self.data_if = DATAInterface(self.remote_addr, self.base_port + 102, - self.bind_addr, self.base_port + 2) - l12trx = False - else: - self.print_help("[!] Unknown connection type") - sys.exit(2) + if self.argv.conn_mode == "TRX": + self.data_if = DATAInterface( + self.argv.remote_addr, self.argv.base_port + 2, + self.argv.bind_addr, self.argv.base_port + 102) + elif self.argv.conn_mode == "L1": + self.data_if = DATAInterface( + self.argv.remote_addr, self.argv.base_port + 102, + self.argv.bind_addr, self.argv.base_port + 2) # Read messages from the capture messages = self.ddf.parse_all( - skip = self.msg_skip, count = self.msg_count) + skip = self.argv.cnt_skip, count = self.argv.cnt_count) if messages is False: pass # FIXME!!! for msg in messages: # Pass filter - if not self.msg_pass_filter(l12trx, msg): + if not self.msg_pass_filter(msg): continue log.info("Sending a burst %s to %s..." - % (msg.desc_hdr(), self.conn_mode)) + % (msg.desc_hdr(), self.argv.conn_mode)) # Send message self.data_if.send_msg(msg) - def msg_pass_filter(self, l12trx, msg): + def msg_pass_filter(self, msg): # Direction filter + l12trx = self.argv.conn_mode == "TRX" if isinstance(msg, DATAMSG_L12TRX) and not l12trx: return False elif isinstance(msg, DATAMSG_TRX2L1) and l12trx: return False # Timeslot filter - if self.pf_tn is not None: - if msg.tn != self.pf_tn: + if self.argv.pf_tn is not None: + if msg.tn != self.argv.pf_tn: return False # Frame number filter - if self.pf_fn_lt is not None: - if msg.fn > self.pf_fn_lt: + if self.argv.pf_fn_lt is not None: + if msg.fn > self.argv.pf_fn_lt: return False - if self.pf_fn_gt is not None: - if msg.fn < self.pf_fn_gt: + if self.argv.pf_fn_gt is not None: + if msg.fn < self.argv.pf_fn_gt: return False # Burst passed ;) return True - def print_help(self, msg = None): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - s += " TRX interface specific\n" \ - " -m --conn-mode Send bursts to: TRX (default) / L1\n" \ - " -r --remote-addr Set remote address (default %s)\n" \ - " -b --bind-addr Set bind address (default %s)\n" \ - " -p --base-port Set base port number (default %d)\n\n" - - s += " Burst source\n" \ - " -i --capture-file Read bursts from capture file\n\n" \ - - s += " Count limitations (disabled by default)\n" \ - " --msg-skip NUM Skip NUM messages before sending\n" \ - " --msg-count NUM Stop after sending NUM messages\n\n" \ - - s += " Filtering (disabled by default)\n" \ - " --timeslot NUM TDMA timeslot number [0..7]\n" \ - " --frame-num-lt NUM TDMA frame number lower than NUM\n" \ - " --frame-num-gt NUM TDMA frame number greater than NUM\n" - - print(s % (self.remote_addr, self.bind_addr, self.base_port)) - - if msg is not None: - print(msg) - def parse_argv(self): - try: - opts, args = getopt.getopt(sys.argv[1:], - "m:r:b:p:i:h", - [ - "help", - "conn-mode=", - "remote-addr=", - "bind-addr=", - "base-port=", - "capture-file=", - "msg-skip=", - "msg-count=", - "timeslot=", - "frame-num-lt=", - "frame-num-gt=", - ]) - except getopt.GetoptError as err: - self.print_help("[!] " + str(err)) - sys.exit(2) + parser = argparse.ArgumentParser(prog = "burst_send", + description = "Auxiliary tool to send (reply) captured bursts") - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) + trx_group = parser.add_argument_group("TRX interface") + trx_group.add_argument("-r", "--remote-addr", + dest = "remote_addr", type = str, default = "127.0.0.1", + help = "Set remote address (default %(default)s)") + trx_group.add_argument("-b", "--bind-addr", + dest = "bind_addr", type = str, default = "0.0.0.0", + help = "Set bind address (default %(default)s)") + trx_group.add_argument("-p", "--base-port", + dest = "base_port", type = int, default = 6700, + help = "Set base port number (default %(default)s)") + trx_group.add_argument("-m", "--conn-mode", + dest = "conn_mode", type = str, + choices = ["TRX", "L1"], default = "TRX", + help = "Where to send bursts (default %(default)s)") + trx_group.add_argument("-i", "--capture-file", metavar = "FILE", + dest = "capture_file", type = str, required = True, + help = "Capture file to read bursts from") - # Capture file - elif o in ("-i", "--capture-file"): - self.capture_file = v + cnt_group = parser.add_argument_group("Count limitations (optional)") + cnt_group.add_argument("--skip", metavar = "N", + dest = "cnt_skip", type = int, + help = "Skip N messages before sending") + cnt_group.add_argument("--count", metavar = "N", + dest = "cnt_count", type = int, + help = "Stop after sending N messages") - # TRX interface specific - elif o in ("-m", "--conn-mode"): - self.conn_mode = v - elif o in ("-r", "--remote-addr"): - self.remote_addr = v - elif o in ("-b", "--bind-addr"): - self.bind_addr = v - elif o in ("-p", "--base-port"): - self.base_port = int(v) + pf_group = parser.add_argument_group("Filtering (optional)") + cnt_group.add_argument("--timeslot", metavar = "TN", + dest = "pf_tn", type = int, choices = range(0, 8), + help = "TDMA timeslot number (equal TN)") + cnt_group.add_argument("--frame-num-lt", metavar = "FN", + dest = "pf_fn_lt", type = int, + help = "TDMA frame number (lower than FN)") + cnt_group.add_argument("--frame-num-gt", metavar = "FN", + dest = "pf_fn_gt", type = int, + help = "TDMA frame number (greater than FN)") - # Count limitations - elif o == "--msg-skip": - self.msg_skip = int(v) - elif o == "--msg-count": - self.msg_count = int(v) - - # Timeslot pass filter - elif o == "--timeslot": - self.pf_tn = int(v) - if self.pf_tn < 0 or self.pf_tn > 7: - self.print_help("[!] Wrong timeslot value") - sys.exit(2) - - # Frame number pass filter - elif o == "--frame-num-lt": - self.pf_fn_lt = int(v) - elif o == "--frame-num-gt": - self.pf_fn_gt = int(v) - - if self.capture_file is None: - self.print_help("[!] Please specify a capture file") - sys.exit(2) + return parser.parse_args() def sig_handler(self, signum, frame): log.info("Signal %d received" % signum) -- To view, visit https://gerrit.osmocom.org/12188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1be66aa022a79aa1683f0e6cfebaed568b1736b1 Gerrit-Change-Number: 12188 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:34:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:34:58 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_cmd.py: migrate from getopt to argparse In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12189 ) Change subject: trx_toolkit/ctrl_cmd.py: migrate from getopt to argparse ...................................................................... trx_toolkit/ctrl_cmd.py: migrate from getopt to argparse Change-Id: Ib9bf5ed7384c4f34478975cefe03880eb2fc8069 --- M src/target/trx_toolkit/ctrl_cmd.py 1 file changed, 25 insertions(+), 57 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py index ec683be..43b24a3 100755 --- a/src/target/trx_toolkit/ctrl_cmd.py +++ b/src/target/trx_toolkit/ctrl_cmd.py @@ -28,23 +28,16 @@ import logging as log import signal -import getopt +import argparse import select import sys from udp_link import UDPLink class Application: - # Application variables - remote_addr = "127.0.0.1" - bind_addr = "0.0.0.0" - base_port = 5700 - bind_port = 0 - fuzzing = False - def __init__(self): print_copyright(CR_HOLDERS) - self.parse_argv() + self.argv = self.parse_argv() # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) @@ -54,61 +47,36 @@ format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") # Init UDP connection - self.ctrl_link = UDPLink(self.remote_addr, self.base_port + 1, - self.bind_addr, self.bind_port) + self.ctrl_link = UDPLink( + self.argv.remote_addr, self.argv.base_port + 1, + self.argv.bind_addr, self.argv.bind_port) # Debug print log.info("Init CTRL interface (%s)" \ % self.ctrl_link.desc_link()) - def print_help(self, msg = None): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - s += " TRX interface specific\n" \ - " -r --remote-addr Set remote address (default %s)\n" \ - " -p --base-port Set base port number (default %d)\n" \ - " -P --bind-port Set local port number (default: random)\n" \ - " -b --bind-addr Set local address (default %s)\n" \ - " -f --fuzzing Send raw payloads (without CMD)\n" \ - - print(s % (self.remote_addr, self.base_port, self.bind_addr)) - - if msg is not None: - print(msg) - def parse_argv(self): - try: - opts, args = getopt.getopt(sys.argv[1:], - "r:p:P:b:fh", - [ - "help", - "fuzzing", - "base-port=", - "bind-port=", - "bind-addr=", - "remote-addr=", - ]) - except getopt.GetoptError as err: - self.print_help("[!] " + str(err)) - sys.exit(2) + parser = argparse.ArgumentParser(prog = "ctrl_cmd", + description = "Auxiliary tool to send control commands") - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) + trx_group = parser.add_argument_group("TRX interface") + trx_group.add_argument("-r", "--remote-addr", + dest = "remote_addr", type = str, default = "127.0.0.1", + help = "Set remote address (default %(default)s)") + trx_group.add_argument("-b", "--bind-addr", + dest = "bind_addr", type = str, default = "0.0.0.0", + help = "Set bind address (default %(default)s)") + trx_group.add_argument("-p", "--base-port", + dest = "base_port", type = int, default = 6700, + help = "Set base port number (default %(default)s)") + trx_group.add_argument("-P", "--bind-port", + dest = "bind_port", type = int, default = 0, + help = "Set bind port number (default random)") + trx_group.add_argument("-f", "--fuzzing", + dest = "fuzzing", action = "store_true", + help = "Send raw payloads (without CMD)") - elif o in ("-r", "--remote-addr"): - self.remote_addr = v - elif o in ("-b", "--bind-addr"): - self.bind_addr = v - elif o in ("-p", "--base-port"): - self.base_port = int(v) - elif o in ("-P", "--bind-port"): - self.bind_port = int(v) - elif o in ("-f", "--fuzzing"): - self.fuzzing = True + return parser.parse_args() def run(self): while True: @@ -133,7 +101,7 @@ cmd = cmd.strip().strip("\0") # Send a command - if self.fuzzing: + if self.argv.fuzzing: self.ctrl_link.send("%s" % cmd) else: self.ctrl_link.send("CMD %s\0" % cmd) -- To view, visit https://gerrit.osmocom.org/12189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib9bf5ed7384c4f34478975cefe03880eb2fc8069 Gerrit-Change-Number: 12189 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:34:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:34:58 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/trx_sniff.py: migrate from getopt to argparse In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12190 ) Change subject: trx_toolkit/trx_sniff.py: migrate from getopt to argparse ...................................................................... trx_toolkit/trx_sniff.py: migrate from getopt to argparse Change-Id: Id1dacaa32134bfa68344e6c48310390cdd85cdc9 --- M src/target/trx_toolkit/trx_sniff.py 1 file changed, 60 insertions(+), 116 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 9850983..9fb567e 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -27,7 +27,7 @@ import logging as log import signal -import getopt +import argparse import sys import scapy.all @@ -36,55 +36,37 @@ from data_msg import * class Application: - # Application variables - sniff_interface = "lo" - sniff_base_port = 5700 - print_bursts = False - output_file = None - # Counters cnt_burst_dropped_num = 0 - cnt_burst_break = None cnt_burst_num = 0 - cnt_frame_break = None cnt_frame_last = None cnt_frame_num = 0 - # Burst direction fliter - bf_dir_l12trx = None - - # Timeslot number filter - bf_tn_val = None - - # Frame number fliter - bf_fn_lt = None - bf_fn_gt = None - # Internal variables lo_trigger = False def __init__(self): print_copyright(CR_HOLDERS) - self.parse_argv() + self.argv = self.parse_argv() # Configure logging log.basicConfig(level = log.DEBUG, format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") # Open requested capture file - if self.output_file is not None: - self.ddf = DATADumpFile(self.output_file) + if self.argv.output_file is not None: + self.ddf = DATADumpFile(self.argv.output_file) def run(self): # Compose a packet filter pkt_filter = "udp and (port %d or port %d)" \ - % (self.sniff_base_port + 2, self.sniff_base_port + 102) + % (self.argv.base_port + 2, self.argv.base_port + 102) - log.info("Listening on interface '%s'..." % self.sniff_interface) + log.info("Listening on interface '%s'..." % self.argv.sniff_if) # Start sniffing... - scapy.all.sniff(iface = self.sniff_interface, store = 0, + scapy.all.sniff(iface = self.argv.sniff_if, store = 0, filter = pkt_filter, prn = self.pkt_handler) # Scapy registers its own signal handler @@ -92,7 +74,7 @@ def pkt_handler(self, ether): # Prevent loopback packet duplication - if self.sniff_interface == "lo": + if self.argv.sniff_if == "lo": self.lo_trigger = not self.lo_trigger if not self.lo_trigger: return @@ -139,32 +121,34 @@ def burst_pass_filter(self, l12trx, fn, tn): # Direction filter - if self.bf_dir_l12trx is not None: - if l12trx != self.bf_dir_l12trx: + if self.argv.direction is not None: + if self.argv.direction == "TRX" and not l12trx: + return False + elif self.argv.direction == "L1" and l12trx: return False # Timeslot filter - if self.bf_tn_val is not None: - if tn != self.bf_tn_val: + if self.argv.pf_tn is not None: + if tn != self.argv.pf_tn: return False # Frame number filter - if self.bf_fn_lt is not None: - if fn > self.bf_fn_lt: + if self.argv.pf_fn_lt is not None: + if fn > self.argv.pf_fn_lt: return False - if self.bf_fn_gt is not None: - if fn < self.bf_fn_gt: + if self.argv.pf_fn_gt is not None: + if fn < self.argv.pf_fn_gt: return False # Burst passed ;) return True def msg_handle(self, msg): - if self.print_bursts: + if self.argv.verbose: print(msg.burst) # Append a new message to the capture - if self.output_file is not None: + if self.argv.output_file is not None: self.ddf.append_msg(msg) def burst_count(self, fn, tn): @@ -180,14 +164,14 @@ self.cnt_burst_num += 1 # Stop sniffing after N bursts - if self.cnt_burst_break is not None: - if self.cnt_burst_num == self.cnt_burst_break: + if self.argv.burst_count is not None: + if self.cnt_burst_num == self.argv.burst_count: log.info("Collected required amount of bursts") return True # Stop sniffing after N frames - if self.cnt_frame_break is not None: - if self.cnt_frame_num == self.cnt_frame_break: + if self.argv.frame_count is not None: + if self.cnt_frame_num == self.argv.frame_count: log.info("Collected required amount of frames") return True @@ -203,88 +187,48 @@ # Exit sys.exit(0) - def print_help(self, msg = None): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - s += " Sniffing options\n" \ - " -i --sniff-interface Set network interface (default '%s')\n" \ - " -p --sniff-base-port Set base port number (default %d)\n\n" - - s += " Processing (no processing by default)\n" \ - " -o --output-file Write bursts to file\n" \ - " -v --print-bits Print burst bits to stdout\n\n" \ - - s += " Count limitations (disabled by default)\n" \ - " --frame-count NUM Stop after sniffing NUM frames\n" \ - " --burst-count NUM Stop after sniffing NUM bursts\n\n" - - s += " Filtering (disabled by default)\n" \ - " --direction DIR Burst direction: L12TRX or TRX2L1\n" \ - " --timeslot NUM TDMA timeslot number [0..7]\n" \ - " --frame-num-lt NUM TDMA frame number lower than NUM\n" \ - " --burst-num-gt NUM TDMA frame number greater than NUM\n" - - print(s % (self.sniff_interface, self.sniff_base_port)) - - if msg is not None: - print(msg) - def parse_argv(self): - try: - opts, args = getopt.getopt(sys.argv[1:], - "i:p:o:v:h", ["help", "sniff-interface=", "sniff-base-port=", - "frame-count=", "burst-count=", "direction=", - "timeslot=", "frame-num-lt=", "frame-num-gt=", - "output-file=", "print-bits"]) - except getopt.GetoptError as err: - self.print_help("[!] " + str(err)) - sys.exit(2) + parser = argparse.ArgumentParser(prog = "trx_sniff", + description = "Scapy-based TRX interface sniffer") - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) + parser.add_argument("-v", "--verbose", + dest = "verbose", action = "store_true", + help = "Print burst bits to stdout") - elif o in ("-i", "--sniff-interface"): - self.sniff_interface = v - elif o in ("-p", "--sniff-base-port"): - self.sniff_base_port = int(v) + trx_group = parser.add_argument_group("TRX interface") + trx_group.add_argument("-i", "--sniff-interface", + dest = "sniff_if", type = str, default = "lo", metavar = "IF", + help = "Set network interface (default '%(default)s')") + trx_group.add_argument("-p", "--base-port", + dest = "base_port", type = int, default = 6700, + help = "Set base port number (default %(default)s)") + trx_group.add_argument("-o", "--output-file", metavar = "FILE", + dest = "output_file", type = str, + help = "Write bursts to a capture file") - elif o in ("-o", "--output-file"): - self.output_file = v - elif o in ("-v", "--print-bits"): - self.print_bursts = True + cnt_group = parser.add_argument_group("Count limitations (optional)") + cnt_group.add_argument("--frame-count", metavar = "N", + dest = "frame_count", type = int, + help = "Stop after sniffing N frames") + cnt_group.add_argument("--burst-count", metavar = "N", + dest = "burst_count", type = int, + help = "Stop after sniffing N bursts") - # Break counters - elif o == "--frame-count": - self.cnt_frame_break = int(v) - elif o == "--burst-count": - self.cnt_burst_break = int(v) + pf_group = parser.add_argument_group("Filtering (optional)") + pf_group.add_argument("--direction", + dest = "direction", type = str, choices = ["TRX", "L1"], + help = "Burst direction") + pf_group.add_argument("--timeslot", metavar = "TN", + dest = "pf_tn", type = int, choices = range(0, 8), + help = "TDMA timeslot number (equal TN)") + pf_group.add_argument("--frame-num-lt", metavar = "FN", + dest = "pf_fn_lt", type = int, + help = "TDMA frame number (lower than FN)") + pf_group.add_argument("--frame-num-gt", metavar = "FN", + dest = "pf_fn_gt", type = int, + help = "TDMA frame number (greater than FN)") - # Direction filter - elif o == "--direction": - if v == "L12TRX": - self.bf_dir_l12trx = True - elif v == "TRX2L1": - self.bf_dir_l12trx = False - else: - self.print_help("[!] Wrong direction argument") - sys.exit(2) - - # Timeslot pass filter - elif o == "--timeslot": - self.bf_tn_val = int(v) - if self.bf_tn_val < 0 or self.bf_tn_val > 7: - self.print_help("[!] Wrong timeslot value") - sys.exit(2) - - # Frame number pass filter - elif o == "--frame-num-lt": - self.bf_fn_lt = int(v) - elif o == "--frame-num-gt": - self.bf_fn_gt = int(v) + return parser.parse_args() if __name__ == '__main__': app = Application() -- To view, visit https://gerrit.osmocom.org/12190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id1dacaa32134bfa68344e6c48310390cdd85cdc9 Gerrit-Change-Number: 12190 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 12:34:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 12:34:58 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: migrate from getopt to argparse In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12191 ) Change subject: trx_toolkit/fake_trx.py: migrate from getopt to argparse ...................................................................... trx_toolkit/fake_trx.py: migrate from getopt to argparse Change-Id: I0218a328671c591b20b0666dc7c39ba865892acc --- M src/target/trx_toolkit/fake_trx.py 1 file changed, 40 insertions(+), 86 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index ced1238..1c991ce 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -27,7 +27,7 @@ import logging as log import signal -import getopt +import argparse import select import sys @@ -40,16 +40,9 @@ from clck_gen import CLCKGen class Application: - # Application variables - bts_addr = "127.0.0.1" - bb_addr = "127.0.0.1" - trx_bind_addr = "0.0.0.0" - bts_base_port = 5700 - bb_base_port = 6700 - def __init__(self): print_copyright(CR_HOLDERS) - self.parse_argv() + self.argv = self.parse_argv() # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) @@ -60,12 +53,14 @@ def run(self): # Init TRX CTRL interface for BTS - self.bts_ctrl = CTRLInterfaceBTS(self.bts_addr, self.bts_base_port + 101, - self.trx_bind_addr, self.bts_base_port + 1) + self.bts_ctrl = CTRLInterfaceBTS( + self.argv.bts_addr, self.argv.bts_base_port + 101, + self.argv.trx_bind_addr, self.argv.bts_base_port + 1) # Init TRX CTRL interface for BB - self.bb_ctrl = CTRLInterfaceBB(self.bb_addr, self.bb_base_port + 101, - self.trx_bind_addr, self.bb_base_port + 1) + self.bb_ctrl = CTRLInterfaceBB( + self.argv.bb_addr, self.argv.bb_base_port + 101, + self.argv.trx_bind_addr, self.argv.bb_base_port + 1) # Power measurement emulation # Noise: -120 .. -105 @@ -77,10 +72,12 @@ self.bb_ctrl.pm = self.pm # Init DATA links - self.bts_data = UDPLink(self.bts_addr, self.bts_base_port + 102, - self.trx_bind_addr, self.bts_base_port + 2) - self.bb_data = UDPLink(self.bb_addr, self.bb_base_port + 102, - self.trx_bind_addr, self.bb_base_port + 2) + self.bts_data = UDPLink( + self.argv.bts_addr, self.argv.bts_base_port + 102, + self.argv.trx_bind_addr, self.argv.bts_base_port + 2) + self.bb_data = UDPLink( + self.argv.bb_addr, self.argv.bb_base_port + 102, + self.argv.trx_bind_addr, self.argv.bb_base_port + 2) # BTS <-> BB burst forwarding self.burst_fwd = BurstForwarder(self.bts_data, self.bb_data) @@ -90,8 +87,9 @@ self.bb_ctrl.burst_fwd = self.burst_fwd # Provide clock to BTS - self.bts_clck = UDPLink(self.bts_addr, self.bts_base_port + 100, - self.trx_bind_addr, self.bts_base_port) + self.bts_clck = UDPLink( + self.argv.bts_addr, self.argv.bts_base_port + 100, + self.argv.trx_bind_addr, self.argv.bts_base_port) self.clck_gen = CLCKGen([self.bts_clck]) self.bts_ctrl.clck_gen = self.clck_gen @@ -129,78 +127,34 @@ # Stop clock generator self.clck_gen.stop() - def print_help(self, msg = None): - s = " Usage: " + sys.argv[0] + " [options]\n\n" \ - " Some help...\n" \ - " -h --help this text\n\n" - - s += " TRX interface specific\n" \ - " -R --bts-addr Set BTS remote address (default %s)\n" \ - " -r --bb-addr Set BB remote address (default %s)\n" \ - " -P --bts-base-port Set BTS base port number (default %d)\n" \ - " -p --bb-base-port Set BB base port number (default %d)\n" \ - " -b --trx-bind-addr Set TRX bind address (default %s)\n" - - print(s % (self.bts_addr, self.bb_addr, - self.bts_base_port, self.bb_base_port, - self.trx_bind_addr)) - - if msg is not None: - print(msg) - def parse_argv(self): - try: - opts, args = getopt.getopt(sys.argv[1:], - "R:r:P:p:b:h", - [ - "help", - "bts-addr=", "bb-addr=", - "bts-base-port=", "bb-base-port=", - "trx-bind-addr=", - ]) - except getopt.GetoptError as err: - self.print_help("[!] " + str(err)) - sys.exit(2) + parser = argparse.ArgumentParser(prog = "fake_trx", + description = "Virtual Um-interface (fake transceiver)") - for o, v in opts: - if o in ("-h", "--help"): - self.print_help() - sys.exit(2) + trx_group = parser.add_argument_group("TRX interface") + trx_group.add_argument("-b", "--trx-bind-addr", + dest = "trx_bind_addr", type = str, default = "0.0.0.0", + help = "Set FakeTRX bind address (default %(default)s)") + trx_group.add_argument("-R", "--bts-addr", + dest = "bts_addr", type = str, default = "127.0.0.1", + help = "Set BTS remote address (default %(default)s)") + trx_group.add_argument("-r", "--bb-addr", + dest = "bb_addr", type = str, default = "127.0.0.1", + help = "Set BB remote address (default %(default)s)") + trx_group.add_argument("-P", "--bts-base-port", + dest = "bts_base_port", type = int, default = 5700, + help = "Set BTS base port number (default %(default)s)") + trx_group.add_argument("-p", "--bb-base-port", + dest = "bb_base_port", type = int, default = 6700, + help = "Set BB base port number (default %(default)s)") - elif o in ("-R", "--bts-addr"): - self.bts_addr = v - elif o in ("-r", "--bb-addr"): - self.bb_addr = v + argv = parser.parse_args() - elif o in ("-P", "--bts-base-port"): - self.bts_base_port = int(v) - elif o in ("-p", "--bb-base-port"): - self.bb_base_port = int(v) + # Make sure there is no overlap between ports + if argv.bts_base_port == argv.bb_base_port: + parser.error("BTS and BB base ports shall be different") - elif o in ("-b", "--trx-bind-addr"): - self.trx_bind_addr = v - - # Ensure there is no overlap between ports - if self.bts_base_port == self.bb_base_port: - self.print_help("[!] BTS and BB base ports should be different") - sys.exit(2) - - bts_ports = [ - self.bts_base_port + 0, self.bts_base_port + 100, - self.bts_base_port + 1, self.bts_base_port + 101, - self.bts_base_port + 2, self.bts_base_port + 102, - ] - - bb_ports = [ - self.bb_base_port + 0, self.bb_base_port + 100, - self.bb_base_port + 1, self.bb_base_port + 101, - self.bb_base_port + 2, self.bb_base_port + 102, - ] - - for p in bb_ports: - if p in bts_ports: - self.print_help("[!] BTS and BB ports overlap detected") - sys.exit(2) + return argv def sig_handler(self, signum, frame): log.info("Signal %d received" % signum) -- To view, visit https://gerrit.osmocom.org/12191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0218a328671c591b20b0666dc7c39ba865892acc Gerrit-Change-Number: 12191 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 13:05:22 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 7 Dec 2018 13:05:22 +0000 Subject: Change in osmo-hlr[master]: store a timestamp of the last location update seen from a subscriber In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/12121 ) Change subject: store a timestamp of the last location update seen from a subscriber ...................................................................... store a timestamp of the last location update seen from a subscriber Timestamps are stored in the HLR DB in the new 'last_lu_seen' column of the 'subscriber' table, in UTC and in granularity of seconds. At present, osmo-hlr only records these timestamps but otherwise makes no use of them. Because the timestamps are stored in a human-readable form, they may already provide value to external processes which need this information. For example: sqlite> select imsi,last_lu_seen from subscriber; 901990000000001|2018-12-04 14:17:12 I didn't bother adding additional tests because the code added with this commit is already being exercised by several calls to db_subscr_lu() in db_test.c. This change requires a HLR DB schema update. Existing databases won't be upgraded automatically. However, osmo-hlr will refuse to operate with databases which are not upgraded. Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Related: OS#2838 --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c 4 files changed, 108 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/sql/hlr.sql b/sql/hlr.sql index 3499109..9ff9867 100644 --- a/sql/hlr.sql +++ b/sql/hlr.sql @@ -36,7 +36,11 @@ -- Chapter 2.7.5 ms_purged_cs BOOLEAN NOT NULL DEFAULT 0, -- Chapter 2.7.6 - ms_purged_ps BOOLEAN NOT NULL DEFAULT 0 + ms_purged_ps BOOLEAN NOT NULL DEFAULT 0, + + -- Timestamp of last location update seen from subscriber + -- The value is a string which encodes a UTC timestamp in granularity of seconds. + last_lu_seen TIMESTAMP default NULL ); CREATE TABLE subscriber_apn ( @@ -69,4 +73,5 @@ CREATE UNIQUE INDEX idx_subscr_imsi ON subscriber (imsi); -- Set HLR database schema version number -PRAGMA user_version = 0; +-- Note: This constant is currently duplicated in src/db.c and must be kept in sync! +PRAGMA user_version = 1; diff --git a/src/db.c b/src/db.c index df52f9b..f7cbace 100644 --- a/src/db.c +++ b/src/db.c @@ -27,7 +27,8 @@ #include "db.h" #include "db_bootstrap.h" -#define CURRENT_SCHEMA_VERSION 0 +/* This constant is currently duplicated in sql/hlr.sql and must be kept in sync! */ +#define CURRENT_SCHEMA_VERSION 1 #define SEL_COLUMNS \ "id," \ @@ -42,7 +43,8 @@ "nam_ps," \ "lmsi," \ "ms_purged_cs," \ - "ms_purged_ps" + "ms_purged_ps," \ + "last_lu_seen" static const char *stmt_sql[] = { [DB_STMT_SEL_BY_IMSI] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE imsi = ?", @@ -73,6 +75,7 @@ "INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, op, opc, ind_bitlen)" " VALUES($subscriber_id, $algo_id_3g, $k, $op, $opc, $ind_bitlen)", [DB_STMT_AUC_3G_DELETE] = "DELETE FROM auc_3g WHERE subscriber_id = $subscriber_id", + [DB_STMT_SET_LAST_LU_SEEN] = "UPDATE subscriber SET last_lu_seen = datetime($val, 'unixepoch') WHERE id = $subscriber_id", }; static void sql3_error_log_cb(void *arg, int err_code, const char *msg) @@ -252,6 +255,41 @@ return true; } +static int +db_upgrade_v1(struct db_context *dbc) +{ + sqlite3_stmt *stmt; + int rc; + const char *update_stmt_sql = "ALTER TABLE subscriber ADD COLUMN last_lu_seen TIMESTAMP default NULL"; + const char *set_schema_version_sql = "PRAGMA user_version = 1"; + + rc = sqlite3_prepare_v2(dbc->db, update_stmt_sql, -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", update_stmt_sql); + return rc; + } + rc = sqlite3_step(stmt); + db_remove_reset(stmt); + sqlite3_finalize(stmt); + if (rc != SQLITE_DONE) { + LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1); + return rc; + } + + rc = sqlite3_prepare_v2(dbc->db, set_schema_version_sql, -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", set_schema_version_sql); + return rc; + } + rc = sqlite3_step(stmt); + if (rc != SQLITE_DONE) + LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1); + + db_remove_reset(stmt); + sqlite3_finalize(stmt); + return rc; +} + static int db_get_user_version(struct db_context *dbc) { const char *user_version_sql = "PRAGMA user_version"; @@ -346,12 +384,28 @@ rc, sqlite3_errmsg(dbc->db)); goto out_free; } + version = CURRENT_SCHEMA_VERSION; } LOGP(DDB, LOGL_NOTICE, "Database '%s' has HLR DB schema version %d\n", dbc->fname, version); if (version < CURRENT_SCHEMA_VERSION && allow_upgrade) { - /* Future version upgrades will happen here. */ + switch (version) { + case 0: + rc = db_upgrade_v1(dbc); + if (rc != SQLITE_DONE) { + LOGP(DDB, LOGL_ERROR, "Failed to upgrade HLR DB schema to version 1: (rc=%d) %s\n", + rc, sqlite3_errmsg(dbc->db)); + goto out_free; + } + version = 1; + /* fall through */ + /* case N: ... */ + default: + break; + } + LOGP(DDB, LOGL_NOTICE, "Database '%s' has been upgraded to HLR DB schema version %d\n", + dbc->fname, version); } if (version != CURRENT_SCHEMA_VERSION) { diff --git a/src/db.h b/src/db.h index 66dfe57..5129b8d 100644 --- a/src/db.h +++ b/src/db.h @@ -25,6 +25,7 @@ DB_STMT_AUC_2G_DELETE, DB_STMT_AUC_3G_INSERT, DB_STMT_AUC_3G_DELETE, + DB_STMT_SET_LAST_LU_SEEN, _NUM_DB_STMT }; diff --git a/src/db_hlr.c b/src/db_hlr.c index 2bccc38..342698e 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -577,6 +578,7 @@ { sqlite3_stmt *stmt; int rc, ret = 0; + struct timespec localtime; stmt = dbc->stmt[is_ps ? DB_STMT_UPD_SGSN_BY_ID : DB_STMT_UPD_VLR_BY_ID]; @@ -603,13 +605,54 @@ ": no such subscriber\n", is_ps? "SGSN" : "VLR", subscr_id); ret = -ENOENT; + goto out; } else if (rc != 1) { LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%"PRId64 ": SQL modified %d rows (expected 1)\n", is_ps? "SGSN" : "VLR", subscr_id, rc); ret = -EIO; + goto out; } + db_remove_reset(stmt); + + if (osmo_clock_gettime(CLOCK_REALTIME, &localtime) != 0) { + LOGP(DAUC, LOGL_ERROR, "Cannot get the current time: (%d) %s\n", errno, strerror(errno)); + ret = -errno; + goto out; + } + + stmt = dbc->stmt[DB_STMT_SET_LAST_LU_SEEN]; + + if (!db_bind_int64(stmt, "$subscriber_id", subscr_id)) + return -EIO; + /* The timestamp will be converted to UTC by SQLite. */ + if (!db_bind_int64(stmt, "$val", (int64_t)localtime.tv_sec)) { + ret = -EIO; + goto out; + } + + rc = sqlite3_step(stmt); + if (rc != SQLITE_DONE) { + LOGP(DAUC, LOGL_ERROR, + "Cannot update LU timestamp for subscriber ID=%"PRId64": SQL error: (%d) %s\n", + subscr_id, rc, sqlite3_errmsg(dbc->db)); + ret = -EIO; + goto out; + } + + /* verify execution result */ + rc = sqlite3_changes(dbc->db); + if (!rc) { + LOGP(DAUC, LOGL_ERROR, "Cannot update LU timestamp for subscriber ID=%"PRId64 + ": no such subscriber\n", subscr_id); + ret = -ENOENT; + goto out; + } else if (rc != 1) { + LOGP(DAUC, LOGL_ERROR, "Update LU timestamp for subscriber ID=%"PRId64 + ": SQL modified %d rows (expected 1)\n", subscr_id, rc); + ret = -EIO; + } out: db_remove_reset(stmt); return ret; -- To view, visit https://gerrit.osmocom.org/12121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibeb49d45aec18451a260a6654b8c51b8fc3bec50 Gerrit-Change-Number: 12121 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 13:07:42 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 13:07:42 +0000 Subject: Change in libosmocore[master]: gsm0408_test: test encoding and decoding Mobile Identity In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12151 ) Change subject: gsm0408_test: test encoding and decoding Mobile Identity ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaae3af87f82f1a8f2e6273984c011b2813038cf7 Gerrit-Change-Number: 12151 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Dec 2018 13:07:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 13:10:15 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 7 Dec 2018 13:10:15 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12177 ) Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12177/3/tests/msc_vlr/Makefile.am File tests/msc_vlr/Makefile.am: https://gerrit.osmocom.org/#/c/12177/3/tests/msc_vlr/Makefile.am at 22 PS3, Line 22: osmo_gsup_client_create > I think this is useless now. Yes, well spotted. Fixed in next patch set. -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Dec 2018 13:10:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 13:10:18 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 7 Dec 2018 13:10:18 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12177 to look at the new patch set (#4). Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... make gsup ipa name configurable in osmo-msc.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the MSC. This is a prerequisite for inter-MSC handover. Related: OS#3355 Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/test_nodes.vty 20 files changed, 161 insertions(+), 128 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/12177/4 -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 13:49:47 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 13:49:47 +0000 Subject: Change in libosmocore[master]: gsm0808: add encoder for cause codes and use it In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12044 to look at the new patch set (#4). Change subject: gsm0808: add encoder for cause codes and use it ...................................................................... gsm0808: add encoder for cause codes and use it At the moment the all gsm0808 cause codes are encoded directly using the tlv API directly to put a one byte TLV field. This works ok for most situations where the cause code consists of a single byte. However, gsm0808 specifies a two byte cause code model where cause codes may be extended up to two bytes. Instead of implementing the encoding over and over and again, let's rather have an encoder function we can call. - Add an encoder function that can generate single byte and extended cause codeds and makes the length decision automatically. - Use only this function to append cause codes Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 6 files changed, 75 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/12044/4 -- To view, visit https://gerrit.osmocom.org/12044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb Gerrit-Change-Number: 12044 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 14:02:11 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 14:02:11 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11734 to look at the new patch set (#8). Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... handover_fsm: send HANDOVER PERFORMED msg on internal ho When an internal handover is done the specification demands to inform the MSC about the event. - Add sending of BSSMAP HANDOVER PERFORMED msg. Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Depends: libosmocore I825106858bd89afc9837811b8fed2e8accc82441 Related: OS#3645 --- M src/osmo-bsc/handover_fsm.c M tests/handover/handover_test.c 2 files changed, 69 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/11734/8 -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 14:07:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Dec 2018 14:07:18 +0000 Subject: Change in osmo-msc[master]: ASS-COMPL: do not fire Sec Mode Compl event Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12200 Change subject: ASS-COMPL: do not fire Sec Mode Compl event ...................................................................... ASS-COMPL: do not fire Sec Mode Compl event BSSMAP Assignment Complete: Do not invoke ran_conn_rx_sec_mode_compl(), that's just weird. Instead this should call msc_assign_compl(), which is currently dead code and does nothing ... and there are some more strings attached, being resolved in a subsequent patch. Change-Id: I448fdb783364628005437b3d866d1a076a9767d7 --- M src/libmsc/a_iface_bssap.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/00/12200/1 diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index a10bd42..d84a234 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -579,10 +579,6 @@ return -EINVAL; } - /* FIXME: Seems to be related to authentication or, - encryption. Is this really in the right place? */ - ran_conn_rx_sec_mode_compl(conn); - return 0; } -- To view, visit https://gerrit.osmocom.org/12200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I448fdb783364628005437b3d866d1a076a9767d7 Gerrit-Change-Number: 12200 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 14:07:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Dec 2018 14:07:18 +0000 Subject: Change in osmo-msc[master]: move ASS-COMPL MGCP handling out of a_iface_bssap.c Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12201 Change subject: move ASS-COMPL MGCP handling out of a_iface_bssap.c ...................................................................... move ASS-COMPL MGCP handling out of a_iface_bssap.c BSSMAP Assignment Complete: sort MGCP handling upon Assignment Complete to the proper locations. a_iface_bssap.c is not the right place to invoke the MGCP related procedures. - in a_iface_bssap.c only decode the IEs. - call ran_conn_assign_compl() and pass decoded values. - drop msc_assign_compl(), it was dead code; instead: - add ran_conn_assign_compl() - pass on all MGCP related info to msc_mgcp_ass_complete() - move all MGCP ctx related handling from a_iface_bssap.c to msc_mgcp.c. I'm dropping some comments to save some time, because if I adjust them IMHO they would still anyway restate the obvious. ran_conn_assign_compl() is now quite a thin shim, but it makes sense to have it: - This is the place that should tear down the ran_conn in case assignment failed, left for a future patch. - In the light of upcoming inter-MSC handover, ran_conn_assign_compl() will be the place where the Assignment Complete message might be relayed to a remote MSC. Change-Id: I8137215c443239bddf3e69b5715839a365b73b6c --- M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/ran_conn.h M src/libmsc/a_iface_bssap.c M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 5 files changed, 81 insertions(+), 88 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/01/12201/1 diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h index 9d8b01d..f405f45 100644 --- a/include/osmocom/msc/msc_mgcp.h +++ b/include/osmocom/msc/msc_mgcp.h @@ -58,6 +58,7 @@ }; int msc_mgcp_call_assignment(struct gsm_trans *trans); -int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr); +int msc_mgcp_ass_complete(struct ran_conn *conn, const struct gsm0808_speech_codec *speech_codec_chosen, + const struct sockaddr_storage *aoip_transport_addr); int msc_mgcp_call_complete(struct gsm_trans *trans, uint16_t port, char *addr); int msc_mgcp_call_release(struct gsm_trans *trans); diff --git a/include/osmocom/msc/ran_conn.h b/include/osmocom/msc/ran_conn.h index d71872e..228d595 100644 --- a/include/osmocom/msc/ran_conn.h +++ b/include/osmocom/msc/ran_conn.h @@ -197,6 +197,8 @@ void ran_conn_classmark_chg(struct ran_conn *conn, const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len); +void ran_conn_assign_compl(struct ran_conn *conn, const struct gsm0808_speech_codec *speech_codec_chosen, + const struct sockaddr_storage *aoip_transport_addr); void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause); void ran_conn_init(void); diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index d84a234..4e8b146 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -34,7 +34,6 @@ #include #include #include -#include #include @@ -498,51 +497,12 @@ return 0; } -/* Use the speech codec info we go with the assignment complete to dtermine - * which codec we will signal to the MGW */ -static enum mgcp_codecs mgcp_codec_from_sc(struct gsm0808_speech_codec *sc) -{ - switch (sc->type) { - case GSM0808_SCT_FR1: - return CODEC_GSM_8000_1; - break; - case GSM0808_SCT_FR2: - return CODEC_GSMEFR_8000_1; - break; - case GSM0808_SCT_FR3: - return CODEC_AMR_8000_1; - break; - case GSM0808_SCT_FR4: - return CODEC_AMRWB_16000_1; - break; - case GSM0808_SCT_FR5: - return CODEC_AMRWB_16000_1; - break; - case GSM0808_SCT_HR1: - return CODEC_GSMHR_8000_1; - break; - case GSM0808_SCT_HR3: - return CODEC_AMR_8000_1; - break; - case GSM0808_SCT_HR4: - return CODEC_AMRWB_16000_1; - break; - case GSM0808_SCT_HR6: - return CODEC_AMRWB_16000_1; - break; - default: - return CODEC_PCMU_8000_1; - break; - } -} - /* Endpoint to handle assignment complete */ static int bssmap_rx_ass_compl(struct ran_conn *conn, struct msgb *msg, struct tlv_parsed *tp) { struct sockaddr_storage rtp_addr; struct gsm0808_speech_codec sc; - struct sockaddr_in *rtp_addr_in; int rc; LOGPCONN(conn, LOGL_INFO, "Rx BSSMAP ASSIGNMENT COMPLETE message\n"); @@ -567,18 +527,8 @@ LOGPCONN(conn, LOGL_ERROR, "Unable to decode speech codec (choosen).\n"); return -EINVAL; } - conn->rtp.codec_ran = mgcp_codec_from_sc(&sc); - /* use address / port supplied with the AoIP - * transport address element */ - if (rtp_addr.ss_family == AF_INET) { - rtp_addr_in = (struct sockaddr_in *)&rtp_addr; - msc_mgcp_ass_complete(conn, osmo_ntohs(rtp_addr_in->sin_port), inet_ntoa(rtp_addr_in->sin_addr)); - } else { - LOGPCONN(conn, LOGL_ERROR, "Unsopported addressing scheme. (supports only IPV4)\n"); - return -EINVAL; - } - + ran_conn_assign_compl(conn, &sc, &rtp_addr); return 0; } diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 1ddec08..e85254e 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -1025,51 +1025,89 @@ return 0; } -/* Inform the FSM that the assignment (RAN connection) is now complete. - * Parameter: - * conn: RAN connection context. - * port: port number of the remote leg. - * addr: IP-address of the remote leg. - * Returns -EINVAL on error, 0 on success. */ -int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr) +static enum mgcp_codecs mgcp_codec_from_sc(const struct gsm0808_speech_codec *sc) { - struct mgcp_ctx *mgcp_ctx; + switch (sc->type) { + case GSM0808_SCT_FR1: + return CODEC_GSM_8000_1; + break; + case GSM0808_SCT_FR2: + return CODEC_GSMEFR_8000_1; + break; + case GSM0808_SCT_FR3: + return CODEC_AMR_8000_1; + break; + case GSM0808_SCT_FR4: + return CODEC_AMRWB_16000_1; + break; + case GSM0808_SCT_FR5: + return CODEC_AMRWB_16000_1; + break; + case GSM0808_SCT_HR1: + return CODEC_GSMHR_8000_1; + break; + case GSM0808_SCT_HR3: + return CODEC_AMR_8000_1; + break; + case GSM0808_SCT_HR4: + return CODEC_AMRWB_16000_1; + break; + case GSM0808_SCT_HR6: + return CODEC_AMRWB_16000_1; + break; + default: + return CODEC_PCMU_8000_1; + break; + } +} - OSMO_ASSERT(conn); +int msc_mgcp_ass_complete(struct ran_conn *conn, const struct gsm0808_speech_codec *speech_codec_chosen, + const struct sockaddr_storage *aoip_transport_addr) +{ + struct sockaddr_in *rtp_addr_in; + const char *addr; + uint16_t port; + struct mgcp_ctx *mgcp_ctx = conn->rtp.mgcp_ctx; + struct osmo_fsm_inst *fi; + + if (!mgcp_ctx || !mgcp_ctx->fsm) { + LOGPCONN(conn, LOGL_ERROR, "Invalid MGCP context, Assignment Complete failed.\n"); + return -EINVAL; + } + + fi = mgcp_ctx->fsm; + + if (fi->state != ST_MDCX_RAN) { + LOGPFSML(fi, LOGL_ERROR, "Assignment Complete not allowed in this state\n"); + return -ENOTSUP; + } + + /* use address / port supplied with the AoIP transport address element */ + if (aoip_transport_addr->ss_family != AF_INET) { + LOGPCONN(conn, LOGL_ERROR, "Assignment Complete: Unsupported addressing scheme (only IPV4 supported)\n"); + return -EINVAL; + } + + rtp_addr_in = (struct sockaddr_in *)&aoip_transport_addr; + addr = inet_ntoa(rtp_addr_in->sin_addr); + port = osmo_ntohs(rtp_addr_in->sin_port); if (port == 0) { - LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) invalid remote call leg port, assignment completion failed\n", - vlr_subscr_name(conn->vsub)); + LOGPCONN(conn, LOGL_ERROR, "Assignment Complete: invalid remote call leg port (0)\n"); return -EINVAL; } if (!addr || strlen(addr) <= 0) { - LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) missing remote call leg address, assignment completion failed\n", - vlr_subscr_name(conn->vsub)); + LOGPCONN(conn, LOGL_ERROR, "Assignment Complete: invalid remote call leg address (empty)\n"); return -EINVAL; } - mgcp_ctx = conn->rtp.mgcp_ctx; - if (!mgcp_ctx) { - LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) invalid mgcp context, assignment completion failed.\n", - vlr_subscr_name(conn->vsub)); - return -EINVAL; - } - - /* Memorize port and IP-Address of the remote RAN call leg. We need this - * information at latest when we enter the MDCX phase for the RAN side. */ - conn->rtp.remote_port_ran = port; + conn->rtp.codec_ran = mgcp_codec_from_sc(speech_codec_chosen); osmo_strlcpy(conn->rtp.remote_addr_ran, addr, sizeof(conn->rtp.remote_addr_ran)); + conn->rtp.remote_port_ran = port; - LOGP(DMGCP, LOGL_DEBUG, "(subscriber:%s) assignment completed, rtp %s:%d.\n", - vlr_subscr_name(conn->vsub), conn->rtp.remote_addr_ran, port); + LOGPCONN(conn, LOGL_DEBUG, "Assignment Complete: rtp %s:%u\n", addr, port); - /* Note: We only dispatch the event if we are really waiting for the - * assignment, if we are not yet waiting, there is no need to loudly - * broadcast an event that the all other states do not understand anyway */ - if (mgcp_ctx->fsm->state == ST_MDCX_RAN) - osmo_fsm_inst_dispatch(mgcp_ctx->fsm, EV_ASSIGN, mgcp_ctx); - - return 0; + return osmo_fsm_inst_dispatch(fi, EV_ASSIGN, mgcp_ctx); } /* Make the connection of a previously assigned call complete diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 37c1d15..8cc5ee7 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "../../bscconfig.h" #ifdef BUILD_IU @@ -113,17 +114,18 @@ } /* Receive an ASSIGNMENT COMPLETE from BSC */ -void msc_assign_compl(struct ran_conn *conn, - uint8_t rr_cause, uint8_t chosen_channel, - uint8_t encr_alg_id, uint8_t speec) +void ran_conn_assign_compl(struct ran_conn *conn, const struct gsm0808_speech_codec *speech_codec_chosen, + const struct sockaddr_storage *aoip_transport_addr) { - LOGP(DRR, LOGL_DEBUG, "MSC assign complete (do nothing).\n"); + msc_mgcp_ass_complete(conn, speech_codec_chosen, aoip_transport_addr); + /* FIXME: tear down conn upon failure */ } /* Receive an ASSIGNMENT FAILURE from BSC */ void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause) { LOGP(DRR, LOGL_DEBUG, "MSC assign failure (do nothing).\n"); + /* FIXME: tear down conn upon failure */ } /* Receive a CLASSMARK CHANGE from BSC */ -- To view, visit https://gerrit.osmocom.org/12201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8137215c443239bddf3e69b5715839a365b73b6c Gerrit-Change-Number: 12201 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 14:09:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 14:09:23 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: merge copyright.py into app_common.py In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12193 ) Change subject: trx_toolkit: merge copyright.py into app_common.py ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8b70ec2dd08cb2ffed733d2c4e1215b094f8d3d5 Gerrit-Change-Number: 12193 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Dec 2018 14:09:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 14:09:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 14:09:27 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: introduce logging configuration arguments In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12192 ) Change subject: trx_toolkit: introduce logging configuration arguments ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3b0440cd73946ad444bd7e48feb7a92d45f6488 Gerrit-Change-Number: 12192 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 14:09:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 14:10:23 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 14:10:23 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11734 to look at the new patch set (#9). Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... handover_fsm: send HANDOVER PERFORMED msg on internal ho When an internal handover is done the specification demands to inform the MSC about the event. - Add sending of BSSMAP HANDOVER PERFORMED msg. Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Depends: libosmocore I825106858bd89afc9837811b8fed2e8accc82441 Related: OS#3645 --- M src/osmo-bsc/handover_fsm.c M tests/handover/handover_test.c 2 files changed, 69 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/11734/9 -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 14:27:54 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 14:27:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 7: (1 comment) > I mean, it would be nicer to allow having a ctrl for both sides, > but if it fixes the status quo, this patch is ok, right? Making the control interface available from both sides requires an additional architecture to route the message back and forth between the two entities. The patch does not break anything, also having the control interface available at the BSC_ConnectionHandler makes more sense than having it on the MTC_CT. https://gerrit.osmocom.org/#/c/11690/4/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11690/4/msc/MSC_Tests.ttcn at a20 PS4, Line 20: > You remove those 2 here and introduce them in next patch. [?] Done -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 07 Dec 2018 14:27:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 14:52:40 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 7 Dec 2018 14:52:40 +0000 Subject: Change in osmo-hlr[master]: display last location update timestamp in vty Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12202 Change subject: display last location update timestamp in vty ...................................................................... display last location update timestamp in vty Read the subscriber's last location update timestamp from the database and display it in the output of 'show subscriber'. For example: OsmoHLR> show subscriber id 1 ID: 1 IMSI: 123456789000000 MSISDN: 543210123456789 VLR number: 712 SGSN number: 5952 last LU seen: Fri Dec 7 11:30:51 2018 UTC While the database stores the timestamp as a string, we convert the timestamp into time_t for internal use. This allows for flexible potential use of the timestamp in contexts other than the VTY in the future. The timestamp displayed in the VTY is created with ctime_r(3). It does not match the format of the raw string in the database: sqlite> select id,last_lu_seen from subscriber; 1|2018-12-07 11:30:51 Related: OS#2838 Change-Id: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a --- M src/db.h M src/db_hlr.c M src/hlr_vty_subscr.c 3 files changed, 44 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/02/12202/1 diff --git a/src/db.h b/src/db.h index 5129b8d..ae592fb 100644 --- a/src/db.h +++ b/src/db.h @@ -84,8 +84,14 @@ uint32_t lmsi; bool ms_purged_cs; bool ms_purged_ps; + time_t last_lu_seen; }; +/* A format string for use with strptime(3). This format string is + * used to parse the last_lu_seen column stored in the HLR database. + * See https://sqlite.org/lang_datefunc.html, function datetime(). */ +#define DB_LAST_LU_SEEN_FMT "%Y-%m-%d %H:%M:%S" + /* Like struct osmo_sub_auth_data, but the keys are in hexdump representation. * This is useful because SQLite requires them in hexdump format, and callers * like the VTY and CTRL interface also have them available as hexdump to begin diff --git a/src/db_hlr.c b/src/db_hlr.c index 342698e..1b0644f 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -17,6 +17,11 @@ * */ +#define _POSIX_C_SOURCE 200809L /* for strptime(3) */ +/* These are needed as well due to the above _POSIX_C_SOURCE definition: */ +#define _DEFAULT_SOURCE /* for struct timezone */ +#define _XOPEN_SOURCE /* for clockid_t */ + #include #include #include @@ -387,6 +392,7 @@ { int rc; int ret = 0; + const char *last_lu_seen_str; /* execute the statement */ rc = sqlite3_step(stmt); @@ -419,6 +425,21 @@ subscr->lmsi = sqlite3_column_int(stmt, 10); subscr->ms_purged_cs = sqlite3_column_int(stmt, 11); subscr->ms_purged_ps = sqlite3_column_int(stmt, 12); + last_lu_seen_str = (const char *)sqlite3_column_text(stmt, 13); + if (last_lu_seen_str && last_lu_seen_str[0] != '\0') { + struct tm tm; + if (strptime(last_lu_seen_str, DB_LAST_LU_SEEN_FMT, &tm) == NULL) { + LOGP(DAUC, LOGL_ERROR, "Cannot parse last LU timestamp '%s' of subscriber with IMSI='%s': %s\n", + last_lu_seen_str, subscr->imsi, strerror(errno)); + } else { + subscr->last_lu_seen = mktime(&tm); + if (subscr->last_lu_seen == -1) { + LOGP(DAUC, LOGL_ERROR, "Cannot convert LU timestamp '%s' to time_t: %s\n", + last_lu_seen_str, strerror(errno)); + subscr->last_lu_seen = 0; + } + } + } out: db_remove_reset(stmt); diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index bc6f6a5..edfd89b 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include #include @@ -33,11 +35,24 @@ #define hexdump_buf(buf) osmo_hexdump_nospc((void*)buf, sizeof(buf)) +static char * +get_datestr(time_t *t, char *datebuf) +{ + char *p, *s = ctime_r(t, datebuf); + + /* Strip trailing newline. */ + p = strchr(s, '\n'); + if (p) + *p = '\0'; + return s; +} + static void subscr_dump_full_vty(struct vty *vty, struct hlr_subscriber *subscr) { int rc; struct osmo_sub_auth_data aud2g; struct osmo_sub_auth_data aud3g; + char datebuf[26]; /* for ctime_r(3) */ vty_out(vty, " ID: %"PRIu64"%s", subscr->id, VTY_NEWLINE); @@ -63,6 +78,8 @@ vty_out(vty, " PS disabled%s", VTY_NEWLINE); if (subscr->ms_purged_ps) vty_out(vty, " PS purged%s", VTY_NEWLINE); + if (subscr->last_lu_seen) + vty_out(vty, " last LU seen: %s UTC%s", get_datestr(&subscr->last_lu_seen, datebuf), VTY_NEWLINE); if (!*subscr->imsi) return; -- To view, visit https://gerrit.osmocom.org/12202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a Gerrit-Change-Number: 12202 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 15:07:24 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 7 Dec 2018 15:07:24 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.common.inc: publish: don't depend on check Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12203 Change subject: Makefile.common.inc: publish: don't depend on check ...................................................................... Makefile.common.inc: publish: don't depend on check The 'check' target is only available when including Makefile.asciidoc.inc, which is not always the case. Some projects only build the VTY reference. Do not depend on check, so publishing the VTY reference for these projects is working as expected. Related: OS#3385 Change-Id: I64aae0016095d81ca9e9ebda9a2e3336ac126639 --- M build/Makefile.common.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/03/12203/1 diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc index 0ee648a..aaad088 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -21,7 +21,7 @@ distclean: clean -publish: all check +publish: all mkdir -p out cp *.pdf out rsync -avz -e "$(SSH_COMMAND)" ./out/ docs at rita.osmocom.org:web-files/latest/ -- To view, visit https://gerrit.osmocom.org/12203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I64aae0016095d81ca9e9ebda9a2e3336ac126639 Gerrit-Change-Number: 12203 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Dec 7 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 7 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#331?= In-Reply-To: <763540430.1127.1544109075553.JavaMail.jenkins@jenkins.osmocom.org> References: <763540430.1127.1544109075553.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <552177922.1148.1544195407649.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Dec 7 15:18:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 7 Dec 2018 15:18:14 +0000 Subject: Change in docker-playground[master]: gerrit: fix libopenid path Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12204 Change subject: gerrit: fix libopenid path ...................................................................... gerrit: fix libopenid path Update the path to libopenid.jar, to fix the following error and make the container build again. Step 4/8 : RUN unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/gerrit-openid-libopenid.jar ... ---> Running in 815585d87fdd Archive: /var/gerrit/bin/gerrit.war caution: filename not matched: WEB-INF/lib/gerrit-openid-libopenid.jar Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 --- M gerrit/Dockerfile 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/04/12204/1 diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index e67c760..9edae12 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -4,15 +4,15 @@ RUN yum -y install zip unzip patch RUN \ - unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/gerrit-openid-libopenid.jar && \ - unzip WEB-INF/lib/gerrit-openid-libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html + unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar && \ + unzip WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html COPY add_osmocom.diff /tmp RUN patch -p0 < /tmp/add_osmocom.diff RUN \ - zip -u WEB-INF/lib/gerrit-openid-libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html && \ - zip -u /var/gerrit/bin/gerrit.war WEB-INF/lib/gerrit-openid-libopenid.jar + zip -u WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html && \ + zip -u /var/gerrit/bin/gerrit.war WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar USER gerrit -- To view, visit https://gerrit.osmocom.org/12204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 Gerrit-Change-Number: 12204 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 15:18:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 7 Dec 2018 15:18:14 +0000 Subject: Change in docker-playground[master]: cosmetic: gerrit: use variables for the files to patch Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12205 Change subject: cosmetic: gerrit: use variables for the files to patch ...................................................................... cosmetic: gerrit: use variables for the files to patch Make the code more readable, and make it easier to update the paths if they should change again. Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771 --- M gerrit/Dockerfile 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/05/12205/1 diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index 9edae12..98599f0 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -3,16 +3,21 @@ USER root RUN yum -y install zip unzip patch +# Patch LoginForm.html (unpack and repack from gerrit.war) +ARG gerritwar="/var/gerrit/bin/gerrit.war" +ARG libopenid="WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar" +ARG loginform="com/google/gerrit/httpd/auth/openid/LoginForm.html" + RUN \ - unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar && \ - unzip WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html + unzip "$gerritwar" "$libopenid" && \ + unzip "$libopenid" "$loginform" COPY add_osmocom.diff /tmp RUN patch -p0 < /tmp/add_osmocom.diff RUN \ - zip -u WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html && \ - zip -u /var/gerrit/bin/gerrit.war WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar + zip -u "$libopenid" "$loginform" && \ + zip -u "$gerritwar" "$libopenid" USER gerrit -- To view, visit https://gerrit.osmocom.org/12205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771 Gerrit-Change-Number: 12205 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 15:19:41 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 15:19:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11897 to look at the new patch set (#7). Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... MSC_Test: Test what happens when Paging for SMS is unanswered Trigger sending of an SM, but ignore any paging requests from the MSC, make sure that the MSC is not paging indefinitely Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Related: OS#3704 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 68 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/11897/7 -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 15:41:50 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 7 Dec 2018 15:41:50 +0000 Subject: Change in osmo-hlr[master]: add whitespace around PRId64 constants Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12206 Change subject: add whitespace around PRId64 constants ...................................................................... add whitespace around PRId64 constants Avoid string concatenations without interleaving whitespace. Some compilers don't like "foo""bar", they only like "foo" "bar". Requested by: Pau https://gerrit.osmocom.org/c/osmo-hlr/+/12121/5/src/db_hlr.c#637 Change-Id: Ic7a81114f9afbefcbd62d434720854cfdd4a2dd9 --- M src/ctrl.c M src/db_auc.c M src/db_hlr.c M src/hlr_db_tool.c 4 files changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/06/12206/1 diff --git a/src/ctrl.c b/src/ctrl.c index 8ae9d7c..05a0107 100644 --- a/src/ctrl.c +++ b/src/ctrl.c @@ -132,7 +132,7 @@ struct hlr_subscriber *subscr) { ctrl_cmd_reply_printf(cmd, - "\nid\t%"PRIu64 + "\nid\t%" PRIu64 FMT_S FMT_S FMT_BOOL @@ -189,7 +189,7 @@ ctrl_cmd_reply_printf(cmd, "\naud3g.%s\t%s" "\naud3g.ind_bitlen\t%u" - "\naud3g.sqn\t%"PRIu64 + "\naud3g.sqn\t%" PRIu64 , aud->u.umts.opc_is_op? "op" : "opc", hexdump_buf(aud->u.umts.opc), diff --git a/src/db_auc.c b/src/db_auc.c index 5fb5e3a..e29b44b 100644 --- a/src/db_auc.c +++ b/src/db_auc.c @@ -49,7 +49,7 @@ /* execute the statement */ rc = sqlite3_step(stmt); if (rc != SQLITE_DONE) { - LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%" PRId64 ": SQL error: (%d) %s\n", subscr_id, rc, sqlite3_errmsg(dbc->db)); ret = -EIO; @@ -59,11 +59,11 @@ /* verify execution result */ rc = sqlite3_changes(dbc->db); if (!rc) { - LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%" PRId64 ": no auc_3g entry for such subscriber\n", subscr_id); ret = -ENOENT; } else if (rc != 1) { - LOGP(DAUC, LOGL_ERROR, "Update SQN for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Update SQN for subscriber ID=%" PRId64 ": SQL modified %d rows (expected 1)\n", subscr_id, rc); ret = -EIO; } diff --git a/src/db_hlr.c b/src/db_hlr.c index 342698e..db31009 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -93,7 +93,7 @@ rc = sqlite3_step(stmt); if (rc != SQLITE_DONE) { LOGP(DAUC, LOGL_ERROR, - "Cannot delete subscriber ID=%"PRId64": SQL error: (%d) %s\n", + "Cannot delete subscriber ID=%" PRId64 ": SQL error: (%d) %s\n", subscr_id, rc, sqlite3_errmsg(dbc->db)); db_remove_reset(stmt); return -EIO; @@ -102,11 +102,11 @@ /* verify execution result */ rc = sqlite3_changes(dbc->db); if (!rc) { - LOGP(DAUC, LOGL_ERROR, "Cannot delete: no such subscriber: ID=%"PRId64"\n", + LOGP(DAUC, LOGL_ERROR, "Cannot delete: no such subscriber: ID=%" PRId64 "\n", subscr_id); ret = -ENOENT; } else if (rc != 1) { - LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%" PRId64 ": SQL modified %d rows (expected 1)\n", subscr_id, rc); ret = -EIO; } @@ -316,7 +316,7 @@ * empty, and no entry is not an error then.*/ ret = -ENOENT; else if (rc != 1) { - LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%" PRId64 " from %s: SQL modified %d rows (expected 1)\n", subscr_id, label, rc); ret = -EIO; @@ -504,7 +504,7 @@ rc = db_sel(dbc, stmt, subscr, &err); if (rc) - LOGP(DAUC, LOGL_ERROR, "Cannot read subscriber from db: ID=%"PRId64": %s\n", + LOGP(DAUC, LOGL_ERROR, "Cannot read subscriber from db: ID=%" PRId64 ": %s\n", id, err); return rc; } @@ -592,7 +592,7 @@ /* execute the statement */ rc = sqlite3_step(stmt); if (rc != SQLITE_DONE) { - LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%"PRId64": SQL Error: %s\n", + LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%" PRId64 ": SQL Error: %s\n", is_ps? "SGSN" : "VLR", subscr_id, sqlite3_errmsg(dbc->db)); ret = -EIO; goto out; @@ -601,13 +601,13 @@ /* verify execution result */ rc = sqlite3_changes(dbc->db); if (!rc) { - LOGP(DAUC, LOGL_ERROR, "Cannot update %s number for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Cannot update %s number for subscriber ID=%" PRId64 ": no such subscriber\n", is_ps? "SGSN" : "VLR", subscr_id); ret = -ENOENT; goto out; } else if (rc != 1) { - LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%" PRId64 ": SQL modified %d rows (expected 1)\n", is_ps? "SGSN" : "VLR", subscr_id, rc); ret = -EIO; @@ -635,7 +635,7 @@ rc = sqlite3_step(stmt); if (rc != SQLITE_DONE) { LOGP(DAUC, LOGL_ERROR, - "Cannot update LU timestamp for subscriber ID=%"PRId64": SQL error: (%d) %s\n", + "Cannot update LU timestamp for subscriber ID=%" PRId64 ": SQL error: (%d) %s\n", subscr_id, rc, sqlite3_errmsg(dbc->db)); ret = -EIO; goto out; @@ -644,12 +644,12 @@ /* verify execution result */ rc = sqlite3_changes(dbc->db); if (!rc) { - LOGP(DAUC, LOGL_ERROR, "Cannot update LU timestamp for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Cannot update LU timestamp for subscriber ID=%" PRId64 ": no such subscriber\n", subscr_id); ret = -ENOENT; goto out; } else if (rc != 1) { - LOGP(DAUC, LOGL_ERROR, "Update LU timestamp for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Update LU timestamp for subscriber ID=%" PRId64 ": SQL modified %d rows (expected 1)\n", subscr_id, rc); ret = -EIO; } diff --git a/src/hlr_db_tool.c b/src/hlr_db_tool.c index 1a9c60c..516b91e 100644 --- a/src/hlr_db_tool.c +++ b/src/hlr_db_tool.c @@ -300,7 +300,7 @@ imsi = sqlite3_column_int64(stmt, 0); - snprintf(imsi_str, sizeof(imsi_str), "%"PRId64, imsi); + snprintf(imsi_str, sizeof(imsi_str), "%" PRId64, imsi); rc = db_subscr_create(dbc, imsi_str); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/12206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7a81114f9afbefcbd62d434720854cfdd4a2dd9 Gerrit-Change-Number: 12206 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 15:46:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 7 Dec 2018 15:46:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Dec 2018 15:46:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 15:51:04 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 7 Dec 2018 15:51:04 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: merge copyright.py into app_common.py In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12193 ) Change subject: trx_toolkit: merge copyright.py into app_common.py ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8b70ec2dd08cb2ffed733d2c4e1215b094f8d3d5 Gerrit-Change-Number: 12193 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Dec 2018 15:51:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 15:56:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 7 Dec 2018 15:56:52 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: introduce logging configuration arguments In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12192 ) Change subject: trx_toolkit: introduce logging configuration arguments ...................................................................... Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/12192/2/src/target/trx_toolkit/app_common.py File src/target/trx_toolkit/app_common.py: https://gerrit.osmocom.org/#/c/12192/2/src/target/trx_toolkit/app_common.py at 50 PS2, Line 50: parser.add_argument("--log-lvl", metavar = "LVL", I would suggest to name the option '--log-level'. The abbreviation to 'lvl' doesn't save that much typing. Also, I would fine "LEVEL" easier to read than "LVL". But this is just a matter of taste, and I won't mind if this remains as it is. https://gerrit.osmocom.org/#/c/12192/2/src/target/trx_toolkit/app_common.py at 61 PS2, Line 61: parser.add_argument("--log-file-lvl", metavar = "LVL", Same here: I would suggest --log-file-level -- To view, visit https://gerrit.osmocom.org/12192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3b0440cd73946ad444bd7e48feb7a92d45f6488 Gerrit-Change-Number: 12192 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 07 Dec 2018 15:56:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 16:21:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 7 Dec 2018 16:21:27 +0000 Subject: Change in osmo-msc[master]: ASS-COMPL: do not fire Sec Mode Compl event In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12200 ) Change subject: ASS-COMPL: do not fire Sec Mode Compl event ...................................................................... Patch Set 1: Code-Review+1 The log message could provide a bit more context for those who don't know the context well enough. But if you say this doesn't belong here, I believe you ;) -- To view, visit https://gerrit.osmocom.org/12200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I448fdb783364628005437b3d866d1a076a9767d7 Gerrit-Change-Number: 12200 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 07 Dec 2018 16:21:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 16:36:41 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 16:36:41 +0000 Subject: Change in libosmocore[master]: gsm29118: add generator functions for GSM29118 messages In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12199 to look at the new patch set (#2). Change subject: gsm29118: add generator functions for GSM29118 messages ...................................................................... gsm29118: add generator functions for GSM29118 messages We already have some GSM29118 related definitions and functions in libosmocore. Lets also add some functions to generate GSM29118 messages (similar to those we have for GSM0808). Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Related: OS#3615 --- M include/Makefile.am A include/osmocom/gsm/gsm29118.h M include/osmocom/gsm/protocol/gsm_29_118.h M src/gsm/gsm29118.c M src/gsm/libosmogsm.map 5 files changed, 365 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/99/12199/2 -- To view, visit https://gerrit.osmocom.org/12199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Gerrit-Change-Number: 12199 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 16:38:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 7 Dec 2018 16:38:21 +0000 Subject: Change in osmo-msc[master]: drop gsm48 RR ciph mode compl from permitted initial messages Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12207 Change subject: drop gsm48 RR ciph mode compl from permitted initial messages ...................................................................... drop gsm48 RR ciph mode compl from permitted initial messages It is a message that is initially permitted, but it is in fact not handled in the L3 code but already before, upon receiving BSS_MAP_MSG_CIPHER_MODE_COMPLETE. Change-Id: I0079f07271ca76bd457d0e700f3a736eb9066b47 --- M src/libmsc/gsm_04_08.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/07/12207/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 2962760..95c3183 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1296,7 +1296,8 @@ break; case GSM48_PDISC_RR: switch (msg_type) { - case GSM48_MT_RR_CIPH_M_COMPL: + /* GSM48_MT_RR_CIPH_M_COMPL is actually handled in bssmap_rx_ciph_compl() and gets redirected in the + * BSSAP layer to ran_conn_cipher_mode_compl() (before this here is reached) */ case GSM48_MT_RR_PAG_RESP: return true; default: -- To view, visit https://gerrit.osmocom.org/12207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0079f07271ca76bd457d0e700f3a736eb9066b47 Gerrit-Change-Number: 12207 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 16:53:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 16:53:58 +0000 Subject: Change in libosmocore[master]: gsm0808: add encoder for cause codes and use it In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12044 ) Change subject: gsm0808: add encoder for cause codes and use it ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb Gerrit-Change-Number: 12044 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 16:53:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:06:28 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 17:06:28 +0000 Subject: Change in pysim[master]: utils: add EF [H|O]PLMNwAcT decoding. In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12123 ) Change subject: utils: add EF [H|O]PLMNwAcT decoding. ...................................................................... Patch Set 1: Code-Review-1 > Build Failed > > https://jenkins.osmocom.org/jenkins/job/gerrit-pysim/40/ : FAILURE Looks good so far, but since the tests use also use pysim-read the .ok files on jenkins will need some alignment. Probably it makes sense to think about a command-line option that enables the pretty-printing. This would also keep the output compact like it was before. -- To view, visit https://gerrit.osmocom.org/12123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b8ca6ffd98f665690b84239d9a228e2c72c6ff9 Gerrit-Change-Number: 12123 Gerrit-PatchSet: 1 Gerrit-Owner: lazlo Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 07 Dec 2018 17:06:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:08:30 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 17:08:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: Add SGs testcases In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#15) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: Add SGs testcases ...................................................................... WIP: MSC_Tests: Add SGs testcases This extens MSC_Tests.ttcn with an initial set of SGs interface test cases for RESET, LU, DETACH, PAGING, SMS and CSFB procedures In particular the following testcases are added: - TC_sgsap_reset: isolated reset procedure test - TC_sgsap_lu: isolated location update with TMSI realloc - TC_sgsap_lu_imsi_reject: location update, reject case - TC_sgsap_lu_and_nothing: location update with failed TMSI realloc - TC_sgsap_expl_imsi_det_eps: detach from EPS serveces - TC_sgsap_expl_imsi_det_noneps: detach from non-EPS services - TC_sgsap_paging_rej: isolated paging, reject case - TC_sgsap_paging_subscr_rej: isolated paging, subscr rejects call - TC_sgsap_paging_ue_unr: isolated paging, ue is unreachable - TC_sgsap_paging_and_nothing: page, but don't respond - TC_sgsap_mt_sms: mobile terminated SMS through SGs Interface - TC_sgsap_mo_sms: mobile originated SMS through SGs Interface - TC_sgsap_mt_sms_and_nothing: trigger SMS, but don't respond to paging - TC_sgsap_mt_sms_and_reject: trigger SMS, but reject paging - TC_sgsap_unexp_ud: Send unexpected unitdata (SGs Association: NULL) - TC_sgsap_unsol_ud: Send unsolicited unitdata (subscriber not in VLR) - TC_sgsap_lu_and_mt_call: Initiate MT call via SGs, then do CSFB Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Related: OS#3645 --- M library/SGsAP_Emulation.ttcn M library/SGsAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/gen_links.sh M msc/regen_makefile.sh 6 files changed, 893 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11488/15 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 15 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:09:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 17:09:57 +0000 Subject: Change in osmo-hlr[master]: display last location update timestamp in vty In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12202 ) Change subject: display last location update timestamp in vty ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/12202/1/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12202/1/src/db_hlr.c at 430 PS1, Line 430: struct tm tm; Move it to the start of the function. https://gerrit.osmocom.org/#/c/12202/1/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12202/1/src/hlr_vty_subscr.c at 44 PS1, Line 44: p = strchr(s, '\n'); Reading in the man page that it adds \n at the end -> lol -- To view, visit https://gerrit.osmocom.org/12202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a Gerrit-Change-Number: 12202 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 17:09:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:10:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 17:10:31 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.common.inc: publish: don't depend on check In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12203 ) Change subject: Makefile.common.inc: publish: don't depend on check ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64aae0016095d81ca9e9ebda9a2e3336ac126639 Gerrit-Change-Number: 12203 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 17:10:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:11:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 17:11:35 +0000 Subject: Change in docker-playground[master]: cosmetic: gerrit: use variables for the files to patch In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12205 ) Change subject: cosmetic: gerrit: use variables for the files to patch ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771 Gerrit-Change-Number: 12205 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 17:11:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:12:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 17:12:29 +0000 Subject: Change in docker-playground[master]: gerrit: fix libopenid path In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12204 ) Change subject: gerrit: fix libopenid path ...................................................................... Patch Set 1: How it comes the name is now different? -- To view, visit https://gerrit.osmocom.org/12204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 Gerrit-Change-Number: 12204 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 17:12:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:12:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 17:12:50 +0000 Subject: Change in osmo-hlr[master]: add whitespace around PRId64 constants In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12206 ) Change subject: add whitespace around PRId64 constants ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic7a81114f9afbefcbd62d434720854cfdd4a2dd9 Gerrit-Change-Number: 12206 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 17:12:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:13:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 17:13:17 +0000 Subject: Change in osmo-hlr[master]: add whitespace around PRId64 constants In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12206 ) Change subject: add whitespace around PRId64 constants ...................................................................... add whitespace around PRId64 constants Avoid string concatenations without interleaving whitespace. Some compilers don't like "foo""bar", they only like "foo" "bar". Requested by: Pau https://gerrit.osmocom.org/c/osmo-hlr/+/12121/5/src/db_hlr.c#637 Change-Id: Ic7a81114f9afbefcbd62d434720854cfdd4a2dd9 --- M src/ctrl.c M src/db_auc.c M src/db_hlr.c M src/hlr_db_tool.c 4 files changed, 17 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/ctrl.c b/src/ctrl.c index 8ae9d7c..05a0107 100644 --- a/src/ctrl.c +++ b/src/ctrl.c @@ -132,7 +132,7 @@ struct hlr_subscriber *subscr) { ctrl_cmd_reply_printf(cmd, - "\nid\t%"PRIu64 + "\nid\t%" PRIu64 FMT_S FMT_S FMT_BOOL @@ -189,7 +189,7 @@ ctrl_cmd_reply_printf(cmd, "\naud3g.%s\t%s" "\naud3g.ind_bitlen\t%u" - "\naud3g.sqn\t%"PRIu64 + "\naud3g.sqn\t%" PRIu64 , aud->u.umts.opc_is_op? "op" : "opc", hexdump_buf(aud->u.umts.opc), diff --git a/src/db_auc.c b/src/db_auc.c index 5fb5e3a..e29b44b 100644 --- a/src/db_auc.c +++ b/src/db_auc.c @@ -49,7 +49,7 @@ /* execute the statement */ rc = sqlite3_step(stmt); if (rc != SQLITE_DONE) { - LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%" PRId64 ": SQL error: (%d) %s\n", subscr_id, rc, sqlite3_errmsg(dbc->db)); ret = -EIO; @@ -59,11 +59,11 @@ /* verify execution result */ rc = sqlite3_changes(dbc->db); if (!rc) { - LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Cannot update SQN for subscriber ID=%" PRId64 ": no auc_3g entry for such subscriber\n", subscr_id); ret = -ENOENT; } else if (rc != 1) { - LOGP(DAUC, LOGL_ERROR, "Update SQN for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Update SQN for subscriber ID=%" PRId64 ": SQL modified %d rows (expected 1)\n", subscr_id, rc); ret = -EIO; } diff --git a/src/db_hlr.c b/src/db_hlr.c index 342698e..db31009 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -93,7 +93,7 @@ rc = sqlite3_step(stmt); if (rc != SQLITE_DONE) { LOGP(DAUC, LOGL_ERROR, - "Cannot delete subscriber ID=%"PRId64": SQL error: (%d) %s\n", + "Cannot delete subscriber ID=%" PRId64 ": SQL error: (%d) %s\n", subscr_id, rc, sqlite3_errmsg(dbc->db)); db_remove_reset(stmt); return -EIO; @@ -102,11 +102,11 @@ /* verify execution result */ rc = sqlite3_changes(dbc->db); if (!rc) { - LOGP(DAUC, LOGL_ERROR, "Cannot delete: no such subscriber: ID=%"PRId64"\n", + LOGP(DAUC, LOGL_ERROR, "Cannot delete: no such subscriber: ID=%" PRId64 "\n", subscr_id); ret = -ENOENT; } else if (rc != 1) { - LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%" PRId64 ": SQL modified %d rows (expected 1)\n", subscr_id, rc); ret = -EIO; } @@ -316,7 +316,7 @@ * empty, and no entry is not an error then.*/ ret = -ENOENT; else if (rc != 1) { - LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Delete subscriber ID=%" PRId64 " from %s: SQL modified %d rows (expected 1)\n", subscr_id, label, rc); ret = -EIO; @@ -504,7 +504,7 @@ rc = db_sel(dbc, stmt, subscr, &err); if (rc) - LOGP(DAUC, LOGL_ERROR, "Cannot read subscriber from db: ID=%"PRId64": %s\n", + LOGP(DAUC, LOGL_ERROR, "Cannot read subscriber from db: ID=%" PRId64 ": %s\n", id, err); return rc; } @@ -592,7 +592,7 @@ /* execute the statement */ rc = sqlite3_step(stmt); if (rc != SQLITE_DONE) { - LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%"PRId64": SQL Error: %s\n", + LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%" PRId64 ": SQL Error: %s\n", is_ps? "SGSN" : "VLR", subscr_id, sqlite3_errmsg(dbc->db)); ret = -EIO; goto out; @@ -601,13 +601,13 @@ /* verify execution result */ rc = sqlite3_changes(dbc->db); if (!rc) { - LOGP(DAUC, LOGL_ERROR, "Cannot update %s number for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Cannot update %s number for subscriber ID=%" PRId64 ": no such subscriber\n", is_ps? "SGSN" : "VLR", subscr_id); ret = -ENOENT; goto out; } else if (rc != 1) { - LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Update %s number for subscriber ID=%" PRId64 ": SQL modified %d rows (expected 1)\n", is_ps? "SGSN" : "VLR", subscr_id, rc); ret = -EIO; @@ -635,7 +635,7 @@ rc = sqlite3_step(stmt); if (rc != SQLITE_DONE) { LOGP(DAUC, LOGL_ERROR, - "Cannot update LU timestamp for subscriber ID=%"PRId64": SQL error: (%d) %s\n", + "Cannot update LU timestamp for subscriber ID=%" PRId64 ": SQL error: (%d) %s\n", subscr_id, rc, sqlite3_errmsg(dbc->db)); ret = -EIO; goto out; @@ -644,12 +644,12 @@ /* verify execution result */ rc = sqlite3_changes(dbc->db); if (!rc) { - LOGP(DAUC, LOGL_ERROR, "Cannot update LU timestamp for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Cannot update LU timestamp for subscriber ID=%" PRId64 ": no such subscriber\n", subscr_id); ret = -ENOENT; goto out; } else if (rc != 1) { - LOGP(DAUC, LOGL_ERROR, "Update LU timestamp for subscriber ID=%"PRId64 + LOGP(DAUC, LOGL_ERROR, "Update LU timestamp for subscriber ID=%" PRId64 ": SQL modified %d rows (expected 1)\n", subscr_id, rc); ret = -EIO; } diff --git a/src/hlr_db_tool.c b/src/hlr_db_tool.c index 1a9c60c..516b91e 100644 --- a/src/hlr_db_tool.c +++ b/src/hlr_db_tool.c @@ -300,7 +300,7 @@ imsi = sqlite3_column_int64(stmt, 0); - snprintf(imsi_str, sizeof(imsi_str), "%"PRId64, imsi); + snprintf(imsi_str, sizeof(imsi_str), "%" PRId64, imsi); rc = db_subscr_create(dbc, imsi_str); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/12206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic7a81114f9afbefcbd62d434720854cfdd4a2dd9 Gerrit-Change-Number: 12206 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:15:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 17:15:05 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: merge copyright.py into app_common.py In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12193 ) Change subject: trx_toolkit: merge copyright.py into app_common.py ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8b70ec2dd08cb2ffed733d2c4e1215b094f8d3d5 Gerrit-Change-Number: 12193 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Dec 2018 17:15:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:19:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 17:19:38 +0000 Subject: Change in libosmocore[master]: gsm29118: add generator functions for GSM29118 messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12199 ) Change subject: gsm29118: add generator functions for GSM29118 messages ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/12199/2/src/gsm/gsm29118.c File src/gsm/gsm29118.c: https://gerrit.osmocom.org/#/c/12199/2/src/gsm/gsm29118.c at 207 PS2, Line 207: len = SGS_MME_NAME_LEN; setting a a local value then returning -1? That makes no sense. https://gerrit.osmocom.org/#/c/12199/2/src/gsm/gsm29118.c at 222 PS2, Line 222: msgb_tlv_put(msg, SGSAP_IE_IMSI, len - 2, buf + 2); why not using msgb_put() if we already have the whole TLV in buf? because the TAG is different? https://gerrit.osmocom.org/#/c/12199/2/src/gsm/gsm29118.c at 254 PS2, Line 254: struct msgb *gsm29118_create_dl_ud(const char *imsi, struct msgb *nas_msg) does it make sense to require a msgb here API-wise? probably a pointer + len makes more sense. This way if caller doesn't have a msgb doesn't need to create an extra one. -- To view, visit https://gerrit.osmocom.org/12199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Gerrit-Change-Number: 12199 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 07 Dec 2018 17:19:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:35:27 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 17:35:27 +0000 Subject: Change in libosmocore[master]: gsm29118: add generator functions for GSM29118 messages In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12199 to look at the new patch set (#3). Change subject: gsm29118: add generator functions for GSM29118 messages ...................................................................... gsm29118: add generator functions for GSM29118 messages We already have some GSM29118 related definitions and functions in libosmocore. Lets also add some functions to generate GSM29118 messages (similar to those we have for GSM0808). Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Related: OS#3615 --- M include/Makefile.am A include/osmocom/gsm/gsm29118.h M include/osmocom/gsm/protocol/gsm_29_118.h M src/gsm/gsm29118.c M src/gsm/libosmogsm.map 5 files changed, 363 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/99/12199/3 -- To view, visit https://gerrit.osmocom.org/12199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Gerrit-Change-Number: 12199 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:35:49 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 7 Dec 2018 17:35:49 +0000 Subject: Change in libosmocore[master]: gsm29118: add generator functions for GSM29118 messages In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12199 ) Change subject: gsm29118: add generator functions for GSM29118 messages ...................................................................... Patch Set 3: (9 comments) > Build Started https://jenkins.osmocom.org/jenkins/job/gerrit-libosmocore/1287/ https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c File src/gsm/gsm29118.c: https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 186 PS1, Line 186: /* Allocate an empty message buffer, suitable to hold a complete SGsAP msg. */ > typo: complete? Done https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 191 PS1, Line 191: return msgb_alloc_headroom(1024, 512, "SGsAP"); > So 512 seems far more reasonable, right? Done https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 207 PS1, Line 207: return -1; > Probably makes sense to at least print an error if strlen(name) > 55 in this case. I think we should try to avoid error printing here since we do not have any real reference here. I think its better to have a return code so that the caller can know that an error occurred. https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 219 PS1, Line 219: /* skip first two bytes (tag+length) so we can use msgb_tlv_put */ > why not using msgb_put() if we already have the whole TLV in buf? because the TAG is different? Yes its, different, we need to chop it off and use the SGSAP tag. https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 227 PS1, Line 227: gsm48_generate_lai2(&lai_enc, lai); > sizeof(lai_enc) instead of 5 probably? Done https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 251 PS1, Line 251: * \returns callee-allocated msgb with the encoded message. */ > does it make sense to require a msgb here API-wise? probably a pointer + len makes more sense. [?] In our case it makes sense because in the MSC we already have the data ready as a message buffer. I think this is fine. https://gerrit.osmocom.org/#/c/12199/2/src/gsm/gsm29118.c File src/gsm/gsm29118.c: https://gerrit.osmocom.org/#/c/12199/2/src/gsm/gsm29118.c at 207 PS2, Line 207: return -1; > setting a a local value then returning -1? That makes no sense. Thanks for catching that. I have hopefully fixed it now. https://gerrit.osmocom.org/#/c/12199/2/src/gsm/gsm29118.c at 222 PS2, Line 222: > why not using msgb_put() if we already have the whole TLV in buf? because the TAG is different? Yes, its different. We need to chop it off and use the SGSAP tag. (I responded to this earler, gerrit is swallowing messages again?) https://gerrit.osmocom.org/#/c/12199/2/src/gsm/gsm29118.c at 254 PS2, Line 254: struct msgb *msg = gsm29118_msgb_alloc(); > does it make sense to require a msgb here API-wise? probably a pointer + len makes more sense. [?] In osmo-msc we already have the nas_msg as a message buffer, so it makes sense to use a message buffer here as well. -- To view, visit https://gerrit.osmocom.org/12199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Gerrit-Change-Number: 12199 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 07 Dec 2018 17:35:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:39:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 17:39:55 +0000 Subject: Change in libosmocore[master]: gsm29118: add generator functions for GSM29118 messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12199 ) Change subject: gsm29118: add generator functions for GSM29118 messages ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c File src/gsm/gsm29118.c: https://gerrit.osmocom.org/#/c/12199/1/src/gsm/gsm29118.c at 251 PS1, Line 251: * \param[in] imsi IMSI of the subscriber. > In our case it makes sense because in the MSC we already have the data ready as a message buffer. [?] Sure but in that case it doesn't hurt for us to simply pass: "nas_msg->data, nas_msg->len" instead of nas_msg. But fine anyway. -- To view, visit https://gerrit.osmocom.org/12199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Gerrit-Change-Number: 12199 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 07 Dec 2018 17:39:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 17:40:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 7 Dec 2018 17:40:42 +0000 Subject: Change in libosmocore[master]: gsm29118: add generator functions for GSM29118 messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12199 ) Change subject: gsm29118: add generator functions for GSM29118 messages ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Gerrit-Change-Number: 12199 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 07 Dec 2018 17:40:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 20:39:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 7 Dec 2018 20:39:27 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: introduce logging configuration arguments In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12192 ) Change subject: trx_toolkit: introduce logging configuration arguments ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3b0440cd73946ad444bd7e48feb7a92d45f6488 Gerrit-Change-Number: 12192 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Dec 2018 20:39:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 20:47:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Dec 2018 20:47:37 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: introduce logging configuration arguments In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12192 ) Change subject: trx_toolkit: introduce logging configuration arguments ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3b0440cd73946ad444bd7e48feb7a92d45f6488 Gerrit-Change-Number: 12192 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 07 Dec 2018 20:47:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 20:47:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Dec 2018 20:47:45 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: introduce logging configuration arguments In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12192 ) Change subject: trx_toolkit: introduce logging configuration arguments ...................................................................... trx_toolkit: introduce logging configuration arguments Before this change, it was impossible to configure logging parameters from command line, such as log level and format. This change introduces the following optional arguments: --log-level - logging level for stderr (by default, DEBUG); --log-format - logging message format for stderr; --log-file-name - enable logging to a given file; --log-file-level - logging level for file (by default, DEBUG); --log-file-format - logging message format for file; which are defined in a new class called ApplicationBase, so all existing applications should inherit them now. Change-Id: Ic3b0440cd73946ad444bd7e48feb7a92d45f6488 --- A src/target/trx_toolkit/app_common.py M src/target/trx_toolkit/burst_gen.py M src/target/trx_toolkit/burst_send.py M src/target/trx_toolkit/ctrl_cmd.py M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/trx_sniff.py 6 files changed, 97 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/target/trx_toolkit/app_common.py b/src/target/trx_toolkit/app_common.py new file mode 100644 index 0000000..180e97c --- /dev/null +++ b/src/target/trx_toolkit/app_common.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# TRX Toolkit +# Common helpers for applications +# +# (C) 2018 by Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import logging as log + +class ApplicationBase: + # Osmocom-style logging message format + # Example: [DEBUG] ctrl_if_bts.py:71 Recv POWEROFF cmd + LOG_FMT_DEFAULT = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s" + + def app_init_logging(self, argv): + # Default logging handler (stderr) + sh = log.StreamHandler() + sh.setLevel(log.getLevelName(argv.log_level)) + sh.setFormatter(log.Formatter(argv.log_fmt)) + log.root.addHandler(sh) + + # Optional file handler + if argv.log_file_name is not None: + fh = log.FileHandler(argv.log_file_name) + fh.setLevel(log.getLevelName(argv.log_file_level)) + fh.setFormatter(log.Formatter(argv.log_file_fmt)) + log.root.addHandler(fh) + + # Set DEBUG for the root logger + log.root.setLevel(log.DEBUG) + + def app_reg_logging_options(self, parser): + parser.add_argument("--log-level", metavar = "LVL", + dest = "log_level", type = str, default = "DEBUG", + choices = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], + help = "Set logging level (default %(default)s)") + parser.add_argument("--log-format", metavar = "FMT", + dest = "log_fmt", type = str, default = self.LOG_FMT_DEFAULT, + help = "Set logging message format") + + parser.add_argument("--log-file-name", metavar = "FILE", + dest = "log_file_name", type = str, + help = "Set logging file name") + parser.add_argument("--log-file-level", metavar = "LVL", + dest = "log_file_level", type = str, default = "DEBUG", + choices = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], + help = "Set logging level for file (default %(default)s)") + parser.add_argument("--log-file-format", metavar = "FMT", + dest = "log_file_fmt", type = str, default = self.LOG_FMT_DEFAULT, + help = "Set logging message format for file") diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index 7625a27..1c18b3c 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -31,13 +31,14 @@ import argparse import sys +from app_common import ApplicationBase from rand_burst_gen import RandBurstGen from data_dump import DATADumpFile from data_if import DATAInterface from gsm_shared import * from data_msg import * -class Application: +class Application(ApplicationBase): def __init__(self): print_copyright(CR_HOLDERS) self.argv = self.parse_argv() @@ -46,8 +47,7 @@ signal.signal(signal.SIGINT, self.sig_handler) # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + self.app_init_logging(self.argv) # Open requested capture file if self.argv.output_file is not None: @@ -135,6 +135,9 @@ parser = argparse.ArgumentParser(prog = "burst_gen", description = "Auxiliary tool to generate and send random bursts") + # Register common logging options + self.app_reg_logging_options(parser) + trx_group = parser.add_argument_group("TRX interface") trx_group.add_argument("-r", "--remote-addr", dest = "remote_addr", type = str, default = "127.0.0.1", diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 499e929..16db222 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -30,12 +30,13 @@ import argparse import sys +from app_common import ApplicationBase from data_dump import DATADumpFile from data_if import DATAInterface from gsm_shared import * from data_msg import * -class Application: +class Application(ApplicationBase): def __init__(self): print_copyright(CR_HOLDERS) self.argv = self.parse_argv() @@ -44,8 +45,7 @@ signal.signal(signal.SIGINT, self.sig_handler) # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + self.app_init_logging(self.argv) # Open requested capture file self.ddf = DATADumpFile(self.argv.capture_file) @@ -106,6 +106,9 @@ parser = argparse.ArgumentParser(prog = "burst_send", description = "Auxiliary tool to send (reply) captured bursts") + # Register common logging options + self.app_reg_logging_options(parser) + trx_group = parser.add_argument_group("TRX interface") trx_group.add_argument("-r", "--remote-addr", dest = "remote_addr", type = str, default = "127.0.0.1", diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py index 43b24a3..ffc3e46 100755 --- a/src/target/trx_toolkit/ctrl_cmd.py +++ b/src/target/trx_toolkit/ctrl_cmd.py @@ -32,9 +32,10 @@ import select import sys +from app_common import ApplicationBase from udp_link import UDPLink -class Application: +class Application(ApplicationBase): def __init__(self): print_copyright(CR_HOLDERS) self.argv = self.parse_argv() @@ -43,8 +44,7 @@ signal.signal(signal.SIGINT, self.sig_handler) # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + self.app_init_logging(self.argv) # Init UDP connection self.ctrl_link = UDPLink( @@ -59,6 +59,9 @@ parser = argparse.ArgumentParser(prog = "ctrl_cmd", description = "Auxiliary tool to send control commands") + # Register common logging options + self.app_reg_logging_options(parser) + trx_group = parser.add_argument_group("TRX interface") trx_group.add_argument("-r", "--remote-addr", dest = "remote_addr", type = str, default = "127.0.0.1", diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 1c991ce..a45ce20 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -31,6 +31,7 @@ import select import sys +from app_common import ApplicationBase from ctrl_if_bts import CTRLInterfaceBTS from ctrl_if_bb import CTRLInterfaceBB from burst_fwd import BurstForwarder @@ -39,7 +40,7 @@ from udp_link import UDPLink from clck_gen import CLCKGen -class Application: +class Application(ApplicationBase): def __init__(self): print_copyright(CR_HOLDERS) self.argv = self.parse_argv() @@ -48,8 +49,7 @@ signal.signal(signal.SIGINT, self.sig_handler) # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + self.app_init_logging(self.argv) def run(self): # Init TRX CTRL interface for BTS @@ -131,6 +131,9 @@ parser = argparse.ArgumentParser(prog = "fake_trx", description = "Virtual Um-interface (fake transceiver)") + # Register common logging options + self.app_reg_logging_options(parser) + trx_group = parser.add_argument_group("TRX interface") trx_group.add_argument("-b", "--trx-bind-addr", dest = "trx_bind_addr", type = str, default = "0.0.0.0", diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 9fb567e..7a87351 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -32,10 +32,11 @@ import scapy.all +from app_common import ApplicationBase from data_dump import DATADumpFile from data_msg import * -class Application: +class Application(ApplicationBase): # Counters cnt_burst_dropped_num = 0 cnt_burst_num = 0 @@ -51,8 +52,7 @@ self.argv = self.parse_argv() # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + self.app_init_logging(self.argv) # Open requested capture file if self.argv.output_file is not None: @@ -195,6 +195,9 @@ dest = "verbose", action = "store_true", help = "Print burst bits to stdout") + # Register common logging options + self.app_reg_logging_options(parser) + trx_group = parser.add_argument_group("TRX interface") trx_group.add_argument("-i", "--sniff-interface", dest = "sniff_if", type = str, default = "lo", metavar = "IF", -- To view, visit https://gerrit.osmocom.org/12192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic3b0440cd73946ad444bd7e48feb7a92d45f6488 Gerrit-Change-Number: 12192 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 20:47:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Dec 2018 20:47:46 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: merge copyright.py into app_common.py In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12193 ) Change subject: trx_toolkit: merge copyright.py into app_common.py ...................................................................... trx_toolkit: merge copyright.py into app_common.py Since we have introduced ApplicationBase class, that are used by all existing applications, let's merge the copyright printing helper into it. Change-Id: I8b70ec2dd08cb2ffed733d2c4e1215b094f8d3d5 --- M src/target/trx_toolkit/app_common.py M src/target/trx_toolkit/burst_gen.py M src/target/trx_toolkit/burst_send.py M src/target/trx_toolkit/clck_gen.py D src/target/trx_toolkit/copyright.py M src/target/trx_toolkit/ctrl_cmd.py M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/trx_sniff.py 8 files changed, 25 insertions(+), 32 deletions(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/app_common.py b/src/target/trx_toolkit/app_common.py index 180e97c..9bcd593 100644 --- a/src/target/trx_toolkit/app_common.py +++ b/src/target/trx_toolkit/app_common.py @@ -29,6 +29,17 @@ # Example: [DEBUG] ctrl_if_bts.py:71 Recv POWEROFF cmd LOG_FMT_DEFAULT = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s" + def app_print_copyright(self, holders = []): + # Print copyright holders if any + for date, author in holders: + print("Copyright (C) %s by %s" % (date, author)) + + # Print the license header itself + print("License GPLv2+: GNU GPL version 2 or later " \ + "\n" \ + "This is free software: you are free to change and redistribute it.\n" \ + "There is NO WARRANTY, to the extent permitted by law.\n") + def app_init_logging(self, argv): # Default logging handler (stderr) sh = log.StreamHandler() diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index 1c18b3c..b62f48c 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -23,8 +23,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from copyright import print_copyright -CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] import logging as log import signal @@ -40,7 +39,7 @@ class Application(ApplicationBase): def __init__(self): - print_copyright(CR_HOLDERS) + self.app_print_copyright(APP_CR_HOLDERS) self.argv = self.parse_argv() # Set up signal handlers diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 16db222..3745b39 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -22,8 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from copyright import print_copyright -CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] import logging as log import signal @@ -38,7 +37,7 @@ class Application(ApplicationBase): def __init__(self): - print_copyright(CR_HOLDERS) + self.app_print_copyright(APP_CR_HOLDERS) self.argv = self.parse_argv() # Set up signal handlers diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index 56207f4..40964dd 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -22,14 +22,14 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from copyright import print_copyright -CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] import logging as log import signal import time import sys +from app_common import ApplicationBase from threading import Timer from udp_link import UDPLink from gsm_shared import * @@ -94,10 +94,10 @@ self.timer.start() # Just a wrapper for independent usage -class Application: +class Application(ApplicationBase): def __init__(self): # Print copyright - print_copyright(CR_HOLDERS) + self.app_print_copyright(APP_CR_HOLDERS) # Set up signal handlers signal.signal(signal.SIGINT, self.sig_handler) diff --git a/src/target/trx_toolkit/copyright.py b/src/target/trx_toolkit/copyright.py deleted file mode 100644 index 3d3597f..0000000 --- a/src/target/trx_toolkit/copyright.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env python2 -# -*- coding: utf-8 -*- - -def print_copyright(holders = []): - # Print copyright holders if any - for date, author in holders: - print("Copyright (C) %s by %s" % (date, author)) - - # Print the license header itself - print("License GPLv2+: GNU GPL version 2 or later " \ - "\n" \ - "This is free software: you are free to change and redistribute it.\n" \ - "There is NO WARRANTY, to the extent permitted by law.\n") diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py index ffc3e46..28815c2 100755 --- a/src/target/trx_toolkit/ctrl_cmd.py +++ b/src/target/trx_toolkit/ctrl_cmd.py @@ -23,8 +23,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from copyright import print_copyright -CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] import logging as log import signal @@ -37,7 +36,7 @@ class Application(ApplicationBase): def __init__(self): - print_copyright(CR_HOLDERS) + self.app_print_copyright(APP_CR_HOLDERS) self.argv = self.parse_argv() # Set up signal handlers diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index a45ce20..d73b566 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -22,8 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from copyright import print_copyright -CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy ")] import logging as log import signal @@ -42,7 +41,7 @@ class Application(ApplicationBase): def __init__(self): - print_copyright(CR_HOLDERS) + self.app_print_copyright(APP_CR_HOLDERS) self.argv = self.parse_argv() # Set up signal handlers diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index 7a87351..e169c72 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -22,8 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from copyright import print_copyright -CR_HOLDERS = [("2018", "Vadim Yanitskiy ")] +APP_CR_HOLDERS = [("2018", "Vadim Yanitskiy ")] import logging as log import signal @@ -48,7 +47,7 @@ lo_trigger = False def __init__(self): - print_copyright(CR_HOLDERS) + self.app_print_copyright(APP_CR_HOLDERS) self.argv = self.parse_argv() # Configure logging -- To view, visit https://gerrit.osmocom.org/12193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8b70ec2dd08cb2ffed733d2c4e1215b094f8d3d5 Gerrit-Change-Number: 12193 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 20:49:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Dec 2018 20:49:10 +0000 Subject: Change in libosmocore[master]: gsm29118: add generator functions for GSM29118 messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12199 ) Change subject: gsm29118: add generator functions for GSM29118 messages ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Gerrit-Change-Number: 12199 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 07 Dec 2018 20:49:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 20:49:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Dec 2018 20:49:11 +0000 Subject: Change in libosmocore[master]: gsm29118: add generator functions for GSM29118 messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12199 ) Change subject: gsm29118: add generator functions for GSM29118 messages ...................................................................... gsm29118: add generator functions for GSM29118 messages We already have some GSM29118 related definitions and functions in libosmocore. Lets also add some functions to generate GSM29118 messages (similar to those we have for GSM0808). Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Related: OS#3615 --- M include/Makefile.am A include/osmocom/gsm/gsm29118.h M include/osmocom/gsm/protocol/gsm_29_118.h M src/gsm/gsm29118.c M src/gsm/libosmogsm.map 5 files changed, 363 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/include/Makefile.am b/include/Makefile.am index 59a5fed..366fd70 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -88,6 +88,7 @@ osmocom/gsm/gsm0808.h \ osmocom/gsm/gsm0808_utils.h \ osmocom/gsm/gsm23003.h \ + osmocom/gsm/gsm29118.h \ osmocom/gsm/gsm48.h \ osmocom/gsm/gsm48_ie.h \ osmocom/gsm/gsm_utils.h \ diff --git a/include/osmocom/gsm/gsm29118.h b/include/osmocom/gsm/gsm29118.h new file mode 100644 index 0000000..e81cce4 --- /dev/null +++ b/include/osmocom/gsm/gsm29118.h @@ -0,0 +1,65 @@ +/*! \file gsm23003.h */ + +/* (C) 2018 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Harald Welte, Philipp Maier + * + * 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. + * + */ + +#pragma once + +#include +#include +#include +#include + +/*! 3GPP TS 3GPP TS 29.018 8.14 SGsAP-PAGING-REQUEST. */ +struct gsm29118_paging_req { + char imsi[GSM48_MI_SIZE]; + char vlr_name[SGS_VLR_NAME_MAXLEN + 1]; + uint8_t serv_ind; + + bool lai_present; + struct osmo_location_area_id lai; +}; + +/*! 3GPP TS 3GPP TS 29.018 8.15 SGsAP-RESET-ACK and 8.16 SGsAP-RESET-INDICATION. */ +struct gsm29118_reset_msg { + bool vlr_name_present; + char vlr_name[SGS_VLR_NAME_MAXLEN + 1]; + bool mme_name_present; + char mme_name[SGS_MME_NAME_LEN + 1]; +}; + +struct msgb *gsm29118_msgb_alloc(void); +struct msgb *gsm29118_create_alert_req(const char *imsi); +struct msgb *gsm29118_create_dl_ud(const char *imsi, struct msgb *nas_msg); +struct msgb *gsm29118_create_eps_det_ack(const char *imsi); +struct msgb *gsm29118_create_imsi_det_ack(const char *imsi); +struct msgb *gsm29118_create_lu_ack(const char *imsi, const struct osmo_location_area_id *lai, const uint8_t *new_id, + unsigned int new_id_len); +struct msgb *gsm29118_create_lu_rej(const char *imsi, uint8_t rej_cause, const struct osmo_location_area_id *lai); +struct msgb *gsm29118_create_mm_info_req(const char *imsi, const uint8_t *mm_info, uint8_t mm_info_len); +struct msgb *gsm29118_create_paging_req(struct gsm29118_paging_req *params); +struct msgb *gsm29118_create_reset_ack(struct gsm29118_reset_msg *params); +struct msgb *gsm29118_create_reset_ind(struct gsm29118_reset_msg *params); +struct msgb *gsm29118_create_status(const char *imsi, enum sgsap_sgs_cause cause, const struct msgb *err_msg); +struct msgb *gsm29118_create_release_req(const char *imsi, const uint8_t sgs_cause); +struct msgb *gsm29118_create_service_abort_req(const char *imsi); diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h index 70f1500..cfe772a 100644 --- a/include/osmocom/gsm/protocol/gsm_29_118.h +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -173,4 +173,11 @@ /* TS 29.118 Section 6.3 */ #define SGS_PORT_DEFAULT 29118 +/* TS 29.118 Section 9.4.13 MME Name */ +#define SGS_MME_NAME_LEN 55 + +/* TS 29.118 Section 9.4.22 VLR name + * See also: RFC1123 Section 2.1 Host Names and Numbers */ +#define SGS_VLR_NAME_MAXLEN 255 + const struct tlv_definition sgsap_ie_tlvdef; diff --git a/src/gsm/gsm29118.c b/src/gsm/gsm29118.c index 3898be6..ca210fb 100644 --- a/src/gsm/gsm29118.c +++ b/src/gsm/gsm29118.c @@ -1,7 +1,32 @@ +/* (C) 2018 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Harald Welte, Philipp Maier + * + * 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. + */ + #include #include #include +#include +#include +#include const struct value_string sgsap_msg_type_names[] = { { SGSAP_MSGT_PAGING_REQ, "PAGING-REQUEST" }, @@ -156,3 +181,253 @@ [SGSAP_IE_TMSI_BASED_NRI_CONT] = { TLV_TYPE_TLV }, }, }; + + +/* Allocate an empty message buffer, suitable to hold a complete SGsAP msg. */ +struct msgb *gsm29118_msgb_alloc(void) +{ + /* by far sufficient for the maximum size message of 298 bytes + * (9+7+5+3+10+253+10+1) SGsAP-UP-UD */ + return msgb_alloc_headroom(1024, 512, "SGsAP"); +} + +/* Encode VLR/MME name from string and append to SGsAP msg */ +static int msgb_sgsap_name_put(struct msgb *msg, enum sgsap_iei iei, const char *name) +{ + uint8_t buf[APN_MAXLEN]; + uint8_t len; + /* encoding is like DNS names, which is like APN fields */ + memset(buf, 0, sizeof(buf)); + len = osmo_apn_from_str(buf, sizeof(buf), name); + + /* Note: While the VLR-Name (see 3GPP TS 29.118, chapter 9.4.22) has + * a flexible length, the MME-Name has a fixed size of 55 octets. (see + * 3GPP TS 29.118, chapter 9.4.13). */ + if (iei == SGSAP_IE_MME_NAME && len != SGS_MME_NAME_LEN) + return -1; + msgb_tlv_put(msg, iei, len, buf); + return 0; +} + +/* Encode IMSI from string representation and append to SGSaAP msg */ +static void msgb_sgsap_imsi_put(struct msgb *msg, const char *imsi) +{ + uint8_t buf[16]; + uint8_t len; + /* encoding is just like TS 04.08 */ + len = gsm48_generate_mid_from_imsi(buf, imsi); + /* skip first two bytes (tag+length) so we can use msgb_tlv_put */ + msgb_tlv_put(msg, SGSAP_IE_IMSI, len - 2, buf + 2); +} + +/* Encode LAI from struct representation and append to SGSaAP msg */ +static void msgb_sgsap_lai_put(struct msgb *msg, const struct osmo_location_area_id *lai) +{ + struct gsm48_loc_area_id lai_enc; + gsm48_generate_lai2(&lai_enc, lai); + msgb_tlv_put(msg, SGSAP_IE_LAI, sizeof(lai_enc), (uint8_t *) & lai_enc); +} + +/* Many messages consist only of a message type and an imsi */ +static struct msgb *create_simple_msg(enum sgsap_msg_type msg_type, const char *imsi) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_push_u8(msg, msg_type); + return msg; +} + +/* 8.3 SGsAP-ALERT-REQUEST. + * \param[in] imsi IMSI of the subscriber. + * \returns callee-allocated msgb with the encoded message.*/ +struct msgb *gsm29118_create_alert_req(const char *imsi) +{ + return create_simple_msg(SGSAP_MSGT_ALERT_REQ, imsi); +} + +/* 8.4 SGsAP-DOWNLINK-UNITDATA. + * \param[in] imsi IMSI of the subscriber. + * \param[in] nas_msg user provided message buffer with L3 message. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_dl_ud(const char *imsi, struct msgb *nas_msg) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_tlv_put(msg, SGSAP_IE_NAS_MSG_CONTAINER, nas_msg->len, nas_msg->data); + msgb_push_u8(msg, SGSAP_MSGT_DL_UD); + return msg; +} + +/* 8.5 SGsAP-EPS-DETACH-ACK. + * \param[in] imsi IMSI of the subscriber. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_eps_det_ack(const char *imsi) +{ + return create_simple_msg(SGSAP_MSGT_EPS_DET_ACK, imsi); +} + +/* 8.7 SGsAP-IMSI-DETACH-ACK. + * \param[in] imsi IMSI of the subscriber. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_imsi_det_ack(const char *imsi) +{ + return create_simple_msg(SGSAP_MSGT_IMSI_DET_ACK, imsi); +} + +/*! 8.9 SGsAP-LOCATION-UPDATE-ACCEPT. + * \param[in] imsi IMSI of the subscriber. + * \param[in] lai Location Area Identity (optional, may be NULL). + * \param[in] new_id value part of new Mobile Identity (optional, may be NULL). + * \param[in] new_id_len length of \a new_id in octets. + * \returns callee-allocated msgb with the encoded message */ +struct msgb *gsm29118_create_lu_ack(const char *imsi, const struct osmo_location_area_id *lai, const uint8_t *new_id, + unsigned int new_id_len) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_sgsap_lai_put(msg, lai); + if (new_id && new_id_len) + msgb_tlv_put(msg, SGSAP_IE_MOBILE_ID, new_id_len, new_id); + msgb_push_u8(msg, SGSAP_MSGT_LOC_UPD_ACK); + return msg; +} + +/* 8.10 SGsAP-LOCATION-UPDATE-REJECT. + * \param[in] imsi IMSI of the subscriber. + * \param[in] rej_cause LU cause code, see also 3GPP TS 29.018, subclause 18.4.21. + * \param[in] lai location area identifier. + * \returns callee-allocated msgb with the encoded message */ +struct msgb *gsm29118_create_lu_rej(const char *imsi, uint8_t rej_cause, const struct osmo_location_area_id *lai) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_tlv_put(msg, SGSAP_IE_REJECT_CAUSE, 1, &rej_cause); + if (lai) + msgb_sgsap_lai_put(msg, lai); + msgb_push_u8(msg, SGSAP_MSGT_LOC_UPD_REJ); + return msg; +} + +/* 8.12 SGsAP-MM-INFORMATION-REQUEST. + * \param[in] imsi IMSI of the subscriber. + * \param[in] mm_info MM information, see also 3GPP TS 29.018, subclause 18.4.16. + * \param[in] mm_info_len length of \a mm_info in octets. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_mm_info_req(const char *imsi, const uint8_t *mm_info, uint8_t mm_info_len) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_tlv_put(msg, SGSAP_IE_MM_INFO, mm_info_len, mm_info); + msgb_push_u8(msg, SGSAP_MSGT_MM_INFO_REQ); + return msg; +} + +/* 8.14 SGsAP-PAGING-REQUEST. + * \param[in] params user provided memory with message contents to encode. + * \returns callee-allocated msgb with the encoded message or NULL on error. */ +struct msgb *gsm29118_create_paging_req(struct gsm29118_paging_req *params) +{ + int rc; + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, params->imsi); + rc = msgb_sgsap_name_put(msg, SGSAP_IE_VLR_NAME, params->vlr_name); + if (rc < 0) + goto error; + msgb_tlv_put(msg, SGSAP_IE_SERVICE_INDICATOR, 1, ¶ms->serv_ind); + if (params->lai_present) + msgb_sgsap_lai_put(msg, ¶ms->lai); + msgb_push_u8(msg, SGSAP_MSGT_PAGING_REQ); + return msg; +error: + msgb_free(msg); + return NULL; +} + +/* 8.15 SGsAP-RESET-ACK. + * \param[in] params user provided memory with message contents to encode. + * \returns callee-allocated msgb with the encoded message or NULL on error. */ +struct msgb *gsm29118_create_reset_ack(struct gsm29118_reset_msg *params) +{ + int rc; + struct msgb *msg = gsm29118_msgb_alloc(); + if (params->vlr_name_present && params->mme_name_present == false) + rc = msgb_sgsap_name_put(msg, SGSAP_IE_VLR_NAME, params->vlr_name); + else if (params->mme_name_present && params->vlr_name_present == false) + rc = msgb_sgsap_name_put(msg, SGSAP_IE_MME_NAME, params->mme_name); + else + goto error; + if (rc < 0) + goto error; + msgb_push_u8(msg, SGSAP_MSGT_RESET_ACK); + return msg; +error: + msgb_free(msg); + return NULL; +} + +/* 8.16 SGsAP-RESET-INDICATION. + * \param[in] params user provided memory with message contents to encode. + * \returns callee-allocated msgb with the encoded message or NULL on error. */ +struct msgb *gsm29118_create_reset_ind(struct gsm29118_reset_msg *params) +{ + int rc; + struct msgb *msg = gsm29118_msgb_alloc(); + if (params->vlr_name_present && params->mme_name_present == false) + rc = msgb_sgsap_name_put(msg, SGSAP_IE_VLR_NAME, params->vlr_name); + else if (params->mme_name_present && params->vlr_name_present == false) + rc = msgb_sgsap_name_put(msg, SGSAP_IE_MME_NAME, params->mme_name); + else + goto error; + if (rc < 0) + goto error; + msgb_push_u8(msg, SGSAP_MSGT_RESET_IND); + return msg; +error: + msgb_free(msg); + return NULL; +} + +/* 8.18 SGsAP-STATUS. + * \param[in] imsi IMSI of the subscriber. + * \param[in] cause sgs related cause code. + * \param[in] err_msg user provided message buffer containing the errornous message. + * \returns callee-allocated msgb with the encoded message */ +struct msgb *gsm29118_create_status(const char *imsi, enum sgsap_sgs_cause cause, const struct msgb *err_msg) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + uint8_t c8 = cause; + unsigned int err_msg_len; + msgb_tlv_put(msg, SGSAP_IE_SGS_CAUSE, 1, &c8); + if (imsi) + msgb_sgsap_imsi_put(msg, imsi); + if (err_msg) { + err_msg_len = msgb_l2len(err_msg); + if (err_msg_len > 255) + err_msg_len = 255; + msgb_tlv_put(msg, SGSAP_IE_ERR_MSG, err_msg_len, msgb_l2(err_msg)); + } + msgb_push_u8(msg, SGSAP_MSGT_STATUS); + return msg; +} + +/* 8.23 SGsAP-RELEASE-REQUEST. + * \param[in] imsi IMSI of the subscriber. + * \param[in] cause sgs related cause code. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_release_req(const char *imsi, const uint8_t sgs_cause) +{ + struct msgb *msg = gsm29118_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + if (sgs_cause) + msgb_tlv_put(msg, SGSAP_IE_SGS_CAUSE, 1, &sgs_cause); + msgb_push_u8(msg, SGSAP_MSGT_RELEASE_REQ); + return msg; +} + +/* 8.24 SGsAP-SERVICE-ABORT-REQUEST. + * \param[in] imsi IMSI of the subscriber. + * \returns callee-allocated msgb with the encoded message. */ +struct msgb *gsm29118_create_service_abort_req(const char *imsi) +{ + return create_simple_msg(SGSAP_MSGT_SERVICE_ABORT_REQ, imsi); +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 04a9826..e9a9e4f 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -219,6 +219,21 @@ gsm0808_lcls_control_names; gsm0808_lcls_status_names; +gsm29118_msgb_alloc; +gsm29118_create_alert_req; +gsm29118_create_dl_ud; +gsm29118_create_eps_det_ack; +gsm29118_create_imsi_det_ack; +gsm29118_create_lu_ack; +gsm29118_create_lu_rej; +gsm29118_create_mm_info_req; +gsm29118_create_paging_req; +gsm29118_create_reset_ack; +gsm29118_create_reset_ind; +gsm29118_create_status; +gsm29118_create_release_req; +gsm29118_create_service_abort_req; + gsm0858_rsl_ul_meas_enc; gsm338_get_sms_alphabet; -- To view, visit https://gerrit.osmocom.org/12199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic87f8a771b87b52215d0a7451b67794557b80b8a Gerrit-Change-Number: 12199 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 20:50:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 7 Dec 2018 20:50:54 +0000 Subject: Change in osmo-hlr[master]: display last location update timestamp in vty In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12202 ) Change subject: display last location update timestamp in vty ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12202/1/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12202/1/src/hlr_vty_subscr.c at 39 PS1, Line 39: get_datestr(time_t *t, char *datebuf) 'const time_t *' to clearly indicate it's an input? -- To view, visit https://gerrit.osmocom.org/12202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a Gerrit-Change-Number: 12202 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 07 Dec 2018 20:50:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 23:25:31 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 7 Dec 2018 23:25:31 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: use VTY bind addr from config, deprecate cmd line opt... Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Jenkins Builder, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/12208 to review the following change. Change subject: Revert "mobile: use VTY bind addr from config, deprecate cmd line options" ...................................................................... Revert "mobile: use VTY bind addr from config, deprecate cmd line options" --vty-port=0 is a desirable "feature" and used by the ms_driver of the osmo-gsm-tester. It let's the kernel pick a free port for the application and by printing it on stdout one can still discover it. It allows to start many "mobile" without having to worry about IP address assignment (e.g. 127.0.0.23, 127.0.0.24). I don't think there is a way to configure the port right now. This change should be submitted once vty.c has a option to specify the address and optionally the port. This reverts commit da96b3c0aed7a63772faee91b7056dd0b3d72890. Change-Id: Ie89bc16b667dbe05baa76cfa4f86b4946f8019e8 --- M src/host/layer23/include/osmocom/bb/mobile/app_mobile.h M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/main.c 3 files changed, 20 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/08/12208/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h b/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h index 191f4ba..c2ab3c8 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h +++ b/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h @@ -9,7 +9,7 @@ struct vty; int l23_app_init(int (*mncc_recv)(struct osmocom_ms *ms, int, void *), - const char *config_file); + const char *config_file, const char *vty_ip, uint16_t vty_port); int l23_app_exit(void); int l23_app_work(int *quit); int mobile_delete(struct osmocom_ms *ms, int force); diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index a051fba..464cd55 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -39,8 +39,6 @@ #include #include #include - -#include #include #include @@ -436,7 +434,7 @@ /* global init */ int l23_app_init(int (*mncc_recv)(struct osmocom_ms *ms, int, void *), - const char *config_file) + const char *config_file, const char *vty_ip, uint16_t vty_port) { struct telnet_connection dummy_conn; int rc = 0; @@ -464,11 +462,10 @@ LOGP(DMOB, LOGL_INFO, "Using configuration from '%s'\n", config_file); } vty_reading = 0; - rc = telnet_init_dynif(l23_ctx, NULL, - vty_get_bind_addr(), OSMO_VTY_PORT_BB); + rc = telnet_init_dynif(l23_ctx, NULL, vty_ip, vty_port); if (rc < 0) { LOGP(DMOB, LOGL_FATAL, "Cannot init VTY on %s port %u: %s\n", - vty_get_bind_addr(), OSMO_VTY_PORT_BB, strerror(errno)); + vty_ip, vty_port, strerror(errno)); return rc; } diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 9764b33..e015c30 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -51,6 +51,8 @@ static char *gsmtap_ip = 0; static const char *custom_cfg_file = NULL; struct gsmtap_inst *gsmtap_inst = NULL; +static char *vty_ip = "127.0.0.1"; +unsigned short vty_port = 4247; char *config_dir = NULL; int use_mncc_sock = 0; int daemonize = 0; @@ -85,6 +87,10 @@ printf(" Some help...\n"); printf(" -h --help this text\n"); printf(" -i --gsmtap-ip The destination IP used for GSMTAP.\n"); + printf(" -u --vty-ip The VTY IP to telnet to. " + "(default %s)\n", vty_ip); + printf(" -v --vty-port The VTY port number to telnet to. " + "(default %u)\n", vty_port); printf(" -d --debug Change debug flags. default: %s\n", debug_default); printf(" -D --daemonize Run as daemon\n"); @@ -100,13 +106,12 @@ static struct option long_options[] = { {"help", 0, 0, 'h'}, {"gsmtap-ip", 1, 0, 'i'}, + {"vty-ip", 1, 0, 'u'}, + {"vty-port", 1, 0, 'v'}, {"debug", 1, 0, 'd'}, {"daemonize", 0, 0, 'D'}, {"config-file", 1, 0, 'c'}, {"mncc-sock", 0, 0, 'm'}, - /* DEPRECATED options, to be removed */ - {"vty-ip", 1, 0, 'u'}, - {"vty-port", 1, 0, 'v'}, {0, 0, 0, 0}, }; @@ -124,9 +129,15 @@ case 'i': gsmtap_ip = optarg; break; + case 'u': + vty_ip = optarg; + break; case 'c': custom_cfg_file = optarg; break; + case 'v': + vty_port = atoi(optarg); + break; case 'd': log_parse_category_mask(osmo_stderr_target, optarg); break; @@ -136,13 +147,6 @@ case 'm': use_mncc_sock = 1; break; - /* DEPRECATED options, to be removed */ - case 'u': - case 'v': - fprintf(stderr, "Both 'u' and 'v' options are " - "deprecated! Please use the configuration file " - "in order to set VTY bind address.\n"); - /* fall-thru */ default: /* Unknown parameter passed */ return -EINVAL; @@ -251,9 +255,9 @@ config_dir = dirname(config_dir); if (use_mncc_sock) - rc = l23_app_init(mncc_recv_socket, config_file); + rc = l23_app_init(mncc_recv_socket, config_file, vty_ip, vty_port); else - rc = l23_app_init(NULL, config_file); + rc = l23_app_init(NULL, config_file, vty_ip, vty_port); if (rc) exit(rc); -- To view, visit https://gerrit.osmocom.org/12208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie89bc16b667dbe05baa76cfa4f86b4946f8019e8 Gerrit-Change-Number: 12208 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 7 23:25:32 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 7 Dec 2018 23:25:32 +0000 Subject: Change in osmocom-bb[master]: mobile: use VTY bind addr from config, deprecate cmd line options In-Reply-To: References: Message-ID: Holger Freyther has created a revert of this change. ( https://gerrit.osmocom.org/11852 ) Change subject: mobile: use VTY bind addr from config, deprecate cmd line options ...................................................................... -- To view, visit https://gerrit.osmocom.org/11852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: revert Gerrit-Change-Id: I99e0ec1717edd29b3be231be86616cc7effe5d95 Gerrit-Change-Number: 11852 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 00:06:55 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 8 Dec 2018 00:06:55 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Add a virtual bts and make use of it Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12209 Change subject: ms_driver: Add a virtual bts and make use of it ...................................................................... ms_driver: Add a virtual bts and make use of it It's very close to the osmo-bts-trx but without osmo-trx. Modify the suite to make use of this BTS. Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 --- M example/defaults.conf M example/resources.conf.prod A src/osmo_gsm_tester/bts_osmovirtual.py M src/osmo_gsm_tester/resource.py A src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl M suites/nitb_netreg_mass/suite.conf 6 files changed, 176 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/09/12209/1 diff --git a/example/defaults.conf b/example/defaults.conf index eee17b1..3de5e29 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -84,3 +84,6 @@ type: uhd launch_trx: true clock_reference: internal + +osmo_bts_virtual: + max_trx: 1 diff --git a/example/resources.conf.prod b/example/resources.conf.prod index e786836..c6bc4e9 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -110,6 +110,13 @@ device: '01:01:4d:98:24' port: '3' +- label: OsmoBTS Virtual + type: osmo-bts-virtual + ipa_unit_id: 11 + addr: 10.42.42.123 + band: GSM-1800 + num_trx: 1 + arfcn: - arfcn: 512 band: GSM-1800 diff --git a/src/osmo_gsm_tester/bts_osmovirtual.py b/src/osmo_gsm_tester/bts_osmovirtual.py new file mode 100644 index 0000000..516d992 --- /dev/null +++ b/src/osmo_gsm_tester/bts_osmovirtual.py @@ -0,0 +1,115 @@ +# osmo_gsm_tester: specifics for running an osmo-bts-virtual +# +# Copyright (C) 2016-2017 by sysmocom - s.f.m.c. GmbH +# Copyright (C) 2018 Holger Hans Peter Freyther +# +# Author: Neels Hofmeyr +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import os +import pprint +from . import config, util, template, process, bts_osmo + +class OsmoBtsVirtual(bts_osmo.OsmoBtsMainUnit): +############## +# PROTECTED +############## + + BIN_BTS = 'osmo-bts-virtual' + BIN_PCU = 'osmo-pcu' + + CONF_BTS = 'osmo-bts-virtual.cfg' + + def __init__(self, suite_run, conf): + """Initializes the OsmoBtsVirtual.""" + super().__init__(suite_run, conf, OsmoBtsVirtual.BIN_BTS, 'osmo_bts_virtual') + self.run_dir = None + self.inst = None + self.env = {} + + def launch_process(self, keepalive, binary_name, *args): + """Launches the osmo-bts-virtual process.""" + + binary = os.path.abspath(self.inst.child('bin', binary_name)) + run_dir = self.run_dir.new_dir(binary_name) + if not os.path.isfile(binary): + raise RuntimeError('Binary missing: %r' % binary) + proc = process.Process(binary_name, run_dir, + (binary,) + args, + env=self.env) + self.suite_run.remember_to_stop(proc, keepalive) + proc.launch() + return proc + + def configure(self): + """Builds the configuration for osmo-bts-virtual and writes it to a file.""" + + if self.bsc is None: + raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be configured') + self.config_file = self.run_dir.new_file(OsmoBtsVirtual.CONF_BTS) + self.dbg(config_file=self.config_file) + + values = dict(osmo_bts_virtual=config.get_defaults('osmo_bts_virtual')) + config.overlay(values, self.suite_run.config()) + config.overlay(values, { + 'osmo_bts_virtual': { + 'oml_remote_ip': self.bsc.addr(), + 'pcu_socket_path': self.pcu_socket_path(), + } + }) + config.overlay(values, { 'osmo_bts_virtual': self.conf }) + + self.dbg('OSMO-BTS-VIRTUAL CONFIG:\n' + pprint.pformat(values)) + + with open(self.config_file, 'w') as f: + r = template.render(OsmoBtsVirtual.CONF_BTS, values) + self.dbg(r) + f.write(r) + +######################## +# PUBLIC - INTERNAL API +######################## + def conf_for_bsc(self): + """Returns the configuration for the BSC (including the BSC/NITB IP).""" + values = self.conf_for_bsc_prepare() + self.dbg(conf=values) + return values + +################### +# PUBLIC (test API included) +################### + def start(self, keepalive=False): + """Handles starting/turning-up the osmo-bts-virtual process.""" + if self.bsc is None: + raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started') + self.suite_run.poll() + + self.log('Starting to connect to', self.bsc) + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) + self.configure() + + self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-bts'))) + lib = self.inst.child('lib') + if not os.path.isdir(lib): + raise RuntimeError('No lib/ in %r' % self.inst) + self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } + + self.proc_bts = self.launch_process(keepalive, OsmoBtsVirtual.BIN_BTS, '-r', '1', + '-c', os.path.abspath(self.config_file), + '-i', self.bsc.addr()) + self.suite_run.poll() + +# vim: expandtab tabstop=4 shiftwidth=4 + diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index e71f4cd..4f48dc4 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -29,7 +29,7 @@ from . import schema from . import modem from . import osmo_nitb -from . import bts_sysmo, bts_osmotrx, bts_octphy, bts_nanobts +from . import bts_sysmo, bts_osmotrx, bts_osmovirtual, bts_octphy, bts_nanobts from .util import is_dict, is_list @@ -102,6 +102,7 @@ 'osmo-bts-sysmo': bts_sysmo.SysmoBts, 'osmo-bts-trx': bts_osmotrx.OsmoBtsTrx, 'osmo-bts-octphy': bts_octphy.OsmoBtsOctphy, + 'osmo-bts-virtual': bts_osmovirtual.OsmoBtsVirtual, 'nanobts': bts_nanobts.NanoBts, } diff --git a/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl new file mode 100644 index 0000000..be4f50c --- /dev/null +++ b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl @@ -0,0 +1,48 @@ +! Configuration rendered by osmo-gsm-tester +log stderr + logging color 1 + logging print extended-timestamp 1 + logging print category 1 + logging level abis debug + logging level oml debug + logging level pag debug + logging level rll debug + logging level rr debug + logging level rsl debug + logging level l1c info + logging level l1p error + logging level trx info + ! Level required by ready_for_pcu(): pcu info + logging level pcu info +! +line vty + bind ${osmo_bts_virtual.addr} +ctrl + bind ${osmo_bts_virtual.addr} +! +phy 0 + instance 0 +bts 0 + band ${osmo_bts_virtual.band} + ipa unit-id ${osmo_bts_virtual.ipa_unit_id} 0 + oml remote-ip ${osmo_bts_virtual.oml_remote_ip} + pcu-socket ${osmo_bts_virtual.pcu_socket_path} + gsmtap-sapi bcch + gsmtap-sapi ccch + gsmtap-sapi rach + gsmtap-sapi agch + gsmtap-sapi pch + gsmtap-sapi sdcch + gsmtap-sapi tch/f + gsmtap-sapi tch/h + gsmtap-sapi pacch + gsmtap-sapi pdtch + gsmtap-sapi ptcch + gsmtap-sapi cbch + gsmtap-sapi sacch + trx 0 + power-ramp max-initial 23000 mdBm + power-ramp step-size 2000 mdB + power-ramp step-interval 1 + ms-power-control dsp + phy 0 instance 0 diff --git a/suites/nitb_netreg_mass/suite.conf b/suites/nitb_netreg_mass/suite.conf index bfb23cd..94ec603 100644 --- a/suites/nitb_netreg_mass/suite.conf +++ b/suites/nitb_netreg_mass/suite.conf @@ -2,7 +2,7 @@ ip_address: - times: 1 bts: - - times: 1 + - type: osmo-bts-virtual defaults: timeout: 40s -- To view, visit https://gerrit.osmocom.org/12209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 Gerrit-Change-Number: 12209 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 00:47:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 8 Dec 2018 00:47:11 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: use VTY bind addr from config, deprecate cmd line opt... In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12208 ) Change subject: Revert "mobile: use VTY bind addr from config, deprecate cmd line options" ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12208/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12208/1//COMMIT_MSG at 11 PS1, Line 11: start : many "mobile" Oh, wow, I thought you're running a single process with multiple 'ms' instances configured... BTW: why not? https://gerrit.osmocom.org/#/c/12208/1//COMMIT_MSG at 16 PS1, Line 16: once vty.c has a option to specify the address and : optionally the port. It's already possible to specify the VTY bind address, so maybe we should introduce a new option to change the bind port instead of reverting? I am a bit afraid that this (to be reverted) change would be forgotten. -- To view, visit https://gerrit.osmocom.org/12208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie89bc16b667dbe05baa76cfa4f86b4946f8019e8 Gerrit-Change-Number: 12208 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 08 Dec 2018 00:47:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 07:58:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 07:58:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix TC_paging_resp_unsol In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12196 ) Change subject: bsc: Fix TC_paging_resp_unsol ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I933cba41912640eb7e15be4a27bda5b4dd489962 Gerrit-Change-Number: 12196 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 08 Dec 2018 07:58:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 07:58:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 07:58:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Fix TC_paging_resp_unsol In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12196 ) Change subject: bsc: Fix TC_paging_resp_unsol ...................................................................... bsc: Fix TC_paging_resp_unsol TC_paging_resp_unsol spent some time in gerrit before being merged. As a result, other commits were merged in between the test was submitted (tested) and merged. As a result, commit a5302c8151d1da2e43ed52efc0544d70bffab911 was merged while this test was still in gerrit and thus was not updated accordingly. Similar stuff happened with the osmo-bsc commit fixing the scenario this test was showcasing: The osmo-bsc patch (77cd1129931928d2a6e7667d0374feeeed71b0ce) had merge conflict with other osmo-bsc commits merged in-between, and was merged even later than the commit introducing this TTCN3 test, so failures were expected for this test for a while. Change-Id: I933cba41912640eb7e15be4a27bda5b4dd489962 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 962d6c6..81cf23e 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1519,7 +1519,7 @@ f_ipa_tx(0, ts_RSL_EST_IND(dt.rsl_chan_nr, valueof(ts_RslLinkID_DCCH(0)), enc_PDU_ML3_MS_NW(l3))); /* expect BSC to disable the channel */ - f_expect_chan_rel(0, dt.rsl_chan_nr); + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/12196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I933cba41912640eb7e15be4a27bda5b4dd489962 Gerrit-Change-Number: 12196 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Dec 8 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 8 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#332?= In-Reply-To: <552177922.1148.1544195407649.JavaMail.jenkins@jenkins.osmocom.org> References: <552177922.1148.1544195407649.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1758204215.1164.1544281807710.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.76 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o rm -f y.tab.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:27:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:27:22 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: use VTY bind addr from config, deprecate cmd line opt... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12208 ) Change subject: Revert "mobile: use VTY bind addr from config, deprecate cmd line options" ...................................................................... Patch Set 1: (1 comment) I would prefer something else than a complete revert. I understand both vty config as well as ability to bind to random ports are desirable features... https://gerrit.osmocom.org/#/c/12208/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12208/1//COMMIT_MSG at 11 PS1, Line 11: start : many "mobile" > Oh, wow, I thought you're running a single process with [?] Its both: multiple ms per mobile, and many mobile processes. I doubt you could ever scale sufficiently in a single, single-threaded process -- To view, visit https://gerrit.osmocom.org/12208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie89bc16b667dbe05baa76cfa4f86b4946f8019e8 Gerrit-Change-Number: 12208 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sat, 08 Dec 2018 19:27:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:29:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:29:32 +0000 Subject: Change in libosmocore[master]: gsm0808: add encoder for cause codes and use it In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12044 ) Change subject: gsm0808: add encoder for cause codes and use it ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb Gerrit-Change-Number: 12044 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 08 Dec 2018 19:29:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:29:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:29:34 +0000 Subject: Change in libosmocore[master]: gsm0808: add encoder for cause codes and use it In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12044 ) Change subject: gsm0808: add encoder for cause codes and use it ...................................................................... gsm0808: add encoder for cause codes and use it At the moment the all gsm0808 cause codes are encoded directly using the tlv API directly to put a one byte TLV field. This works ok for most situations where the cause code consists of a single byte. However, gsm0808 specifies a two byte cause code model where cause codes may be extended up to two bytes. Instead of implementing the encoding over and over and again, let's rather have an encoder function we can call. - Add an encoder function that can generate single byte and extended cause codeds and makes the length decision automatically. - Use only this function to append cause codes Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 6 files changed, 75 insertions(+), 19 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 097bd76..90ff677 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -77,6 +77,7 @@ int gsm0808_cell_id_u_name(char *buf, size_t buflen, enum CELL_IDENT id_discr, const union gsm0808_cell_id_u *u); +uint8_t gsm0808_enc_cause(struct msgb *msg, uint16_t cause); uint8_t gsm0808_enc_aoip_trasp_addr(struct msgb *msg, const struct sockaddr_storage *ss); int gsm0808_dec_aoip_trasp_addr(struct sockaddr_storage *ss, diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index c0d5f39..e951ab1 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -141,7 +141,7 @@ return NULL; msgb_v_put(msg, BSS_MAP_MSG_RESET); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause); + gsm0808_enc_cause(msg, cause); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); return msg; @@ -190,7 +190,7 @@ msg->l3h = msgb_tv_put(msg, BSSAP_MSG_BSS_MANAGEMENT, 4); msgb_v_put(msg, BSS_MAP_MSG_CLEAR_CMD); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause); + gsm0808_enc_cause(msg, cause); return msg; } @@ -273,7 +273,7 @@ msgb_v_put(msg, BSS_MAP_MSG_CIPHER_MODE_REJECT); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, (const uint8_t *)&cause); + gsm0808_enc_cause(msg, cause); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); @@ -286,18 +286,22 @@ * \returns callee-allocated msgb with BSSMAP Cipher Mode Reject message */ struct msgb *gsm0808_create_cipher_reject_ext(enum gsm0808_cause_class class, uint8_t ext) { - uint8_t c[2]; + uint16_t cause; struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "bssmap: cipher mode reject"); if (!msg) return NULL; - c[0] = 0x80 | (class << 4); /* set the high bit to indicate extended cause */ - c[1] = ext; + /* Set cause code class in the upper byte */ + cause = 0x80 | (class << 4); + cause = cause << 8; + + /* Set cause code extension in the lower byte */ + cause |= ext; msgb_v_put(msg, BSS_MAP_MSG_CIPHER_MODE_REJECT); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 2, c); + gsm0808_enc_cause(msg, cause); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); @@ -572,7 +576,7 @@ return NULL; msgb_v_put(msg, BSS_MAP_MSG_ASSIGMENT_FAILURE); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause); + gsm0808_enc_cause(msg, cause); /* RR cause 3.2.2.22 */ if (rr_cause) @@ -614,7 +618,7 @@ return NULL; msgb_v_put(msg, BSS_MAP_MSG_CLEAR_RQST); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause); + gsm0808_enc_cause(msg, cause); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); return msg; @@ -751,7 +755,7 @@ msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_REQUIRED); /* Cause, 3.2.2.5 */ - msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80? 2 : 1, (const uint8_t*)¶ms->cause); + gsm0808_enc_cause(msg, params->cause); /* Cell Identifier List, 3.2.2.27 */ gsm0808_enc_cell_id_list2(msg, ¶ms->cil); @@ -876,7 +880,7 @@ msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_FAILURE); /* Cause, 3.2.2.5 */ - msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80? 2 : 1, (const uint8_t*)¶ms->cause); + gsm0808_enc_cause(msg, params->cause); /* RR Cause, 3.2.2.22 */ if (params->rr_cause_present) @@ -907,7 +911,7 @@ msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_PERFORMED); /* Cause, 3.2.2.5 */ - msgb_tlv_put(msg, GSM0808_IE_CAUSE, gsm0808_cause_ext(params->cause) ? 2 : 1, (const uint8_t *)¶ms->cause); + gsm0808_enc_cause(msg, params->cause); /* Cell Identifier, 3.2.2.17 */ gsm0808_enc_cell_id(msg, ¶ms->cell_id); diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index c58d828..38a8664 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -48,6 +48,32 @@ * \file gsm0808_utils.c */ +/*! Encode TS 08.08 AoIP Cause IE + * \param[out] msg Message Buffer to which to append IE + * \param[in] cause Cause code to be used in IE + * \returns number of bytes added to \a msg */ +uint8_t gsm0808_enc_cause(struct msgb *msg, uint16_t cause) +{ + /* See also 3GPP TS 48.008 3.2.2.5 Cause */ + uint8_t *old_tail; + bool extended; + + old_tail = msg->tail; + + extended = gsm0808_cause_ext(cause >> 8); + + msgb_put_u8(msg, GSM0808_IE_CAUSE); + if (extended) { + msgb_put_u8(msg, 2); + msgb_put_u16(msg, cause); + } else { + msgb_put_u8(msg, 1); + msgb_put_u8(msg, (uint8_t) (cause & 0xFF)); + } + + return (uint8_t) (msg->tail - old_tail); +} + /*! Encode TS 08.08 AoIP transport address IE * \param[out] msg Message Buffer to which to append IE * \param[in] ss Socket Address to be used in IE diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index e9a9e4f..dc4e0a6 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -183,6 +183,7 @@ gsm0808_create_handover_failure; gsm0808_create_handover_performed; gsm0808_prepend_dtap_header; +gsm0808_enc_cause; gsm0808_enc_aoip_trasp_addr; gsm0808_dec_aoip_trasp_addr; gsm0808_enc_speech_codec; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 197ec06..63b8720 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -30,6 +30,13 @@ #include #include +#define EXPECT_ENCODED(hexstr) do { \ + const char *enc_str = msgb_hexdump(msg); \ + printf("%s: encoded: %s(rc = %u)\n", __func__, enc_str, rc_enc); \ + OSMO_ASSERT(strcmp(enc_str, hexstr " ") == 0); \ + OSMO_ASSERT(rc_enc == msg->len); \ + } while(0) + #define VERIFY(msg, data, len) \ if (msgb_l3len(msg) != len) { \ printf("%s:%d Length don't match: %d vs. %d. %s\n", \ @@ -65,6 +72,27 @@ scl->len = 3; } +void test_gsm0808_enc_cause(void) +{ + /* NOTE: This must be tested early because many of the following tests + * rely on the generation of a proper cause code. */ + + uint8_t rc_enc; + struct msgb *msg; + + /* Test with a single byte cause code */ + msg = msgb_alloc(1024, "output buffer"); + rc_enc = gsm0808_enc_cause(msg, 0x41); + EXPECT_ENCODED("04 01 41"); + msgb_free(msg); + + /* Test with an extended (two byte) cause code */ + msg = msgb_alloc(1024, "output buffer"); + rc_enc = gsm0808_enc_cause(msg, 0x8041); + EXPECT_ENCODED("04 02 80 41"); + msgb_free(msg); +} + static void test_create_layer3(void) { static const uint8_t res[] = { @@ -824,13 +852,6 @@ msgb_free(msg); } -#define EXPECT_ENCODED(hexstr) do { \ - const char *enc_str = msgb_hexdump(msg); \ - printf("%s: encoded: %s(rc = %u)\n", __func__, enc_str, rc_enc); \ - OSMO_ASSERT(strcmp(enc_str, hexstr " ") == 0); \ - OSMO_ASSERT(rc_enc == msg->len); \ - } while(0) - static void test_gsm0808_enc_dec_cell_id_list_lac() { struct gsm0808_cell_id_list2 enc_cil; @@ -1770,6 +1791,7 @@ int main(int argc, char **argv) { printf("Testing generation of GSM0808 messages\n"); + test_gsm0808_enc_cause(); test_create_layer3(); test_create_layer3_aoip(); test_create_reset(); diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index a48cf1d..e5833d0 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -1,4 +1,6 @@ Testing generation of GSM0808 messages +test_gsm0808_enc_cause: encoded: 04 01 41 (rc = 3) +test_gsm0808_enc_cause: encoded: 04 02 80 41 (rc = 4) Testing creating Layer3 Testing creating Layer3 (AoIP) Testing creating Reset -- To view, visit https://gerrit.osmocom.org/12044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb Gerrit-Change-Number: 12044 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:32:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:32:55 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11734 ) Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 08 Dec 2018 19:32:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:33:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:33:00 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11734 ) Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... handover_fsm: send HANDOVER PERFORMED msg on internal ho When an internal handover is done the specification demands to inform the MSC about the event. - Add sending of BSSMAP HANDOVER PERFORMED msg. Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Depends: libosmocore I825106858bd89afc9837811b8fed2e8accc82441 Related: OS#3645 --- M src/osmo-bsc/handover_fsm.c M tests/handover/handover_test.c 2 files changed, 69 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index f2836cf..aae50b9 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -670,6 +670,70 @@ } } +static void send_handover_performed(struct gsm_subscriber_connection *conn) +{ + struct gsm_lchan *lchan = conn->lchan; + struct handover *ho = &conn->ho; + struct osmo_cell_global_id *cell; + struct gsm0808_handover_performed ho_perf_params = {}; + struct msgb *msg; + struct gsm0808_speech_codec sc; + int rc; + + /* Cause 3.2.2.5 */ + ho_perf_params.cause = GSM0808_CAUSE_HANDOVER_SUCCESSFUL; + + /* Cell Identifier 3.2.2.17 */ + cell = cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)); + if (!cell) { + LOG_HO(conn, LOGL_ERROR, "Failed to generate Cell Identifier IE, can't send HANDOVER PERFORMED!\n"); + return; + } + ho_perf_params.cell_id = (struct gsm0808_cell_id){ + .id_discr = CELL_IDENT_WHOLE_GLOBAL, + .id.global = *cell + }; + + /* Chosen Channel 3.2.2.33 */ + ho_perf_params.chosen_channel = gsm0808_chosen_channel(lchan->type, lchan->tch_mode); + if (!ho_perf_params.chosen_channel) { + LOG_HO(conn, LOGL_ERROR, "Failed to generate Chosen Channel IE, can't send HANDOVER PERFORMED!\n"); + return; + } + ho_perf_params.chosen_channel_present = true; + + /* Chosen Encryption Algorithm 3.2.2.44 */ + ho_perf_params.chosen_encr_alg = lchan->encr.alg_id; + ho_perf_params.chosen_encr_alg_present = true; + + if (ho->new_lchan->activate.requires_voice_stream) { + /* Speech Version (chosen) 3.2.2.51 */ + ho_perf_params.speech_version_chosen = gsm0808_permitted_speech(lchan->type, lchan->tch_mode); + ho_perf_params.speech_version_chosen_present = true; + + /* Speech Codec (chosen) 3.2.2.104 */ + if (gscon_is_aoip(conn)) { + /* Extrapolate speech codec from speech mode */ + gsm0808_speech_codec_from_chan_type(&sc, ho_perf_params.speech_version_chosen); + sc.cfg = conn->assignment.req.s15_s0; + memcpy(&ho_perf_params.speech_codec_chosen, &sc, sizeof(sc)); + ho_perf_params.speech_codec_chosen_present = true; + } + } + + msg = gsm0808_create_handover_performed(&ho_perf_params); + if (!msg) { + LOG_HO(conn, LOGL_ERROR, "Failed to generate message, can't send HANDOVER PERFORMED!\n"); + return; + } + + rc = gscon_sigtran_send(conn, msg); + if (rc < 0) { + LOG_HO(conn, LOGL_ERROR, "message sending failed, can't send HANDOVER PERFORMED!\n"); + return; + } +} + /* Notify the handover decision algorithm of failure and clear out any handover state. */ void handover_end(struct gsm_subscriber_connection *conn, enum handover_result result) { @@ -738,6 +802,10 @@ if (result == HO_RESULT_OK) conn->ho.created_ci_for_msc = NULL; + /* If the performed handover was an INTRA BSC HANDOVER, inform the MSC that a handover has happend */ + if (result == HO_RESULT_OK && ((ho->scope & HO_INTRA_CELL) || (ho->scope & HO_INTRA_BSC))) + send_handover_performed(conn); + hdc = handover_decision_callbacks_get(ho->from_hodec_id); if (hdc && hdc->on_handover_end) hdc->on_handover_end(conn, result); diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index f728c5b..6217ca3 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -219,6 +219,7 @@ void create_conn(struct gsm_lchan *lchan) { static struct bsc_msc_data fake_msc_data = {}; + fake_msc_data.network = bsc_gsmnet; static unsigned int next_imsi = 0; char imsi[sizeof(lchan->conn->bsub->imsi)]; struct gsm_network *net = lchan->ts->trx->bts->network; -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:33:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:33:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: expect a HANDOVER PERFORMED message on internal handover In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11733 ) Change subject: BSC_Tests: expect a HANDOVER PERFORMED message on internal handover ...................................................................... BSC_Tests: expect a HANDOVER PERFORMED message on internal handover When an internal handover is performed, the BSC is expected to inform the MSC about the event by sending a BSSMAP HANDOVER PERFORMED message. This feature was missing in the BSC and has now been added. The tests need to be upgraded in order to handle the additional message. - Upgrade f_tc_ho_int so that it expects a HANDOVER PERFORMED message Change-Id: I10f4e578c96a90317939ba49b61b14a3c7e488a7 Depends: osmo-bsc If26e5807280e0f75a423b3b04f8e3c698c82a351 Related: OS#3645 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 81cf23e..aaa4580 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2256,6 +2256,10 @@ [] as_handover(hs); } + /* Since this is an internal handover we expect the BSC to inform the + * MSC about the event */ + BSSAP.receive(tr_BSSMAP_HandoverPerformed); + /* Check the amount of MGCP transactions is still consistant with the * test expectation */ f_check_mgcp_expectations() -- To view, visit https://gerrit.osmocom.org/11733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I10f4e578c96a90317939ba49b61b14a3c7e488a7 Gerrit-Change-Number: 11733 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:34:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:34:38 +0000 Subject: Change in osmo-trx[master]: Add TRXCTRL log category In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12120 ) Change subject: Add TRXCTRL log category ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 Gerrit-Change-Number: 12120 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Sat, 08 Dec 2018 19:34:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:35:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:35:01 +0000 Subject: Change in osmo-trx[master]: transceiver: Log TRXCTRL iface responses towards osmo-bts-trx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12122 ) Change subject: transceiver: Log TRXCTRL iface responses towards osmo-bts-trx ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8128c42e63ab1fcd2a58812f3b7cf94435b5bbd8 Gerrit-Change-Number: 12122 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 08 Dec 2018 19:35:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:36:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:36:04 +0000 Subject: Change in osmo-trx[master]: lms: Move {under, over}run checks into separate method In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12125 ) Change subject: lms: Move {under,over}run checks into separate method ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7f450aa79f6285d14826c40ecfdd9490d00509ef Gerrit-Change-Number: 12125 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 08 Dec 2018 19:36:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:36:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:36:30 +0000 Subject: Change in osmo-trx[master]: lms: Do {under, over}run checks even if LMS_RecvStream fails In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12195 ) Change subject: lms: Do {under,over}run checks even if LMS_RecvStream fails ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e2b8be06d2993db1bab233948a8ee774b8ac4ee Gerrit-Change-Number: 12195 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 08 Dec 2018 19:36:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:36:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:36:34 +0000 Subject: Change in osmo-trx[master]: Add TRXCTRL log category In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12120 ) Change subject: Add TRXCTRL log category ...................................................................... Add TRXCTRL log category This log category is applied to messages related to TRX CTRL socket interface, and it's printed in yellow, same color used in osmo-bts-trx for TRX category (so same messages are printed with same color in both sides). Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 --- M CommonLibs/debug.c M CommonLibs/debug.h M Transceiver52M/Transceiver.cpp 3 files changed, 14 insertions(+), 7 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index c6de21a..294924d 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -10,6 +10,12 @@ .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DTRXCTRL] = { + .name = "DTRXCTRL", + .description = "TRX CTRL interface", + .color = "\033[1;33m", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, [DDEV] = { .name = "DDEV", .description = "Device/Driver specific code", diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index f8f6239..a5b9271 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -5,6 +5,7 @@ /* Debug Areas of the code */ enum { DMAIN, + DTRXCTRL, DDEV, DLMS, }; diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 8702fb6..8b950f7 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -715,13 +715,13 @@ /* Verify a command signature */ if (strncmp(buffer, "CMD ", 4)) { - LOG(WARNING) << "bogus message on control interface"; + LOGC(DTRXCTRL, WARNING) << "bogus message on control interface"; return; } /* Set command pointer */ command = buffer + 4; - LOG(INFO) << "chan " << chan << ": command is " << command; + LOGC(DTRXCTRL, INFO) << "chan " << chan << ": command is " << command; if (match_cmd(command, "POWEROFF", NULL)) { stop(); @@ -800,7 +800,7 @@ sscanf(params, "%d", &freqKhz); mRxFreq = freqKhz * 1e3; if (!mRadioInterface->tuneRx(mRxFreq, chan)) { - LOG(ALERT) << "RX failed to tune"; + LOGC(DTRXCTRL, ALERT) << "RX failed to tune"; sprintf(response,"RSP RXTUNE 1 %d",freqKhz); } else @@ -811,7 +811,7 @@ sscanf(params, "%d", &freqKhz); mTxFreq = freqKhz * 1e3; if (!mRadioInterface->tuneTx(mTxFreq, chan)) { - LOG(ALERT) << "TX failed to tune"; + LOGC(DTRXCTRL, ALERT) << "TX failed to tune"; sprintf(response,"RSP TXTUNE 1 %d",freqKhz); } else @@ -823,7 +823,7 @@ if (TSC > 7) { sprintf(response, "RSP SETTSC 1 %d", TSC); } else { - LOG(NOTICE) << "Changing TSC from " << mTSC << " to " << TSC; + LOGC(DTRXCTRL, NOTICE) << "Changing TSC from " << mTSC << " to " << TSC; mTSC = TSC; sprintf(response,"RSP SETTSC 0 %d", TSC); } @@ -833,7 +833,7 @@ int timeslot; sscanf(params, "%d %d", ×lot, &corrCode); if ((timeslot < 0) || (timeslot > 7)) { - LOG(WARNING) << "bogus message on control interface"; + LOGC(DTRXCTRL, WARNING) << "bogus message on control interface"; sprintf(response,"RSP SETSLOT 1 %d %d",timeslot,corrCode); return; } @@ -848,7 +848,7 @@ mWriteBurstToDiskMask = mask; sprintf(response,"RSP _SETBURSTTODISKMASK 0 %d",mask); } else { - LOG(WARNING) << "bogus command " << command << " on control interface."; + LOGC(DTRXCTRL, WARNING) << "bogus command " << command << " on control interface."; sprintf(response,"RSP ERR 1"); } -- To view, visit https://gerrit.osmocom.org/12120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I98ec5e416272783ad3fbadf70478a4e48ae64983 Gerrit-Change-Number: 12120 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:36:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:36:34 +0000 Subject: Change in osmo-trx[master]: transceiver: Log TRXCTRL iface responses towards osmo-bts-trx In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12122 ) Change subject: transceiver: Log TRXCTRL iface responses towards osmo-bts-trx ...................................................................... transceiver: Log TRXCTRL iface responses towards osmo-bts-trx Change-Id: I8128c42e63ab1fcd2a58812f3b7cf94435b5bbd8 --- M Transceiver52M/Transceiver.cpp 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 8b950f7..442853f 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -721,7 +721,7 @@ /* Set command pointer */ command = buffer + 4; - LOGC(DTRXCTRL, INFO) << "chan " << chan << ": command is " << command; + LOGC(DTRXCTRL, INFO) << "chan " << chan << ": command is '" << command << "'"; if (match_cmd(command, "POWEROFF", NULL)) { stop(); @@ -852,6 +852,7 @@ sprintf(response,"RSP ERR 1"); } + LOGC(DTRXCTRL, INFO) << "chan " << chan << ": response is '" << response << "'"; mCtrlSockets[chan]->write(response, strlen(response) + 1); } -- To view, visit https://gerrit.osmocom.org/12122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8128c42e63ab1fcd2a58812f3b7cf94435b5bbd8 Gerrit-Change-Number: 12122 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:36:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:36:34 +0000 Subject: Change in osmo-trx[master]: lms: Move {under, over}run checks into separate method In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12125 ) Change subject: lms: Move {under,over}run checks into separate method ...................................................................... lms: Move {under,over}run checks into separate method Change-Id: I7f450aa79f6285d14826c40ecfdd9490d00509ef --- M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h 2 files changed, 16 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 9804bbd..fa9e395 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -499,13 +499,26 @@ return GSM::Time(6,7); } +void LMSDevice::update_stream_stats(size_t chan, bool * underrun, bool * overrun) +{ + lms_stream_status_t status; + if (LMS_GetStreamStatus(&m_lms_stream_rx[chan], &status) == 0) { + if (status.underrun > m_last_rx_underruns[chan]) + *underrun = true; + m_last_rx_underruns[chan] = status.underrun; + + if (status.overrun > m_last_rx_overruns[chan]) + *overrun = true; + m_last_rx_overruns[chan] = status.overrun; + } +} + // NOTE: Assumes sequential reads int LMSDevice::readSamples(std::vector < short *>&bufs, int len, bool * overrun, TIMESTAMP timestamp, bool * underrun, unsigned *RSSI) { int rc = 0; unsigned int i; - lms_stream_status_t status; lms_stream_meta_t rx_metadata = {}; rx_metadata.flushPartialPacket = false; rx_metadata.waitForTimestamp = false; @@ -528,16 +541,7 @@ } if (timestamp != (TIMESTAMP)rx_metadata.timestamp) LOGC(DDEV, ALERT) << "chan "<< i << " recv buffer of len " << rc << " expect " << std::hex << timestamp << " got " << std::hex << (TIMESTAMP)rx_metadata.timestamp << " (" << std::hex << rx_metadata.timestamp <<") diff=" << rx_metadata.timestamp - timestamp; - - if (LMS_GetStreamStatus(&m_lms_stream_rx[i], &status) == 0) { - if (status.underrun > m_last_rx_underruns[i]) - *underrun = true; - m_last_rx_underruns[i] = status.underrun; - - if (status.overrun > m_last_rx_overruns[i]) - *overrun = true; - m_last_rx_overruns[i] = status.overrun; - } + update_stream_stats(i, underrun, overrun); thread_enable_cancel(true); } diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index d1a8813..fde2408 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -67,6 +67,7 @@ int get_ant_idx(const std::string & name, bool dir_tx, size_t chan); bool flush_recv(size_t num_pkts); + void update_stream_stats(size_t chan, bool * underrun, bool * overrun); public: -- To view, visit https://gerrit.osmocom.org/12125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7f450aa79f6285d14826c40ecfdd9490d00509ef Gerrit-Change-Number: 12125 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:36:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:36:35 +0000 Subject: Change in osmo-trx[master]: lms: Do {under, over}run checks even if LMS_RecvStream fails In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12195 ) Change subject: lms: Do {under,over}run checks even if LMS_RecvStream fails ...................................................................... lms: Do {under,over}run checks even if LMS_RecvStream fails Under failure, it could still be that stream status is updated, so let's father that in all cases. Change-Id: I4e2b8be06d2993db1bab233948a8ee774b8ac4ee --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index fa9e395..5e21894 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -534,6 +534,7 @@ for (i = 0; i Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:39:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:39:33 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 16: > Patch Set 16: > > > > it's either all or nothing. > > > > That's not the case: we might fail in the middle of decoding after > > some values have already been written out. > > I don't see the API defining those different cases nor this test code checking different cases through return code, so yes, its "all or nothing" (and it's fine being that way). Agreeing with pau here -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 16 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 08 Dec 2018 19:39:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:39:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:39:59 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 16: In agreement with pau -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 16 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 08 Dec 2018 19:39:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:41:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:41:08 +0000 Subject: Change in osmo-sysmon[master]: Add OpenVPN status helper example from corresponding ticket In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11885 ) Change subject: Add OpenVPN status helper example from corresponding ticket ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I912d943cdc7024e3ddd92e0a122ac2dd4fbf0a18 Gerrit-Change-Number: 11885 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 08 Dec 2018 19:41:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:41:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:41:11 +0000 Subject: Change in osmo-sysmon[master]: Add OpenVPN status helper example from corresponding ticket In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11885 ) Change subject: Add OpenVPN status helper example from corresponding ticket ...................................................................... Add OpenVPN status helper example from corresponding ticket Change-Id: I912d943cdc7024e3ddd92e0a122ac2dd4fbf0a18 Related: SYS#2655 --- A contrib/openvpn-status-export.pl 1 file changed, 124 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/contrib/openvpn-status-export.pl b/contrib/openvpn-status-export.pl new file mode 100755 index 0000000..c227a8f --- /dev/null +++ b/contrib/openvpn-status-export.pl @@ -0,0 +1,124 @@ +#!/usr/bin/perl -w +use strict; + +# Script to export the OpenVPN daemon status information (which clients +# are connected from where) as a JSON file that can be served via HTTP. +# +# (C) 2015 by sysmocom - s.f.m.c. GmbH, All rights reserved. +# Author: Harald Welte + +use JSON; +use Linux::Inotify2; +use Net::Netmask; + +my $OPENVPN_STATE_FILE = "/var/tmp/openvpn.status"; +my $JSON_OUTPUT_FILE = "/var/www/openvpn/status.json"; + +my $srcip_table = { + 'Destination 1' => [ + '127.0.0.0/8', + ], + 'Peer 2' => [ + '8.8.0.0/16', '1.2.3.0/18', + ], +}; + +my %netblocks; + +sub read_netmask_table($) +{ + my ($t) = @_; + + foreach my $k (keys %$t) { + my $table = {}; + foreach my $net (@{$$t{$k}}) { + my $block = new Net::Netmask($net); + $block->storeNetblock($table); + } + $netblocks{$k} = $table; + } +} + +sub classify_srcip($) +{ + my ($ip) = @_; + foreach my $k (%netblocks) { + my $block = findNetblock($ip, $netblocks{$k}); + if ($block) { + return $k; + } + } + return undef; +} + +# read the openvpn.status file and parse it, return hash reference to +# its contents. +sub get_openvpn_clients($) +{ + my ($fname) = @_; + my $state = 'init'; + my $href; + my @clients; + + $$href{version} = 1; + + open(INFILE, "<", $fname); + while (my $line = ) { + chomp($line); + if ($line =~ /^OpenVPN CLIENT LIST$/) { + $state = 'client_list'; + } elsif ($line =~ /^ROUTING\ TABLE$/) { + $state = 'routing_table'; + } else { + if ($state eq 'client_list') { + my %cl; + if ($line =~ /^Updated,(.*)/) { + $$href{updated} = $1; + } elsif ($line =~ /^(\S+),([0-9\.]+)\:(\d+),(\d+),(\d+),(.*)$/) { + $cl{name} = $1; + $cl{srcip} = $2; + $cl{operator} = classify_srcip($2); + $cl{srcport} = $3 + 0; + $cl{bytes_rx} = $4 + 0; + $cl{bytes_tx} = $5 + 0; + $cl{connected_since} = $6; + push(@clients, \%cl); + } + } + } + } + close(INFILE); + + $$href{clients} = \@clients; + + return $href; +} + +# inotify handler to re-parse/convert openvpn.status on any change +sub status_in_handler +{ + my $e = shift; + + # read/parse openvpn.status + my $cl = get_openvpn_clients($e->fullname); + + # write result to file + open(OUTFILE, ">", $JSON_OUTPUT_FILE); + print(OUTFILE to_json($cl, { pretty => 1 })); + close(OUTFILE); + + # also print it to console for debugging + print(to_json($cl, { pretty => 1 })); +} + + + +# main + +read_netmask_table($srcip_table); + +my $inotify = new Linux::Inotify2 or die("Can't create inotify object: $!"); +$inotify->watch($OPENVPN_STATE_FILE, IN_MODIFY, \&status_in_handler); + +# endless loop, wait for inotify enents +1 while $inotify->poll; -- To view, visit https://gerrit.osmocom.org/11885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I912d943cdc7024e3ddd92e0a122ac2dd4fbf0a18 Gerrit-Change-Number: 11885 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:43:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:43:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mo_sms for MO SMS over GSUP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11718 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mo_sms for MO SMS over GSUP ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id14bbd8bd51558cdacefea0fe042769cd69ed5c8 Gerrit-Change-Number: 11718 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 08 Dec 2018 19:43:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:44:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:44:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11776 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7abc95b8e416f7308d54e11be11c08586d18e6c5 Gerrit-Change-Number: 11776 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 08 Dec 2018 19:44:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:45:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 8 Dec 2018 19:45:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11924 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Sat, 08 Dec 2018 19:45:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 8 19:50:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 8 Dec 2018 19:50:06 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: use VTY bind addr from config, deprecate cmd line opt... In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12208 ) Change subject: Revert "mobile: use VTY bind addr from config, deprecate cmd line options" ...................................................................... Patch Set 1: Hi, > I would prefer something else than a complete revert. I just discovered that OsmoBTS has a VTY command to change the VTY bind port (sorry for tautology). I suggest either to add similar command to mobile (as a temporary solution), or finally introduce it in libosmovty. -- To view, visit https://gerrit.osmocom.org/12208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie89bc16b667dbe05baa76cfa4f86b4946f8019e8 Gerrit-Change-Number: 12208 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sat, 08 Dec 2018 19:50:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 9 00:51:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 9 Dec 2018 00:51:11 +0000 Subject: Change in libosmocore[master]: timer: Fix clockid_t undefined on MacOS < 10.12 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12210 Change subject: timer: Fix clockid_t undefined on MacOS < 10.12 ...................................................................... timer: Fix clockid_t undefined on MacOS < 10.12 Change-Id: If466a64bd44dcb8ae8a9b7f82bc9c9435ba3e640 --- M include/osmocom/core/timer.h M include/osmocom/core/timer_compat.h 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/12210/1 diff --git a/include/osmocom/core/timer.h b/include/osmocom/core/timer.h index caf4c67..1979766 100644 --- a/include/osmocom/core/timer.h +++ b/include/osmocom/core/timer.h @@ -45,6 +45,7 @@ #include #include +#include /* convert absolute time (in seconds) to elapsed days/hours/minutes */ #define OSMO_SEC2MIN(sec) ((sec % (60 * 60)) / 60) diff --git a/include/osmocom/core/timer_compat.h b/include/osmocom/core/timer_compat.h index 8fdd0a0..916f568 100644 --- a/include/osmocom/core/timer_compat.h +++ b/include/osmocom/core/timer_compat.h @@ -27,6 +27,10 @@ #pragma once +/* MacOS < 10.12 Sierra does not define clockid_t */ +#if defined(__APPLE__) && (!defined(__DARWIN_C_LEVEL) || __DARWIN_C_LEVEL < 199309L) +typedef int clockid_t; +#endif /* Convenience macros for operations on timevals. NOTE: `timercmp' does not work for >= or <=. */ -- To view, visit https://gerrit.osmocom.org/12210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If466a64bd44dcb8ae8a9b7f82bc9c9435ba3e640 Gerrit-Change-Number: 12210 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 9 10:20:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 9 Dec 2018 10:20:44 +0000 Subject: Change in libosmocore[master]: timer: Fix clockid_t undefined on MacOS < 10.12 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12210 ) Change subject: timer: Fix clockid_t undefined on MacOS < 10.12 ...................................................................... Patch Set 1: Code-Review+2 ... but I have of course no way of testing. -- To view, visit https://gerrit.osmocom.org/12210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If466a64bd44dcb8ae8a9b7f82bc9c9435ba3e640 Gerrit-Change-Number: 12210 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 09 Dec 2018 10:20:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 9 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#333?= In-Reply-To: <1758204215.1164.1544281807710.JavaMail.jenkins@jenkins.osmocom.org> References: <1758204215.1164.1544281807710.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <448732333.1181.1544368207541.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Dec 9 16:12:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 9 Dec 2018 16:12:58 +0000 Subject: Change in osmo-bsc[master]: set gscon FSM instances' log level to DEBUG Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12211 Change subject: set gscon FSM instances' log level to DEBUG ...................................................................... set gscon FSM instances' log level to DEBUG Currently, we see all subscribers' FSM transitions on NOTICE level even though the code uses LOGPFSML(LOGL_DEBUG), because LOGPFSML() uses the max loglevel of the passed level and the FSM instance's level. Too noisy! By default, start out all gscon FSM instances on DEBUG level, so it is possible to silence the osmo-bsc log. Individual instances can still be lifted (I presume using the CTRL interface?). Change-Id: Ie021483e93ab174abac51357bcca8895756566c4 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/12211/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 074c238..fac0bc0 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -877,7 +877,7 @@ /* don't allocate from 'conn' context, as gscon_cleanup() will call talloc_free(conn) before * libosmocore will call talloc_free(conn->fi), i.e. avoid use-after-free during cleanup */ - conn->fi = osmo_fsm_inst_alloc(&gscon_fsm, net, conn, LOGL_NOTICE, NULL); + conn->fi = osmo_fsm_inst_alloc(&gscon_fsm, net, conn, LOGL_DEBUG, NULL); if (!conn->fi) { talloc_free(conn); return NULL; -- To view, visit https://gerrit.osmocom.org/12211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie021483e93ab174abac51357bcca8895756566c4 Gerrit-Change-Number: 12211 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 9 23:55:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 9 Dec 2018 23:55:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-libosmocore_=C2=BB_a2=3Ddefault,a3=3D?= =?UTF-8?Q?default,a4=3Ddefault,arm-none-eabi,osmocom-master-debian9_#629?= Message-ID: <1645927801.1183.1544399715945.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 14.63 KB...] checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by arm-none-eabi-gcc... /usr/lib/arm-none-eabi/bin/ld checking if the linker (/usr/lib/arm-none-eabi/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/arm-none-eabi-nm -B checking the name lister (/usr/bin/arm-none-eabi-nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to arm-none-eabi format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/lib/arm-none-eabi/bin/ld option to reload object files... -r checking for arm-none-eabi-objdump... arm-none-eabi-objdump checking how to recognize dependent libraries... unknown checking for arm-none-eabi-dlltool... no checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for arm-none-eabi-ar... arm-none-eabi-ar checking for archiver @FILE support... @ checking for arm-none-eabi-strip... (cached) arm-none-eabi-strip checking for arm-none-eabi-ranlib... arm-none-eabi-ranlib checking command to parse /usr/bin/arm-none-eabi-nm -B output from arm-none-eabi-gcc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for arm-none-eabi-mt... no checking for mt... mt configure: WARNING: using cross tools not prefixed with host triplet checking if mt is a manifest tool... no checking how to run the C preprocessor... arm-none-eabi-gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... no checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... no checking for objdir... .libs checking if arm-none-eabi-gcc supports -fno-rtti -fno-exceptions... no checking for arm-none-eabi-gcc option to produce PIC... -fPIC -DPIC checking if arm-none-eabi-gcc PIC flag -fPIC -DPIC works... yes checking if arm-none-eabi-gcc static flag -static works... yes checking if arm-none-eabi-gcc supports -c -o file.o... yes checking if arm-none-eabi-gcc supports -c -o file.o... (cached) yes checking whether the arm-none-eabi-gcc linker (/usr/lib/arm-none-eabi/bin/ld) supports shared libraries... yes checking dynamic linker characteristics... no checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... no checking whether to build shared libraries... no checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for arm-none-eabi-pkg-config... no checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... no checking execinfo.h presence... no checking for execinfo.h... no checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... no checking sys/socket.h presence... no checking for sys/socket.h... no checking sys/timerfd.h usability... no checking sys/timerfd.h presence... no checking for sys/timerfd.h... no checking syslog.h usability... no checking syslog.h presence... no checking for syslog.h... no checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... no checking netinet/tcp.h presence... no checking for netinet/tcp.h... no checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... no checking for library containing dlsym... no checking for backtrace in -lexecinfo... no checking for library containing clock_gettime... no checking for doxygen... /usr/bin/doxygen checking whether SYS_getrandom is declared... no checking if arm-none-eabi-gcc supports -fvisibility=hidden... yes checking for clock_gettime... no checking for localtime_r... no checking whether struct tm has tm_gmtoff member... no checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/site-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/site-packages checking for osmo_verify_transcript_vty.py... yes checking whether to enable VTY/CTRL tests... yes checking whether arm-none-eabi-gcc has __builtin_cpu_supports built-in... no configure: WARNING: Runtime SIMD detection will be disabled CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 0.12.0.140-4f49 > && mv make all-recursive make[1]: Entering directory ' Making all in include make[2]: Entering directory ' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make all-am make[3]: Entering directory ' GEN osmocom/core/bit32gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/bit16gen.h make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in src make[2]: Entering directory ' GEN crc8gen.c GEN crc16gen.c GEN crc32gen.c GEN crc64gen.c make all-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC timer_clockgettime.lo CC select.lo CC msgb.lo CC signal.lo CC bits.lo CC bitvec.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo /bin/bash: line 2: 22945 Segmentation fault /bin/bash ../libtool --silent --tag=CC --mode=compile arm-none-eabi-gcc -DHAVE_CONFIG_H -I. -I -I.. -I -I../include -I -DBUILDING_LIBOSMOCORE -Wall -Wall -Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -DBUILDING_LIBOSMOCORE -Wall -MT socket.lo -MD -MP -MF $depbase.Tpo -c -o socket.lo Makefile:560: recipe for target 'socket.lo' failed make[3]: *** [socket.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:418: recipe for target 'all' failed make[2]: *** [all] Error 2 make[2]: Leaving directory ' Makefile:615: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:419: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Dec 10 02:55:19 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 10 Dec 2018 02:55:19 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Add a virtual bts and make use of it In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12209 ) Change subject: ms_driver: Add a virtual bts and make use of it ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12209/1/example/resources.conf.prod File example/resources.conf.prod: https://gerrit.osmocom.org/#/c/12209/1/example/resources.conf.prod at 4 PS1, Line 4: - addr: 10.42.42.2 : - addr: 10.42.42.3 : - addr: 10.42.42.4 : - addr: 10.42.42.5 : - addr: 10.42.42.6 : - addr: 10.42.42.7 : - addr: 10.42.42.8 : - addr: 10.42.42.9 : - addr: 10.42.42.10 neels/pau: Any idea how this can end with the following error? 01:09:12.509618 tst sms:sysmo: Reserving 1 x bts (candidates: 8) 01:09:12.555560 tst sms:sysmo: Reserving 6 x ip_address (candidates: 3) 01:09:12.571464 cnf (conf='/home/jenkins/workspace/osmo-gsm-tester_gerrit/osmo-gsm-tester/example/resources.conf.prod', state='/var/tmp/osmo-gsm-tester/state'): ERR: NoResourceExn: Could not resolve request to reserve resources: 6 x ip_address with requirements: [{}, {}, {}, {}, {}, {}] [trial-751?sms:sysmo?(conf='/home/jenkins/workspace/osmo-gsm-tester_gerrit/osmo-gsm-tester/example/resources.conf.prod', state='/var/tmp/osmo-gsm-tester/state')] -- To view, visit https://gerrit.osmocom.org/12209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 Gerrit-Change-Number: 12209 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 10 Dec 2018 02:55:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 09:10:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 09:10:50 +0000 Subject: Change in docker-playground[master]: bts-test: osmo-bts.cfg: Enable extended timestamp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12179 ) Change subject: bts-test: osmo-bts.cfg: Enable extended timestamp ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic59c0d7ee0d3ce71e807364d156f6e38bc0c74d1 Gerrit-Change-Number: 12179 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 09:10:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 09:10:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 09:10:52 +0000 Subject: Change in docker-playground[master]: bts-test: osmo-bts.cfg: Enable extended timestamp In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12179 ) Change subject: bts-test: osmo-bts.cfg: Enable extended timestamp ...................................................................... bts-test: osmo-bts.cfg: Enable extended timestamp This way messages appearing in log files can be easily matched against pcap captures. Change-Id: Ic59c0d7ee0d3ce71e807364d156f6e38bc0c74d1 --- M ttcn3-bts-test/osmo-bts.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/osmo-bts.cfg index c2ba83f..611355b 100644 --- a/ttcn3-bts-test/osmo-bts.cfg +++ b/ttcn3-bts-test/osmo-bts.cfg @@ -7,6 +7,7 @@ logging color 0 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging level rsl info logging level oml info logging level rll notice -- To view, visit https://gerrit.osmocom.org/12179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic59c0d7ee0d3ce71e807364d156f6e38bc0c74d1 Gerrit-Change-Number: 12179 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 09:13:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 09:13:53 +0000 Subject: Change in osmo-bsc[master]: set gscon FSM instances' log level to DEBUG In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12211 ) Change subject: set gscon FSM instances' log level to DEBUG ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12211/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12211/1//COMMIT_MSG at 11 PS1, Line 11: the passed level and the FSM instance's level. Too noisy! Why do we do the max() instead of simply using the log level passed by the macro? that looks really confusing to me. -- To view, visit https://gerrit.osmocom.org/12211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie021483e93ab174abac51357bcca8895756566c4 Gerrit-Change-Number: 12211 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 09:13:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 09:37:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 09:37:24 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Add a virtual bts and make use of it In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12209 ) Change subject: ms_driver: Add a virtual bts and make use of it ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/#/c/12209/1/example/resources.conf.prod File example/resources.conf.prod: https://gerrit.osmocom.org/#/c/12209/1/example/resources.conf.prod at 4 PS1, Line 4: - addr: 10.42.42.2 : - addr: 10.42.42.3 : - addr: 10.42.42.4 : - addr: 10.42.42.5 : - addr: 10.42.42.6 : - addr: 10.42.42.7 : - addr: 10.42.42.8 : - addr: 10.42.42.9 : - addr: 10.42.42.10 > neels/pau: Any idea how this can end with the following error? [?] jenkins osmo-gsm-tester job 1686 running the wole test battery failed (connection lost between jenkins master and slave) and unfortunately what I observed so far is that jenkins sends a kill -9 in that case, not allowing osmo-gsm-tester to cleanup resources properly. This kind of cases require manual intervention (rm /var/tmp/osmo-gsm-tester/state/*). I fixed the corrupted state, but you'll need to set up a proper IP addr in the osmo-bts-virtual below to have it working properly. https://gerrit.osmocom.org/#/c/12209/1/example/resources.conf.prod at 115 PS1, Line 115: ipa_unit_id: 11 This ipa_unit_id is already used by LimeSDR-USB (line 54), use another one. 13 is fine. https://gerrit.osmocom.org/#/c/12209/1/example/resources.conf.prod at 116 PS1, Line 116: addr: 10.42.42.123 This IP addr doesn't seem to be set up in the osmo-gsm-tester main unit. Furthremore we use this 120ish range for DHCP based BTS (like nanobts, see osmo-ci.git). Better use .55 for this one. You need to submit a patch against osmo-ci.git adding the IP addr so ansible can set it up: osmo-ci/ansible/roles/gsm-tester-network/templates/interface.j2 Ping me if you want me to set the IP addr into the main unit. https://gerrit.osmocom.org/#/c/12209/1/example/resources.conf.prod at 118 PS1, Line 118: num_trx: 1 num_trx: 1 is the default (see bsc_bts in example/defaults.conf), no need to put it here. -- To view, visit https://gerrit.osmocom.org/12209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 Gerrit-Change-Number: 12209 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 09:37:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 10:01:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 10:01:05 +0000 Subject: Change in libosmocore[master]: stats.h: Fix build on MacOS Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12212 Change subject: stats.h: Fix build on MacOS ...................................................................... stats.h: Fix build on MacOS Otherwise struct osmo_stats_config is not defined and compiler fails. Related: OS#3722 Change-Id: I037c3ca141ecee2d457e0a881a56e32ee24cec4d --- M include/osmocom/core/stats.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/12212/1 diff --git a/include/osmocom/core/stats.h b/include/osmocom/core/stats.h index e4d46ba..e01016d 100644 --- a/include/osmocom/core/stats.h +++ b/include/osmocom/core/stats.h @@ -28,7 +28,7 @@ * embedded systems. We cannot use the autoconf-defined HAVE_... macros * here, as that only works at library compile time, not at application * compile time */ -#ifdef unix +#if defined(unix) || defined(__APPLE__) #include #include @@ -141,5 +141,5 @@ int osmo_stats_reporter_udp_open(struct osmo_stats_reporter *srep); int osmo_stats_reporter_udp_close(struct osmo_stats_reporter *srep); -#endif /* unix */ +#endif /* unix || __APPLE__ */ /*! @} */ -- To view, visit https://gerrit.osmocom.org/12212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I037c3ca141ecee2d457e0a881a56e32ee24cec4d Gerrit-Change-Number: 12212 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 10:02:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 10:02:29 +0000 Subject: Change in libosmocore[master]: timer: Fix clockid_t undefined on MacOS < 10.12 In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12210 to look at the new patch set (#2). Change subject: timer: Fix clockid_t undefined on MacOS < 10.12 ...................................................................... timer: Fix clockid_t undefined on MacOS < 10.12 Related: OS#3722 Change-Id: If466a64bd44dcb8ae8a9b7f82bc9c9435ba3e640 --- M include/osmocom/core/timer.h M include/osmocom/core/timer_compat.h 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/12210/2 -- To view, visit https://gerrit.osmocom.org/12210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If466a64bd44dcb8ae8a9b7f82bc9c9435ba3e640 Gerrit-Change-Number: 12210 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 10:05:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 10:05:02 +0000 Subject: Change in libosmocore[master]: timer: Fix clockid_t undefined on MacOS < 10.12 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12210 ) Change subject: timer: Fix clockid_t undefined on MacOS < 10.12 ...................................................................... Patch Set 2: Code-Review+2 Re-adding +2, I added the related ticket to commit description. -- To view, visit https://gerrit.osmocom.org/12210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If466a64bd44dcb8ae8a9b7f82bc9c9435ba3e640 Gerrit-Change-Number: 12210 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 10:05:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 10:05:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 10:05:03 +0000 Subject: Change in libosmocore[master]: timer: Fix clockid_t undefined on MacOS < 10.12 In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12210 ) Change subject: timer: Fix clockid_t undefined on MacOS < 10.12 ...................................................................... timer: Fix clockid_t undefined on MacOS < 10.12 Related: OS#3722 Change-Id: If466a64bd44dcb8ae8a9b7f82bc9c9435ba3e640 --- M include/osmocom/core/timer.h M include/osmocom/core/timer_compat.h 2 files changed, 5 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/timer.h b/include/osmocom/core/timer.h index caf4c67..1979766 100644 --- a/include/osmocom/core/timer.h +++ b/include/osmocom/core/timer.h @@ -45,6 +45,7 @@ #include #include +#include /* convert absolute time (in seconds) to elapsed days/hours/minutes */ #define OSMO_SEC2MIN(sec) ((sec % (60 * 60)) / 60) diff --git a/include/osmocom/core/timer_compat.h b/include/osmocom/core/timer_compat.h index 8fdd0a0..916f568 100644 --- a/include/osmocom/core/timer_compat.h +++ b/include/osmocom/core/timer_compat.h @@ -27,6 +27,10 @@ #pragma once +/* MacOS < 10.12 Sierra does not define clockid_t */ +#if defined(__APPLE__) && (!defined(__DARWIN_C_LEVEL) || __DARWIN_C_LEVEL < 199309L) +typedef int clockid_t; +#endif /* Convenience macros for operations on timevals. NOTE: `timercmp' does not work for >= or <=. */ -- To view, visit https://gerrit.osmocom.org/12210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If466a64bd44dcb8ae8a9b7f82bc9c9435ba3e640 Gerrit-Change-Number: 12210 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 10:05:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 10:05:23 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11827 to look at the new patch set (#23). Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... LCLS, TS 29.205: add GCR routines Add functions to encode and decode Global Call Reference as per 3GPP TS 29.205 Table B 2.1.9.1 add corresponding tests. Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Related: OS#2487 --- M include/Makefile.am M include/osmocom/gsm/gsm0808_utils.h A include/osmocom/gsm/gsm29205.h M src/gsm/Makefile.am A src/gsm/gsm29205.c M src/gsm/libosmogsm.map M tests/Makefile.am A tests/gsm29205/gsm29205_test.c A tests/gsm29205/gsm29205_test.ok M tests/testsuite.at 10 files changed, 253 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/11827/23 -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 23 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 10:05:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 10:05:23 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12020 to look at the new patch set (#17). Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... LCLS, TS 48.008: add GCR IE encoding/decoding * add functions to encode Global Call. Ref. from TS 29.205 as 3GPP TS 48.008 ?3.2.2.115 information element * add corresponding tests Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/12020/17 -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 17 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 10:07:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 10:07:56 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 17: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 17 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 10:07:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 10 10:10:46 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 10:10:46 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_?= =?UTF-8?Q?:_master-libosmocore_=C2=BB_a2=3Ddefaul?= =?UTF-8?Q?t,a3=3Ddefault,a4=3Ddefault,arm-none?= =?UTF-8?Q?-eabi,osmocom-master-debian9_#630?= In-Reply-To: <1645927801.1183.1544399715945.JavaMail.jenkins@jenkins.osmocom.org> References: <1645927801.1183.1544399715945.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <436637887.1198.1544436646539.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Dec 10 10:15:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 10:15:49 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_lc15?= =?UTF-8?Q?,v2017.01,0,default,osmocom-master-debian9_#1531?= Message-ID: <1663740393.1199.1544436949311.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 106.27 KB...] + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmo-abis + cd libosmo-abis + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master HEAD is now at 961776a... log IPA tags correctly + git rev-parse HEAD 961776a2f97cb6d2877939f1cd1a21545ce8c57d + cd libosmo-abis + mkdir -p + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, '.'. libtoolize: copying file './ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'. libtoolize: copying file 'm4/libtool.m4' libtoolize: copying file 'm4/ltoptions.m4' libtoolize: copying file 'm4/ltsugar.m4' libtoolize: copying file 'm4/ltversion.m4' libtoolize: copying file 'm4/lt~obsolete.m4' configure.ac:20: installing './compile' configure.ac:22: installing './config.guess' configure.ac:22: installing './config.sub' configure.ac:8: installing './install-sh' configure.ac:8: installing './missing' src/Makefile.am: installing './depcomp' + ./configure --prefix= --with-systemdsystemunitdir= configure: WARNING: unrecognized options: --with-systemdsystemunitdir checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking if gcc supports -fvisibility=hidden... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for ORTP... yes checking dahdi/user.h usability... no checking dahdi/user.h presence... no checking for dahdi/user.h... no configure: WARNING: DAHDI input driver will not be built CFLAGS="-g -O2 -Wall" CPPFLAGS=" -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmoabis.pc config.status: creating libosmotrau.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating tests/Makefile config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.5.1.21-9617 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/abis/ipa.h osmocom/abis/trau_frame.h osmocom/abis/ipa_proxy.h osmocom/abis/ipaccess.h osmocom/abis/abis.h osmocom/abis/subchan_demux.h osmocom/abis/e1_input.h osmocom/abis/lapd.h osmocom/abis/lapd_pcap.h osmocom/abis/unixsocket_proto.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/trau/osmo_ortp.h ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' CC init.lo CC e1_input.lo CC e1_input_vty.lo CC ipa_proxy.lo CC subchan_demux.lo CC trau_frame.lo CC input/ipa.lo CC input/dahdi.lo CC input/ipaccess.lo CC input/lapd.lo CC input/lapd_pcap.lo CC input/misdn.lo CC input/rs232.lo CC input/unixsocket.lo CC trau/libosmotrau_la-osmo_ortp.lo trau/osmo_ortp.c:233:9: note: #pragma message: Using internal ortp API: rtp_session_rtcp_rec #pragma message ("Using internal ortp API: rtp_session_rtcp_rec") ^~~~~~~ CCLD libosmoabis.la CCLD libosmotrau.la ar: `u' modifier ignored since `D' is the default (see `U') ar: `u' modifier ignored since `D' is the default (see `U') make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmoabis.la libosmotrau.la ' libtool: install: /usr/bin/install -c .libs/libosmoabis.so.6.0.1 libtool: install: (cd && { ln -s -f libosmoabis.so.6.0.1 libosmoabis.so.6 || { rm -f libosmoabis.so.6 && ln -s libosmoabis.so.6.0.1 libosmoabis.so.6; }; }) libtool: install: (cd && { ln -s -f libosmoabis.so.6.0.1 libosmoabis.so || { rm -f libosmoabis.so && ln -s libosmoabis.so.6.0.1 libosmoabis.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmoabis.lai libtool: install: /usr/bin/install -c .libs/libosmotrau.so.2.1.1 libtool: install: (cd && { ln -s -f libosmotrau.so.2.1.1 libosmotrau.so.2 || { rm -f libosmotrau.so.2 && ln -s libosmotrau.so.2.1.1 libosmotrau.so.2; }; }) libtool: install: (cd && { ln -s -f libosmotrau.so.2.1.1 libosmotrau.so || { rm -f libosmotrau.so && ln -s libosmotrau.so.2.1.1 libosmotrau.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmotrau.lai libtool: install: /usr/bin/install -c .libs/libosmoabis.a libtool: install: chmod 644 libtool: install: ranlib libtool: install: /usr/bin/install -c .libs/libosmotrau.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 libosmoabis.pc libosmotrau.pc ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmo-abis + cd + osmo-layer1-headers.sh lc15 v2017.01 + uri=https://gitlab.com/nrw_litecell15/litecell15-fw + version_prefix=origin/nrw/ + version=origin/nrw/litecell15 + [ -n v2017.01 ] + [ v2017.01 != master ] + version=v2017.01 + test -d layer1-headers + cd layer1-headers + git fetch origin fatal: unable to access 'https://gitlab.com/nrw_litecell15/litecell15-fw/': The requested URL returned error: 500 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Dec 10 10:17:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 10:17:14 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_lc15, origin?= =?UTF-8?Q?/nrw/litecell15,0,default,osmocom-master-debian9_#1531?= Message-ID: <1680009820.1200.1544437034681.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 109.00 KB...] + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmo-abis + cd libosmo-abis + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master HEAD is now at 961776a... log IPA tags correctly + git rev-parse HEAD 961776a2f97cb6d2877939f1cd1a21545ce8c57d + cd libosmo-abis + mkdir -p + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, '.'. libtoolize: copying file './ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'. libtoolize: copying file 'm4/libtool.m4' libtoolize: copying file 'm4/ltoptions.m4' libtoolize: copying file 'm4/ltsugar.m4' libtoolize: copying file 'm4/ltversion.m4' libtoolize: copying file 'm4/lt~obsolete.m4' configure.ac:20: installing './compile' configure.ac:22: installing './config.guess' configure.ac:22: installing './config.sub' configure.ac:8: installing './install-sh' configure.ac:8: installing './missing' src/Makefile.am: installing './depcomp' + ./configure --prefix= --with-systemdsystemunitdir= configure: WARNING: unrecognized options: --with-systemdsystemunitdir checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking if gcc supports -fvisibility=hidden... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for ORTP... yes checking dahdi/user.h usability... no checking dahdi/user.h presence... no checking for dahdi/user.h... no configure: WARNING: DAHDI input driver will not be built CFLAGS="-g -O2 -Wall" CPPFLAGS=" -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmoabis.pc config.status: creating libosmotrau.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating tests/Makefile config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.5.1.21-9617 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/abis/ipa.h osmocom/abis/trau_frame.h osmocom/abis/ipa_proxy.h osmocom/abis/ipaccess.h osmocom/abis/abis.h osmocom/abis/subchan_demux.h osmocom/abis/e1_input.h osmocom/abis/lapd.h osmocom/abis/lapd_pcap.h osmocom/abis/unixsocket_proto.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/trau/osmo_ortp.h ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' CC e1_input.lo CC init.lo CC ipa_proxy.lo CC e1_input_vty.lo CC subchan_demux.lo CC trau_frame.lo CC input/dahdi.lo CC input/ipa.lo CC input/ipaccess.lo CC input/lapd.lo CC input/lapd_pcap.lo CC input/misdn.lo CC input/rs232.lo CC input/unixsocket.lo CC trau/libosmotrau_la-osmo_ortp.lo trau/osmo_ortp.c:233:9: note: #pragma message: Using internal ortp API: rtp_session_rtcp_rec #pragma message ("Using internal ortp API: rtp_session_rtcp_rec") ^~~~~~~ CCLD libosmoabis.la CCLD libosmotrau.la ar: `u' modifier ignored since `D' is the default (see `U') ar: `u' modifier ignored since `D' is the default (see `U') make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmoabis.la libosmotrau.la ' libtool: install: /usr/bin/install -c .libs/libosmoabis.so.6.0.1 libtool: install: (cd && { ln -s -f libosmoabis.so.6.0.1 libosmoabis.so.6 || { rm -f libosmoabis.so.6 && ln -s libosmoabis.so.6.0.1 libosmoabis.so.6; }; }) libtool: install: (cd && { ln -s -f libosmoabis.so.6.0.1 libosmoabis.so || { rm -f libosmoabis.so && ln -s libosmoabis.so.6.0.1 libosmoabis.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmoabis.lai libtool: install: /usr/bin/install -c .libs/libosmotrau.so.2.1.1 libtool: install: (cd && { ln -s -f libosmotrau.so.2.1.1 libosmotrau.so.2 || { rm -f libosmotrau.so.2 && ln -s libosmotrau.so.2.1.1 libosmotrau.so.2; }; }) libtool: install: (cd && { ln -s -f libosmotrau.so.2.1.1 libosmotrau.so || { rm -f libosmotrau.so && ln -s libosmotrau.so.2.1.1 libosmotrau.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmotrau.lai libtool: install: /usr/bin/install -c .libs/libosmoabis.a libtool: install: chmod 644 libtool: install: ranlib libtool: install: /usr/bin/install -c .libs/libosmotrau.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 libosmoabis.pc libosmotrau.pc ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmo-abis + cd + osmo-layer1-headers.sh lc15 origin/nrw/litecell15 + uri=https://gitlab.com/nrw_litecell15/litecell15-fw + version_prefix=origin/nrw/ + version=origin/nrw/litecell15 + [ -n origin/nrw/litecell15 ] + [ origin/nrw/litecell15 != master ] + version=origin/nrw/litecell15 + test -d layer1-headers + cd layer1-headers + git fetch origin fatal: unable to access 'https://gitlab.com/nrw_litecell15/litecell15-fw/': The requested URL returned error: 500 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Dec 10 10:27:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 10:27:00 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_ma?= =?UTF-8?Q?ster,0,osmocom-master-debian9,lc15,True_#1057?= Message-ID: <381303451.1201.1544437620178.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-pcu" build number 1057 originally caused by: Started by upstream project "master-libosmocore" build number 630 originally caused by: Started by an SCM change Building remotely on build2-deb9build-ansible (ttcn3 osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-pcu > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-pcu +refs/heads/*:refs/remotes/origin/* Checking out Revision 5b521891baa7752b99fc630fdd19a694dd91aab8 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 5b521891baa7752b99fc630fdd19a694dd91aab8 Commit message: "contrib: fix makedistcheck with disabled systemd" > git rev-list --no-walk 5b521891baa7752b99fc630fdd19a694dd91aab8 # timeout=10 [True] $ /bin/sh -xe /tmp/jenkins5890515862081490975.sh + PUBLISH=0 ./contrib/jenkins.sh + [ -z make ] + base= + deps= + inst= + export deps inst + osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf Skipping repository deps/libosmocore Skipping repository deps/layer1-headers + [ -d ] + git_clean + repos= + [ ! -d ] + [ ! -d ] + git -C checkout -f HEAD + git -C clean -dxf + git_clean + repos= + [ ! -d ] + [ ! -d ] + git -C checkout -f HEAD + git -C clean -dxf + [ -d layer1-headers ] + mkdir mkdir: cannot create directory ?: File exists + true + PCU_CONFIG= + [ lc15 = sysmo ] + [ lc15 = lc15 ] + PCU_CONFIG= --enable-lc15bts-phy --with-litecell15= + cd + osmo-layer1-headers.sh lc15 master + uri=https://gitlab.com/nrw_litecell15/litecell15-fw + version_prefix=origin/nrw/ + version=origin/nrw/litecell15 + [ -n master ] + [ master != master ] + test -d layer1-headers + cd layer1-headers + git fetch origin fatal: unable to access 'https://gitlab.com/nrw_litecell15/litecell15-fw/': The requested URL returned error: 500 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Dec 10 10:27:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 10:27:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_v20?= =?UTF-8?Q?17.01,0,osmocom-master-debian9,lc15,True_#1057?= Message-ID: <1132115589.1202.1544437636172.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-pcu" build number 1057 originally caused by: Started by upstream project "master-libosmocore" build number 630 originally caused by: Started by an SCM change Building remotely on admin2-deb9build (obs osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace Cloning the remote Git repository Cloning repository git://git.osmocom.org/osmo-pcu > git init # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-pcu > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-pcu +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-pcu > git fetch --tags --progress git://git.osmocom.org/osmo-pcu +refs/heads/*:refs/remotes/origin/* Checking out Revision 5b521891baa7752b99fc630fdd19a694dd91aab8 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 5b521891baa7752b99fc630fdd19a694dd91aab8 Commit message: "contrib: fix makedistcheck with disabled systemd" > git rev-list --no-walk 5b521891baa7752b99fc630fdd19a694dd91aab8 # timeout=10 [True] $ /bin/sh -xe /tmp/jenkins2279860564282990380.sh + PUBLISH=0 ./contrib/jenkins.sh + [ -z make ] + base= + deps= + inst= + export deps inst + osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf + [ -d ] + [ -d layer1-headers ] + mkdir + PCU_CONFIG= + [ lc15 = sysmo ] + [ lc15 = lc15 ] + PCU_CONFIG= --enable-lc15bts-phy --with-litecell15= + cd + osmo-layer1-headers.sh lc15 v2017.01 + uri=https://gitlab.com/nrw_litecell15/litecell15-fw + version_prefix=origin/nrw/ + version=origin/nrw/litecell15 + [ -n v2017.01 ] + [ v2017.01 != master ] + version=v2017.01 + test -d layer1-headers + git clone https://gitlab.com/nrw_litecell15/litecell15-fw layer1-headers Cloning into 'layer1-headers'... fatal: unable to access 'https://gitlab.com/nrw_litecell15/litecell15-fw/': The requested URL returned error: 500 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Dec 10 10:28:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 10:28:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_origin/nr?= =?UTF-8?Q?w/litecell15,0,osmocom-master-debian9,lc15,True_#1057?= Message-ID: <1366664185.1203.1544437687404.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-osmo-pcu" build number 1057 originally caused by: Started by upstream project "master-libosmocore" build number 630 originally caused by: Started by an SCM change Building remotely on build2-deb9build-ansible (ttcn3 osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-pcu # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-pcu > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-pcu +refs/heads/*:refs/remotes/origin/* Checking out Revision 5b521891baa7752b99fc630fdd19a694dd91aab8 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 5b521891baa7752b99fc630fdd19a694dd91aab8 Commit message: "contrib: fix makedistcheck with disabled systemd" > git rev-list --no-walk 5b521891baa7752b99fc630fdd19a694dd91aab8 # timeout=10 [True] $ /bin/sh -xe /tmp/jenkins4450991933204419580.sh + PUBLISH=0 ./contrib/jenkins.sh + [ -z make ] + base= + deps= + inst= + export deps inst + osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf Skipping repository deps/libosmocore Skipping repository deps/layer1-headers + [ -d ] + git_clean + repos= + [ ! -d ] + [ ! -d ] + git -C checkout -f HEAD + git -C clean -dxf + git_clean + repos= + [ ! -d ] + [ ! -d ] + git -C checkout -f HEAD + git -C clean -dxf + [ -d layer1-headers ] + mkdir mkdir: cannot create directory ?: File exists + true + PCU_CONFIG= + [ lc15 = sysmo ] + [ lc15 = lc15 ] + PCU_CONFIG= --enable-lc15bts-phy --with-litecell15= + cd + osmo-layer1-headers.sh lc15 origin/nrw/litecell15 + uri=https://gitlab.com/nrw_litecell15/litecell15-fw + version_prefix=origin/nrw/ + version=origin/nrw/litecell15 + [ -n origin/nrw/litecell15 ] + [ origin/nrw/litecell15 != master ] + version=origin/nrw/litecell15 + test -d layer1-headers + cd layer1-headers + git fetch origin fatal: unable to access 'https://gitlab.com/nrw_litecell15/litecell15-fw.git/': The requested URL returned error: 500 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Dec 10 10:30:04 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 10:30:04 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins*: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12213 Change subject: contrib/jenkins*: build and publish manuals ...................................................................... contrib/jenkins*: build and publish manuals Add contrib/jenkins-build-manuals.sh, which clones or updates osmo-gsm-manuals and builds the manuals. When the environment variable PUBLISH=1 is set, it also uploads them. Call jenkins-build-manuals.sh from jenkins-run.sh, without PUBLISH=1, so the manuals get build-tested in the osmo-gsm-tester_gerrit job. A new job master-osmo-gsm-tester will be added in the future, which will run PUBLISH=1 jenkins-build-manuals.sh. The jenkins-build-manuals.sh script does not use the osmo-ci.git scripts for installing dependencies and cleaning up the workspace. These scripts are not available on the node, which runs the osmo-gsm-tester_gerrit job, and it is not trivial to add just them (without building the osmo-ci Docker image etc.). The only dependency is osmo-gsm-manuals, and it does not need to be compiled, so it seemed to be the most maintainable solution to implement the clone/update and clean up in a few lines of shell code instead. Related: OS#3385 Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd --- A contrib/jenkins-build-manuals.sh M contrib/jenkins-make-check-and-run.sh 2 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/13/12213/1 diff --git a/contrib/jenkins-build-manuals.sh b/contrib/jenkins-build-manuals.sh new file mode 100755 index 0000000..0984f6c --- /dev/null +++ b/contrib/jenkins-build-manuals.sh @@ -0,0 +1,34 @@ +#!/bin/sh -ex +# environment variables: +# * PUBLISH: upload manuals after building if set to "1" + +base="$PWD" +export OSMO_GSM_MANUALS_DIR="$base/osmo-gsm-manuals" + +# Clone/update osmo-gsm-manuals and wipe local modifications +if [ -d "$OSMO_GSM_MANUALS_DIR" ]; then + git -C "$OSMO_GSM_MANUALS_DIR" pull +else + git clone "https://git.osmocom.org/osmo-gsm-manuals" "$OSMO_GSM_MANUALS_DIR" +fi +git -C "$OSMO_GSM_MANUALS_DIR" checkout -f HEAD + +# Copy manuals source to empty temp dir (so we can easily clean up afterwards) +temp="$base/_manuals_temp" +if [ -d "$temp" ]; then + rm -rf "$temp" +fi +cp -r "$base/doc/manuals" "$temp" + +# Build the manuals +cd "$temp" +make +make check + +# Publish +if [ "$PUBLISH" = "1" ]; then + make publish +fi + +# Clean up +rm -r "$temp" diff --git a/contrib/jenkins-make-check-and-run.sh b/contrib/jenkins-make-check-and-run.sh index 3017fd4..4f87fbd 100755 --- a/contrib/jenkins-make-check-and-run.sh +++ b/contrib/jenkins-make-check-and-run.sh @@ -1,4 +1,5 @@ #!/bin/sh + set -e -x base="$PWD" @@ -12,3 +13,5 @@ PATH="$base/osmo-gsm-tester/src:$PATH" \ "$run_script" + +./jenkins-build-manuals.sh -- To view, visit https://gerrit.osmocom.org/12213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd Gerrit-Change-Number: 12213 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 10:33:03 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 10:33:03 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins*: build and publish manuals In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12213 ) Change subject: contrib/jenkins*: build and publish manuals ...................................................................... contrib/jenkins*: build and publish manuals Add contrib/jenkins-build-manuals.sh, which clones or updates osmo-gsm-manuals and builds the manuals. When the environment variable PUBLISH=1 is set, it also uploads them. Call jenkins-build-manuals.sh from jenkins-run.sh, without PUBLISH=1, so the manuals get build-tested in the osmo-gsm-tester_gerrit job. A new job master-osmo-gsm-tester will be added in the future, which will run PUBLISH=1 jenkins-build-manuals.sh. The jenkins-build-manuals.sh script does not use the osmo-ci.git scripts for installing dependencies and cleaning up the workspace. These scripts are not available on the node, which runs the osmo-gsm-tester_gerrit job, and it is not trivial to add just them (without building the osmo-ci Docker image etc.). The only dependency is osmo-gsm-manuals, and it does not need to be compiled, so it seemed to be the most maintainable solution to implement the clone/update and clean up in a few lines of shell code instead. Related: OS#3385 Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd --- A contrib/jenkins-build-manuals.sh M contrib/jenkins-make-check-and-run.sh 2 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/13/12213/2 -- To view, visit https://gerrit.osmocom.org/12213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd Gerrit-Change-Number: 12213 Gerrit-PatchSet: 2 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 11:32:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 11:32:52 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.common.inc: publish: don't depend on check In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12203 ) Change subject: Makefile.common.inc: publish: don't depend on check ...................................................................... Makefile.common.inc: publish: don't depend on check The 'check' target is only available when including Makefile.asciidoc.inc, which is not always the case. Some projects only build the VTY reference. Do not depend on check, so publishing the VTY reference for these projects is working as expected. Related: OS#3385 Change-Id: I64aae0016095d81ca9e9ebda9a2e3336ac126639 --- M build/Makefile.common.inc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc index 0ee648a..aaad088 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -21,7 +21,7 @@ distclean: clean -publish: all check +publish: all mkdir -p out cp *.pdf out rsync -avz -e "$(SSH_COMMAND)" ./out/ docs at rita.osmocom.org:web-files/latest/ -- To view, visit https://gerrit.osmocom.org/12203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I64aae0016095d81ca9e9ebda9a2e3336ac126639 Gerrit-Change-Number: 12203 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 11:46:50 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 11:46:50 +0000 Subject: Change in docker-playground[master]: gerrit: fix libopenid path In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12204 ) Change subject: gerrit: fix libopenid path ...................................................................... Patch Set 1: > How it comes the name is now different? Upstream change. I could not find the specific commit in the upstream source with a quick search, but I am not sure if it's that helpful to have it. -- To view, visit https://gerrit.osmocom.org/12204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 Gerrit-Change-Number: 12204 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 11:46:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 11:46:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 11:46:58 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins*: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12213 ) Change subject: contrib/jenkins*: build and publish manuals ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12213/2/contrib/jenkins-make-check-and-run.sh File contrib/jenkins-make-check-and-run.sh: https://gerrit.osmocom.org/#/c/12213/2/contrib/jenkins-make-check-and-run.sh at 17 PS2, Line 17: $base/osmo-gsm-tester/contrib/jenkins-build-manuals.sh Please call it after make check and beforeswitching to $base dir. BTW; test failed: ./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh: 17: ./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh: ./jenkins-build-manuals.sh: not found -- To view, visit https://gerrit.osmocom.org/12213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd Gerrit-Change-Number: 12213 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 11:46:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 11:47:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 11:47:40 +0000 Subject: Change in libosmocore[master]: Constify llist_count() parameter Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12214 Change subject: Constify llist_count() parameter ...................................................................... Constify llist_count() parameter Counting list entires should not alter the list content: let's make this obvious from type signature. Change-Id: I414e67a3de733fab407161b3264d3b89070ba537 --- M include/osmocom/core/linuxlist.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/12214/1 diff --git a/include/osmocom/core/linuxlist.h b/include/osmocom/core/linuxlist.h index 8d0533f..7791310 100644 --- a/include/osmocom/core/linuxlist.h +++ b/include/osmocom/core/linuxlist.h @@ -387,7 +387,7 @@ * This function is not efficient, mostly useful for small lists and non time * critical cases like unit tests. */ -static inline unsigned int llist_count(struct llist_head *head) +static inline unsigned int llist_count(const struct llist_head *head) { struct llist_head *entry; unsigned int i = 0; -- To view, visit https://gerrit.osmocom.org/12214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I414e67a3de733fab407161b3264d3b89070ba537 Gerrit-Change-Number: 12214 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 11:49:24 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 11:49:24 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins*: build and publish manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12213 ) Change subject: contrib/jenkins*: build and publish manuals ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12213/2/contrib/jenkins-make-check-and-run.sh File contrib/jenkins-make-check-and-run.sh: https://gerrit.osmocom.org/#/c/12213/2/contrib/jenkins-make-check-and-run.sh at 17 PS2, Line 17: $base/osmo-gsm-tester/contrib/jenkins-build-manuals.sh > Please call it after make check and beforeswitching to $base dir. [?] Will do. Yeah, I've realized that the path is wrong and pushed a second patch. But the build slave is so busy that Jenkins only got around to build the first one. Thanks for the quick review! :) -- To view, visit https://gerrit.osmocom.org/12213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd Gerrit-Change-Number: 12213 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 11:49:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 11:55:33 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 11:55:33 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins*: build and publish manuals In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12213 to look at the new patch set (#3). Change subject: contrib/jenkins*: build and publish manuals ...................................................................... contrib/jenkins*: build and publish manuals Add contrib/jenkins-build-manuals.sh, which clones or updates osmo-gsm-manuals and builds the manuals. When the environment variable PUBLISH=1 is set, it also uploads them. Call jenkins-build-manuals.sh from jenkins-run.sh, without PUBLISH=1, so the manuals get build-tested in the osmo-gsm-tester_gerrit job. A new job master-osmo-gsm-tester will be added in the future, which will run PUBLISH=1 jenkins-build-manuals.sh. The jenkins-build-manuals.sh script does not use the osmo-ci.git scripts for installing dependencies and cleaning up the workspace. These scripts are not available on the node, which runs the osmo-gsm-tester_gerrit job, and it is not trivial to add just them (without building the osmo-ci Docker image etc.). The only dependency is osmo-gsm-manuals, and it does not need to be compiled, so it seemed to be the most maintainable solution to implement the clone/update and clean up in a few lines of shell code instead. Related: OS#3385 Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd --- A contrib/jenkins-build-manuals.sh M contrib/jenkins-make-check-and-run.sh 2 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/13/12213/3 -- To view, visit https://gerrit.osmocom.org/12213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd Gerrit-Change-Number: 12213 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 11:57:09 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 11:57:09 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins*: build and publish manuals In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12213 to look at the new patch set (#4). Change subject: contrib/jenkins*: build and publish manuals ...................................................................... contrib/jenkins*: build and publish manuals Add contrib/jenkins-build-manuals.sh, which clones or updates osmo-gsm-manuals and builds the manuals. When the environment variable PUBLISH=1 is set, it also uploads them. Call jenkins-build-manuals.sh from jenkins-run.sh, without PUBLISH=1, so the manuals get build-tested in the osmo-gsm-tester_gerrit job. A new job master-osmo-gsm-tester will be added in the future, which will run PUBLISH=1 jenkins-build-manuals.sh. The jenkins-build-manuals.sh script does not use the osmo-ci.git scripts for installing dependencies and cleaning up the workspace. These scripts are not available on the node, which runs the osmo-gsm-tester_gerrit job, and it is not trivial to add just them (without building the osmo-ci Docker image etc.). The only dependency is osmo-gsm-manuals, and it does not need to be compiled, so it seemed to be the most maintainable solution to implement the clone/update and clean up in a few lines of shell code instead. Related: OS#3385 Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd --- A contrib/jenkins-build-manuals.sh M contrib/jenkins-make-check-and-run.sh 2 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/13/12213/4 -- To view, visit https://gerrit.osmocom.org/12213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd Gerrit-Change-Number: 12213 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:02:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 12:02:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_chan_exhaustion: Send correct RA to alloc all different channels Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12215 Change subject: bsc: TC_chan_exhaustion: Send correct RA to alloc all different channels ...................................................................... bsc: TC_chan_exhaustion: Send correct RA to alloc all different channels Previous RA value (23, Establishment cause = 0010XXXX) meant MS was dual rate capable but was asking speciifically for only TCH/F channel. As a result, TCH/H was not being allocated and an immediate assignment reject was sent. Change-Id: I3e58592c661fc004e648dbe46b67a3b3f5a20bc8 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/12215/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index aaa4580..77da306 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -489,9 +489,11 @@ chreq_total := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total"); chreq_nochan := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:no_channel"); - /* expect 5xTCH/F to succeed */ + /* GSM 04.08 Table 9.9a: + * RA = '33'O -> Establishment cause = 0011xxxx (MS dual rate capable and asks for "TCH/H or TCH/F"). + * With current setup, expect 4xSDCCH + 4xTCH/F + 1xTCH/H to succeed */ for (i := 0; i < NUM_TCHF_PER_BTS + NUM_TCHH_PER_BTS + NUM_SDCCH_PER_BTS; i := i+1) { - var RslChannelNr chan_nr := f_chreq_act_ack('23'O, i); + var RslChannelNr chan_nr := f_chreq_act_ack('33'O, i); } IPA_RSL[0].clear; -- To view, visit https://gerrit.osmocom.org/12215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3e58592c661fc004e648dbe46b67a3b3f5a20bc8 Gerrit-Change-Number: 12215 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:04:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 12:04:09 +0000 Subject: Change in libosmocore[master]: Constify llist_count() parameter In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12214 ) Change subject: Constify llist_count() parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I414e67a3de733fab407161b3264d3b89070ba537 Gerrit-Change-Number: 12214 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 12:04:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 10 12:05:27 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 12:05:27 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB_?= =?UTF-8?Q?lc15,v2017.01,0,default,osmocom-master-debian9_#1532?= In-Reply-To: <1663740393.1199.1544436949311.JavaMail.jenkins@jenkins.osmocom.org> References: <1663740393.1199.1544436949311.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <407546040.1204.1544443527534.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Dec 10 12:05:41 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 12:05:41 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB_lc15, o?= =?UTF-8?Q?rigin/nrw/litecell15,0,default,osmocom-master-debian9_#1532?= In-Reply-To: <1680009820.1200.1544437034681.JavaMail.jenkins@jenkins.osmocom.org> References: <1680009820.1200.1544437034681.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <948360682.1205.1544443541323.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:06:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 12:06:03 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins*: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12213 ) Change subject: contrib/jenkins*: build and publish manuals ...................................................................... Patch Set 4: Well osmo-gsm-tester main unit currently can only run 1 job at a time, seuqnetially, and right now it's running the TTCN3 tests on real HW, which may take around 30min - 1 hour :) -- To view, visit https://gerrit.osmocom.org/12213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd Gerrit-Change-Number: 12213 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:06:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:07:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 12:07:05 +0000 Subject: Change in docker-playground[master]: gerrit: fix libopenid path In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12204 ) Change subject: gerrit: fix libopenid path ...................................................................... Patch Set 1: > > How it comes the name is now different? > > Upstream change. I could not find the specific commit in the > upstream source with a quick search, but I am not sure if it's that > helpful to have it. OK but at least specify it's due to an upstream change in the commit description then. -- To view, visit https://gerrit.osmocom.org/12204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 Gerrit-Change-Number: 12204 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 12:07:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 10 12:10:36 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 12:10:36 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-asn1c_=C2=BB_a1=3Ddefault,?= =?UTF-8?Q?a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#334?= In-Reply-To: <448732333.1181.1544368207541.JavaMail.jenkins@jenkins.osmocom.org> References: <448732333.1181.1544368207541.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <455647176.1206.1544443836441.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Dec 10 12:11:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 12:11:30 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu?= =?UTF-8?Q?_=C2=BB_master,0,osmocom-master-debian9,lc15,True_#1058?= In-Reply-To: <381303451.1201.1544437620178.JavaMail.jenkins@jenkins.osmocom.org> References: <381303451.1201.1544437620178.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <604900010.1207.1544443890651.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:12:02 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:12:02 +0000 Subject: Change in sandbox[master]: new file: 3 Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12216 Change subject: new file: 3 ...................................................................... new file: 3 Change-Id: Ifec15b8fcfd3585c253844687ced2d5cd6ef7282 --- A 3 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/sandbox refs/changes/16/12216/1 diff --git a/3 b/3 new file mode 100644 index 0000000..5cad487 --- /dev/null +++ b/3 @@ -0,0 +1 @@ +can we count to three now? -- To view, visit https://gerrit.osmocom.org/12216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifec15b8fcfd3585c253844687ced2d5cd6ef7282 Gerrit-Change-Number: 12216 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:12:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 12:12:03 +0000 Subject: Change in libosmo-netif[master]: logging: fix typo in stream.c Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12217 Change subject: logging: fix typo in stream.c ...................................................................... logging: fix typo in stream.c Change-Id: I5dcae1f19e18f04709ce7585943af1d582ebc7ed --- M src/stream.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/17/12217/1 diff --git a/src/stream.c b/src/stream.c index 4548414..902e688 100644 --- a/src/stream.c +++ b/src/stream.c @@ -91,7 +91,7 @@ &event, sizeof(event)); if (rc < 0) - LOGP(DLINP, LOGL_ERROR, "coudldn't activate SCTP events " + LOGP(DLINP, LOGL_ERROR, "couldn't activate SCTP events " "on FD %u\n", fd); return rc; #else -- To view, visit https://gerrit.osmocom.org/12217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5dcae1f19e18f04709ce7585943af1d582ebc7ed Gerrit-Change-Number: 12217 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:12:36 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:12:36 +0000 Subject: Change in sandbox[master]: new file: 3 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12216 ) Change subject: new file: 3 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifec15b8fcfd3585c253844687ced2d5cd6ef7282 Gerrit-Change-Number: 12216 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:12:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 10 12:13:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 12:13:23 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu_?= =?UTF-8?Q?=C2=BB_v2017.01,0,osmocom-master-debian9,lc15,True_#1058?= In-Reply-To: <1132115589.1202.1544437636172.JavaMail.jenkins@jenkins.osmocom.org> References: <1132115589.1202.1544437636172.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1651425556.1208.1544444003736.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Dec 10 12:15:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 12:15:14 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu_=C2=BB_origi?= =?UTF-8?Q?n/nrw/litecell15,0,osmocom-master-debian9,lc15,True_#1058?= In-Reply-To: <1366664185.1203.1544437687404.JavaMail.jenkins@jenkins.osmocom.org> References: <1366664185.1203.1544437687404.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <33137657.1209.1544444114001.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:15:23 2018 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Mon, 10 Dec 2018 12:15:23 +0000 Subject: Change in sandbox[master]: new file: 3 In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/12216 ) Change subject: new file: 3 ...................................................................... Patch Set 1: Code-Review+2 Nice ! -- To view, visit https://gerrit.osmocom.org/12216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifec15b8fcfd3585c253844687ced2d5cd6ef7282 Gerrit-Change-Number: 12216 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: tnt Gerrit-Comment-Date: Mon, 10 Dec 2018 12:15:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:17:01 2018 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Mon, 10 Dec 2018 12:17:01 +0000 Subject: Change in sandbox[master]: new file: 3 In-Reply-To: References: Message-ID: tnt has removed a vote on this change. Change subject: new file: 3 ...................................................................... Removed Code-Review+2 by tnt -- To view, visit https://gerrit.osmocom.org/12216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ifec15b8fcfd3585c253844687ced2d5cd6ef7282 Gerrit-Change-Number: 12216 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:17:13 2018 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Mon, 10 Dec 2018 12:17:13 +0000 Subject: Change in sandbox[master]: new file: 3 In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/12216 ) Change subject: new file: 3 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifec15b8fcfd3585c253844687ced2d5cd6ef7282 Gerrit-Change-Number: 12216 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: tnt Gerrit-Comment-Date: Mon, 10 Dec 2018 12:17:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:18:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 12:18:16 +0000 Subject: Change in libosmocore[master]: add osmo_bcd2str() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12153 ) Change subject: add osmo_bcd2str() ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12153/4/src/utils.c File src/utils.c: https://gerrit.osmocom.org/#/c/12153/4/src/utils.c at 154 PS4, Line 154: *dst = osmo_bcd2char(nibble); Hmm, I think while at it I should add optional bcd char verification. AFAICT bcd means 0-9, but osmo_bcd2char() returns [0-9A-F], so maybe some bcd out there is more than binary-coded-DECIMAL: bch? -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 12:18:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:20:55 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:20:55 +0000 Subject: Change in docker-playground[master]: gerrit: fix libopenid path In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12204 ) Change subject: gerrit: fix libopenid path ...................................................................... gerrit: fix libopenid path Update the path to libopenid.jar, to fix the following error and make the container build again. This change is necessary, because we are patching a file inside "gerrit.war", and the path to that file has been changed upstream. Step 4/8 : RUN unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/gerrit-openid-libopenid.jar ... ---> Running in 815585d87fdd Archive: /var/gerrit/bin/gerrit.war caution: filename not matched: WEB-INF/lib/gerrit-openid-libopenid.jar Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 --- M gerrit/Dockerfile 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/04/12204/2 -- To view, visit https://gerrit.osmocom.org/12204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 Gerrit-Change-Number: 12204 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:20:55 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:20:55 +0000 Subject: Change in docker-playground[master]: cosmetic: gerrit: use variables for the files to patch In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12205 to look at the new patch set (#2). Change subject: cosmetic: gerrit: use variables for the files to patch ...................................................................... cosmetic: gerrit: use variables for the files to patch Make the code more readable, and make it easier to update the paths if they should change again. Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771 --- M gerrit/Dockerfile 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/05/12205/2 -- To view, visit https://gerrit.osmocom.org/12205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771 Gerrit-Change-Number: 12205 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:21:30 2018 From: gerrit-no-reply at lists.osmocom.org (steve-m) Date: Mon, 10 Dec 2018 12:21:30 +0000 Subject: Change in sandbox[master]: new file: 3 In-Reply-To: References: Message-ID: steve-m has posted comments on this change. ( https://gerrit.osmocom.org/12216 ) Change subject: new file: 3 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifec15b8fcfd3585c253844687ced2d5cd6ef7282 Gerrit-Change-Number: 12216 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: steve-m Gerrit-Reviewer: tnt Gerrit-Comment-Date: Mon, 10 Dec 2018 12:21:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:21:31 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:21:31 +0000 Subject: Change in docker-playground[master]: gerrit: fix libopenid path In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12204 ) Change subject: gerrit: fix libopenid path ...................................................................... Patch Set 2: > OK but at least specify it's due to an upstream change in the commit description then. Right, done. -- To view, visit https://gerrit.osmocom.org/12204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 Gerrit-Change-Number: 12204 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 12:21:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:22:44 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:22:44 +0000 Subject: Change in sandbox[master]: new file: 3 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12216 ) Change subject: new file: 3 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifec15b8fcfd3585c253844687ced2d5cd6ef7282 Gerrit-Change-Number: 12216 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: steve-m Gerrit-Reviewer: tnt Gerrit-Comment-Date: Mon, 10 Dec 2018 12:22:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:22:48 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:22:48 +0000 Subject: Change in sandbox[master]: new file: 3 In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12216 ) Change subject: new file: 3 ...................................................................... new file: 3 Change-Id: Ifec15b8fcfd3585c253844687ced2d5cd6ef7282 --- A 3 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve; Verified tnt: Looks good to me, but someone else must approve steve-m: Looks good to me, but someone else must approve diff --git a/3 b/3 new file mode 100644 index 0000000..5cad487 --- /dev/null +++ b/3 @@ -0,0 +1 @@ +can we count to three now? -- To view, visit https://gerrit.osmocom.org/12216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifec15b8fcfd3585c253844687ced2d5cd6ef7282 Gerrit-Change-Number: 12216 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: steve-m Gerrit-Reviewer: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:44:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:44:34 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12218 Change subject: What about -1 vote counting? ...................................................................... What about -1 vote counting? Say User1 put -1 on the patch, User2 put +1 and User3 put +2. Can the patch be merged in this case? Essentially, does substraction works as well as deletion? (that's what Max asked on the ML. Let's find out.) Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 --- D 3 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/sandbox refs/changes/18/12218/1 diff --git a/3 b/3 deleted file mode 100644 index 5cad487..0000000 --- a/3 +++ /dev/null @@ -1 +0,0 @@ -can we count to three now? -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:45:03 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:45:03 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review-1 Here's the -1 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:45:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:46:32 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 12:46:32 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review-1 I hate everything about this patch passionately :-D -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:46:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:46:48 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 12:46:48 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review+1 Changed my mind :-P -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:46:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:50:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 12:50:22 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:50:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:52:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 12:52:01 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Pau Espin Pedrol has removed a vote on this change. Change subject: What about -1 vote counting? ...................................................................... Removed Code-Review+1 by Pau Espin Pedrol -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:52:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 12:52:04 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:52:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:52:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 12:52:35 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:52:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:52:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:52:41 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:52:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:52:51 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:52:51 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: -Verified -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:52:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:53:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 12:53:14 +0000 Subject: Change in libosmocore[master]: add osmo_bcd2str() In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12153 to look at the new patch set (#5). Change subject: add osmo_bcd2str() ...................................................................... add osmo_bcd2str() Add a standalone bcd-to-string conversion function with generic parameters. Add a regression test in utils_test.c. So far there is no single universal implementation that converts a BCD to a string. I could only find gsm48_mi_to_string(), which also interprets surrounding bytes, MI type and TMSI as non-BCD value. The idea is to use this function from gsm48_mi_to_string() and similar implementations in subsequent commits. Root cause: in osmo-msc, I want to have an alternative MI-to-string function for composing an FSM name, which needs the BCD part of gsm48_mi_to_string() but not the TMSI part. Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 --- M include/osmocom/core/utils.h M src/utils.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 4 files changed, 188 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/53/12153/5 -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:53:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 12:53:14 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12154 to look at the new patch set (#5). Change subject: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases ...................................................................... gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases By using osmo_bcd2str(), ensure that the resulting string is always nul terminated, and always return strlen()+1 whether truncated or not. Still keep up the previous return value style, even if that isn't consistent at all. The difference between IMSI/IMEI and TMSI return values remains and is not part of this patch. Change-Id: I1b51b72a721e1cc9d69796b804ebda741ff0f36b --- M src/gsm/gsm48.c M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 3 files changed, 24 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/12154/5 -- To view, visit https://gerrit.osmocom.org/12154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1b51b72a721e1cc9d69796b804ebda741ff0f36b Gerrit-Change-Number: 12154 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:53:46 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:53:46 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:53:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:56:33 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 10 Dec 2018 12:56:33 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: So with -1, +1, +2 (as asked in the question), the patch can not be merged. -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:56:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:56:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 12:56:37 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:56:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 12:57:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 12:57:19 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 12:57:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:03:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 13:03:16 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 13:03:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:03:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 13:03:31 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 13:03:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:09:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 13:09:54 +0000 Subject: Change in osmo-msc[master]: ASS-COMPL: do not fire Sec Mode Compl event In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12200 ) Change subject: ASS-COMPL: do not fire Sec Mode Compl event ...................................................................... Patch Set 1: Code-Review+2 this simply makes sense. -- To view, visit https://gerrit.osmocom.org/12200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I448fdb783364628005437b3d866d1a076a9767d7 Gerrit-Change-Number: 12200 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 13:09:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:09:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 13:09:59 +0000 Subject: Change in osmo-msc[master]: ASS-COMPL: do not fire Sec Mode Compl event In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12200 ) Change subject: ASS-COMPL: do not fire Sec Mode Compl event ...................................................................... ASS-COMPL: do not fire Sec Mode Compl event BSSMAP Assignment Complete: Do not invoke ran_conn_rx_sec_mode_compl(), that's just weird. Instead this should call msc_assign_compl(), which is currently dead code and does nothing ... and there are some more strings attached, being resolved in a subsequent patch. Change-Id: I448fdb783364628005437b3d866d1a076a9767d7 --- M src/libmsc/a_iface_bssap.c 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index a10bd42..d84a234 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -579,10 +579,6 @@ return -EINVAL; } - /* FIXME: Seems to be related to authentication or, - encryption. Is this really in the right place? */ - ran_conn_rx_sec_mode_compl(conn); - return 0; } -- To view, visit https://gerrit.osmocom.org/12200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I448fdb783364628005437b3d866d1a076a9767d7 Gerrit-Change-Number: 12200 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:15:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 13:15:27 +0000 Subject: Change in osmo-msc[master]: move ASS-COMPL MGCP handling out of a_iface_bssap.c In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12201 to look at the new patch set (#2). Change subject: move ASS-COMPL MGCP handling out of a_iface_bssap.c ...................................................................... move ASS-COMPL MGCP handling out of a_iface_bssap.c BSSMAP Assignment Complete: sort MGCP handling upon Assignment Complete to the proper locations. a_iface_bssap.c is not the right place to invoke the MGCP related procedures. - in a_iface_bssap.c only decode the IEs. - call ran_conn_assign_compl() and pass decoded values. - drop msc_assign_compl(), it was dead code; instead: - add ran_conn_assign_compl() - pass on all MGCP related info to msc_mgcp_ass_complete() - move all MGCP ctx related handling from a_iface_bssap.c to msc_mgcp.c. I'm dropping some comments to save some time, because if I adjust them IMHO they would still anyway restate the obvious. ran_conn_assign_compl() is now quite a thin shim, but it makes sense to have it: - This is the place that should tear down the ran_conn in case assignment failed, left for a future patch. - In the light of upcoming inter-MSC handover, ran_conn_assign_compl() will be the place where the Assignment Complete message might be relayed to a remote MSC. Change-Id: I8137215c443239bddf3e69b5715839a365b73b6c --- M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/ran_conn.h M src/libmsc/a_iface_bssap.c M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 5 files changed, 82 insertions(+), 88 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/01/12201/2 -- To view, visit https://gerrit.osmocom.org/12201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8137215c443239bddf3e69b5715839a365b73b6c Gerrit-Change-Number: 12201 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:16:40 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 13:16:40 +0000 Subject: Change in osmo-hlr[master]: display last location update timestamp in vty In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12202 to look at the new patch set (#2). Change subject: display last location update timestamp in vty ...................................................................... display last location update timestamp in vty Read the subscriber's last location update timestamp from the database and display it in the output of 'show subscriber'. For example: OsmoHLR> show subscriber id 1 ID: 1 IMSI: 123456789000000 MSISDN: 543210123456789 VLR number: 712 SGSN number: 5952 last LU seen: Fri Dec 7 11:30:51 2018 UTC While the database stores the timestamp as a string, we convert the timestamp into time_t for internal use. This allows for flexible potential use of the timestamp in contexts other than the VTY in the future. The timestamp displayed in the VTY is created with ctime_r(3). It does not match the format of the raw string in the database: sqlite> select id,last_lu_seen from subscriber; 1|2018-12-07 11:30:51 Related: OS#2838 Change-Id: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a --- M src/db.h M src/db_hlr.c M src/hlr_vty_subscr.c 3 files changed, 44 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/02/12202/2 -- To view, visit https://gerrit.osmocom.org/12202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a Gerrit-Change-Number: 12202 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:18:53 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 13:18:53 +0000 Subject: Change in osmo-hlr[master]: display last location update timestamp in vty In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12202 ) Change subject: display last location update timestamp in vty ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/#/c/12202/1/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12202/1/src/db_hlr.c at 430 PS1, Line 430: if (last_lu_seen_str && last_lu_seen_str[0] != '\0') { > Move it to the start of the function. Done in next patch set. https://gerrit.osmocom.org/#/c/12202/1/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12202/1/src/hlr_vty_subscr.c at 39 PS1, Line 39: get_datestr(const time_t *t, char *datebuf) > 'const time_t *' to clearly indicate it's an input? Yes, it is better with const. Thanks. https://gerrit.osmocom.org/#/c/12202/1/src/hlr_vty_subscr.c at 44 PS1, Line 44: p = strchr(s, '\n'); > Reading in the man page that it adds \n at the end -> lol Yes the ctime_r interface is quite odd. -- To view, visit https://gerrit.osmocom.org/12202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a Gerrit-Change-Number: 12202 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 10 Dec 2018 13:18:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:21:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 13:21:19 +0000 Subject: Change in osmo-msc[master]: move ASS-COMPL MGCP handling out of a_iface_bssap.c In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12201 to look at the new patch set (#3). Change subject: move ASS-COMPL MGCP handling out of a_iface_bssap.c ...................................................................... move ASS-COMPL MGCP handling out of a_iface_bssap.c BSSMAP Assignment Complete: sort MGCP handling upon Assignment Complete to the proper locations. a_iface_bssap.c is not the right place to invoke the MGCP related procedures. - in a_iface_bssap.c only decode the IEs. - call ran_conn_assign_compl() and pass decoded values. - drop msc_assign_compl(), it was dead code; instead: - add ran_conn_assign_compl() - pass on all MGCP related info to msc_mgcp_ass_complete() - move all MGCP ctx related handling from a_iface_bssap.c to msc_mgcp.c. I'm dropping some comments to save some time, because if I adjust them IMHO they would still anyway restate the obvious. ran_conn_assign_compl() is now quite a thin shim, but it makes sense to have it: - This is the place that should tear down the ran_conn in case assignment failed, left for a future patch. - In the light of upcoming inter-MSC handover, ran_conn_assign_compl() will be the place where the Assignment Complete message might be relayed to a remote MSC. Change-Id: I8137215c443239bddf3e69b5715839a365b73b6c --- M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/ran_conn.h M src/libmsc/a_iface_bssap.c M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 5 files changed, 88 insertions(+), 88 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/01/12201/3 -- To view, visit https://gerrit.osmocom.org/12201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8137215c443239bddf3e69b5715839a365b73b6c Gerrit-Change-Number: 12201 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:35:42 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 13:35:42 +0000 Subject: Change in osmo-sgsn[master]: Remove misleading comment Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12220 Change subject: Remove misleading comment ...................................................................... Remove misleading comment The code which has been used for 4 years is hardly temporary. Change-Id: Ibe9c62e0beb89eecced941b8831d49ca266c7330 --- M src/gprs/sgsn_auth.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/20/12220/1 diff --git a/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c index 694bece..e3d9127 100644 --- a/src/gprs/sgsn_auth.c +++ b/src/gprs/sgsn_auth.c @@ -43,7 +43,6 @@ INIT_LLIST_HEAD(&sgsn->cfg.imsi_acl); } -/* temporary IMSI ACL hack */ struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, struct sgsn_config *cfg) { struct imsi_acl_entry *acl; -- To view, visit https://gerrit.osmocom.org/12220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe9c62e0beb89eecced941b8831d49ca266c7330 Gerrit-Change-Number: 12220 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:35:43 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 13:35:43 +0000 Subject: Change in osmo-sgsn[master]: Use explicit parameter for sgsn_auth_init() Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12221 Change subject: Use explicit parameter for sgsn_auth_init() ...................................................................... Use explicit parameter for sgsn_auth_init() This is necessary to properly test ACLs in follow-up patches. Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1 --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_auth.c M src/gprs/sgsn_main.c M tests/sgsn/sgsn_test.c 4 files changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/21/12221/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index cf78766..e82bf70 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -459,7 +459,7 @@ struct sgsn_instance; extern const struct value_string *sgsn_auth_state_names; -void sgsn_auth_init(void); +void sgsn_auth_init(struct sgsn_instance *sgsn); struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, struct sgsn_config *cfg); int sgsn_acl_add(const char *imsi, struct sgsn_config *cfg); int sgsn_acl_del(const char *imsi, struct sgsn_config *cfg); diff --git a/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c index e3d9127..3cf700a 100644 --- a/src/gprs/sgsn_auth.c +++ b/src/gprs/sgsn_auth.c @@ -38,7 +38,7 @@ const struct value_string *sgsn_auth_state_names = auth_state_names; -void sgsn_auth_init(void) +void sgsn_auth_init(struct sgsn_instance *sgsn) { INIT_LLIST_HEAD(&sgsn->cfg.imsi_acl); } diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index 1c76d6f..798e507 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -432,7 +432,7 @@ bssgp_vty_init(); gprs_llc_vty_init(); gprs_sndcp_vty_init(); - sgsn_auth_init(); + sgsn_auth_init(sgsn); sgsn_cdr_init(sgsn); /* FIXME: register signal handler for SS_L_NS */ diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index 111515e..4c0dc00 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -1632,6 +1632,7 @@ int main(int argc, char **argv) { + struct sgsn_instance *sgsn; void *osmo_sgsn_ctx; void *msgb_ctx; @@ -1639,9 +1640,11 @@ osmo_init_logging2(osmo_sgsn_ctx, &info); tall_sgsn_ctx = talloc_named_const(osmo_sgsn_ctx, 0, "sgsn"); msgb_ctx = msgb_talloc_ctx_init(osmo_sgsn_ctx, 0); + sgsn = sgsn_instance_alloc(osmo_sgsn_ctx); + sgsn_inst_init(sgsn); sgsn_rate_ctr_init(); - sgsn_auth_init(); + sgsn_auth_init(sgsn); gprs_subscr_init(sgsn); test_llme(); -- To view, visit https://gerrit.osmocom.org/12221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1 Gerrit-Change-Number: 12221 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:35:43 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 13:35:43 +0000 Subject: Change in osmo-sgsn[master]: Constify sgsn_acl_lookup() parameter Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12222 Change subject: Constify sgsn_acl_lookup() parameter ...................................................................... Constify sgsn_acl_lookup() parameter This requires I414e67a3de733fab407161b3264d3b89070ba537 in libosmocore to avoid warning about discarded const. Change-Id: Ie92637dd900b0f9eba891d5aad0b4ba0ee69c08c --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_auth.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/22/12222/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index e82bf70..b6afe69 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -460,7 +460,7 @@ extern const struct value_string *sgsn_auth_state_names; void sgsn_auth_init(struct sgsn_instance *sgsn); -struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, struct sgsn_config *cfg); +struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, const struct sgsn_config *cfg); int sgsn_acl_add(const char *imsi, struct sgsn_config *cfg); int sgsn_acl_del(const char *imsi, struct sgsn_config *cfg); /* Request authorization */ diff --git a/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c index 3cf700a..b8d8035 100644 --- a/src/gprs/sgsn_auth.c +++ b/src/gprs/sgsn_auth.c @@ -43,7 +43,7 @@ INIT_LLIST_HEAD(&sgsn->cfg.imsi_acl); } -struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, struct sgsn_config *cfg) +struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, const struct sgsn_config *cfg) { struct imsi_acl_entry *acl; llist_for_each_entry(acl, &cfg->imsi_acl, list) { -- To view, visit https://gerrit.osmocom.org/12222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie92637dd900b0f9eba891d5aad0b4ba0ee69c08c Gerrit-Change-Number: 12222 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:35:43 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 13:35:43 +0000 Subject: Change in osmo-sgsn[master]: Add sgsn_acl_count() Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12223 Change subject: Add sgsn_acl_count() ...................................................................... Add sgsn_acl_count() This is necessary to properly test ACLs in follow-up patches. Change-Id: Ia7c5b36d07672ea43bfa2b531b9b6c56ba65161d --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_auth.c 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/23/12223/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index b6afe69..5d08d66 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -463,6 +463,8 @@ struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, const struct sgsn_config *cfg); int sgsn_acl_add(const char *imsi, struct sgsn_config *cfg); int sgsn_acl_del(const char *imsi, struct sgsn_config *cfg); +size_t sgsn_acl_count(const struct sgsn_config *cfg); + /* Request authorization */ int sgsn_auth_request(struct sgsn_mm_ctx *mm); enum sgsn_auth_state sgsn_auth_state(struct sgsn_mm_ctx *mm); diff --git a/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c index b8d8035..0a39da4 100644 --- a/src/gprs/sgsn_auth.c +++ b/src/gprs/sgsn_auth.c @@ -53,6 +53,11 @@ return NULL; } +size_t sgsn_acl_count(const struct sgsn_config *cfg) +{ + return llist_count(&cfg->imsi_acl); +} + int sgsn_acl_add(const char *imsi, struct sgsn_config *cfg) { struct imsi_acl_entry *acl; -- To view, visit https://gerrit.osmocom.org/12223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7c5b36d07672ea43bfa2b531b9b6c56ba65161d Gerrit-Change-Number: 12223 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:35:43 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 13:35:43 +0000 Subject: Change in osmo-sgsn[master]: Use libosmocore constant for IMSI length in ACL entry Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12224 Change subject: Use libosmocore constant for IMSI length in ACL entry ...................................................................... Use libosmocore constant for IMSI length in ACL entry Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 --- M include/osmocom/sgsn/gprs_sgsn.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/24/12224/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 5d08d66..fcf4d5d 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -414,7 +414,7 @@ */ struct imsi_acl_entry { struct llist_head list; - char imsi[16+1]; + char imsi[GSM23003_IMSI_MAX_DIGITS + 2]; }; /* see GSM 09.02, 17.7.1, PDP-Context and GPRSSubscriptionData */ -- To view, visit https://gerrit.osmocom.org/12224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 Gerrit-Change-Number: 12224 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:35:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 13:35:44 +0000 Subject: Change in osmo-sgsn[master]: ACL: move allocation check forward in sgsn_acl_add() Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12225 Change subject: ACL: move allocation check forward in sgsn_acl_add() ...................................................................... ACL: move allocation check forward in sgsn_acl_add() There's no point in looking up existing ACL if we could not add new entry anyway due to memory allocation issues. This optimization will also simplify integrating IMSI sanitizer in follow-up patches. Change-Id: I5906304fd3c96002ca1fdc649609e5a4d9ca299b --- M src/gprs/sgsn_auth.c 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/25/12225/1 diff --git a/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c index 0a39da4..5a62476 100644 --- a/src/gprs/sgsn_auth.c +++ b/src/gprs/sgsn_auth.c @@ -60,14 +60,13 @@ int sgsn_acl_add(const char *imsi, struct sgsn_config *cfg) { - struct imsi_acl_entry *acl; + struct imsi_acl_entry *acl = talloc_zero(NULL, struct imsi_acl_entry); + if (!acl) + return -ENOMEM; if (sgsn_acl_lookup(imsi, cfg)) return -EEXIST; - acl = talloc_zero(NULL, struct imsi_acl_entry); - if (!acl) - return -ENOMEM; osmo_strlcpy(acl->imsi, imsi, sizeof(acl->imsi)); llist_add(&acl->list, &cfg->imsi_acl); -- To view, visit https://gerrit.osmocom.org/12225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5906304fd3c96002ca1fdc649609e5a4d9ca299b Gerrit-Change-Number: 12225 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:35:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 13:35:44 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12226 Change subject: Add tests for IMSI ACLs ...................................................................... Add tests for IMSI ACLs Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 --- M tests/sgsn/sgsn_test.c M tests/sgsn/sgsn_test.ok 2 files changed, 115 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/26/12226/1 diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index 4c0dc00..21bff5c 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -1337,6 +1337,108 @@ cleanup_test(); } +static bool add_check_acl(const char *imsi, struct sgsn_config *cfg) +{ + struct imsi_acl_entry *e; + size_t old = sgsn_acl_count(cfg), new; + int rc; + + printf("[%zu] Adding ACL %s [%zu]... ", old, imsi, strlen(imsi)); + + rc = sgsn_acl_add(imsi, cfg); + new = sgsn_acl_count(cfg); + + if (rc < 0) { + printf("failed to add acl %s, total entries %zu\n", imsi, new); + return false; + } + + if (new - old != 1) { + printf("failed to add acl %s: incorrect number of total entries %zu\n", imsi, new); + return false; + } + + e = sgsn_acl_lookup(imsi, cfg); + if (e) + printf("added as %s [%zu], total entries %zu\n", e->imsi, strlen(e->imsi), new); + else { + printf("failed to obtain added %s entry, total entries %zu\n", imsi, new); + return false; + } + + return true; +} + +static bool del_check_acl(const char *imsi, struct sgsn_config *cfg) +{ + size_t old = sgsn_acl_count(cfg), new; + int rc; + + printf("[%zu] Removing ACL %s... ", old, imsi); + + rc = sgsn_acl_del(imsi, cfg); + new = sgsn_acl_count(cfg); + + if (rc < 0) { + printf("failed to remove acl %s, total entries %zu\n", imsi, sgsn_acl_count(cfg)); + if (new != old) + printf("\tincorrect number of total entries %zu\n", new); + return false; + } + + if (old - new != 1) { + printf("failed to remove acl %s: incorrect number of total entries %zu\n", imsi, new); + return false; + } + + printf("OK, total entries %zu\n", new); + + return true; +} + +static void test_imsi_acl(struct sgsn_config *cfg) +{ + printf("Testing IMSI ACLs\n"); + + /* add short IMSI */ + if (!add_check_acl("1010000000016", cfg)) + return; + + /* add complete IMSI */ + if (!add_check_acl("001010000000011", cfg)) + return; + if (!add_check_acl("001010000000012", cfg)) + return; + if (!add_check_acl("001010000000013", cfg)) + return; + + /* delete non-existent - should fail: */ + if (del_check_acl("666010000000012", cfg)) + return; + + /* delete existent short */ + if (!del_check_acl("1010000000016", cfg)) + return; + + /* delete existent complete */ + if (!del_check_acl("001010000000012", cfg)) + return; + if (!del_check_acl("001010000000011", cfg)) + return; + if (!del_check_acl("001010000000013", cfg)) + return; + + /* double-delete - should fail: */ + if (del_check_acl("001010000000013", cfg)) + return; + + /* add long IMSI - should fail: */ + if (add_check_acl("00101002222222222222222200000011", cfg)) + return; + + cleanup_test(); +} + static void test_apn_matching(void) { struct apn_ctx *actx, *actxs[9]; @@ -1660,6 +1762,7 @@ test_gmm_cancel(); test_apn_matching(); test_ggsn_selection(); + test_imsi_acl(&sgsn->cfg); printf("Done\n"); talloc_report_full(osmo_sgsn_ctx, stderr); diff --git a/tests/sgsn/sgsn_test.ok b/tests/sgsn/sgsn_test.ok index e7e7cf6..3d63a63 100644 --- a/tests/sgsn/sgsn_test.ok +++ b/tests/sgsn/sgsn_test.ok @@ -24,4 +24,16 @@ Testing cancellation Testing APN matching Testing GGSN selection +Testing IMSI ACLs +[0] Adding ACL 1010000000016 [13]... added as 1010000000016 [13], total entries 1 +[1] Adding ACL 001010000000011 [15]... added as 001010000000011 [15], total entries 2 +[2] Adding ACL 001010000000012 [15]... added as 001010000000012 [15], total entries 3 +[3] Adding ACL 001010000000013 [15]... added as 001010000000013 [15], total entries 4 +[4] Removing ACL 666010000000012... failed to remove acl 666010000000012, total entries 4 +[4] Removing ACL 1010000000016... OK, total entries 3 +[3] Removing ACL 001010000000012... OK, total entries 2 +[2] Removing ACL 001010000000011... OK, total entries 1 +[1] Removing ACL 001010000000013... OK, total entries 0 +[0] Removing ACL 001010000000013... failed to remove acl 001010000000013, total entries 0 +[0] Adding ACL 00101002222222222222222200000011 [32]... failed to obtain added 00101002222222222222222200000011 entry, total entries 1 Done -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:35:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 13:35:44 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12227 Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... ACL: integrate sanitize check into sgsn_acl_* functions Having this check in vty makes it hard to unit-test. Let's move this into separate static function and use it directly from sgsn_acl_* functions. Adjust test output accordingly. Related: SYS#4300 Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 --- M src/gprs/sgsn_auth.c M src/gprs/sgsn_vty.c M tests/sgsn/sgsn_test.ok 3 files changed, 27 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/27/12227/1 diff --git a/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c index 5a62476..895cef3 100644 --- a/src/gprs/sgsn_auth.c +++ b/src/gprs/sgsn_auth.c @@ -43,11 +43,30 @@ INIT_LLIST_HEAD(&sgsn->cfg.imsi_acl); } +static bool imsi_sanitize(char *dst, size_t dst_len, const char *imsi) +{ + size_t len = strnlen(imsi, GSM23003_IMSI_MAX_DIGITS + 1); + + memset(dst, '0', dst_len); + + if (len > GSM23003_IMSI_MAX_DIGITS) + return true; + + osmo_strlcpy(dst + GSM23003_IMSI_MAX_DIGITS - len, imsi, dst_len - (GSM23003_IMSI_MAX_DIGITS - len)); + + return false; +} + struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, const struct sgsn_config *cfg) { + char imsi_sanitized[GSM23003_IMSI_MAX_DIGITS + 1]; struct imsi_acl_entry *acl; + + if (imsi_sanitize(imsi_sanitized, sizeof(imsi_sanitized), imsi)) + return NULL; + llist_for_each_entry(acl, &cfg->imsi_acl, list) { - if (!strcmp(imsi, acl->imsi)) + if (!strcmp(imsi_sanitized, acl->imsi)) return acl; } return NULL; @@ -67,7 +86,8 @@ if (sgsn_acl_lookup(imsi, cfg)) return -EEXIST; - osmo_strlcpy(acl->imsi, imsi, sizeof(acl->imsi)); + if (imsi_sanitize(acl->imsi, sizeof(acl->imsi), imsi)) + return -EINVAL; llist_add(&acl->list, &cfg->imsi_acl); diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 601b3c5..7c972e1 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -634,29 +634,16 @@ "Remove IMSI from ACL\n" "IMSI of subscriber\n") { - char imsi_sanitized[GSM23003_IMSI_MAX_DIGITS + 1] = { '0' }; const char *op = argv[0]; - const char *imsi = imsi_sanitized; - size_t len = strnlen(argv[1], GSM23003_IMSI_MAX_DIGITS + 1); int rc; - /* Sanitize IMSI */ - if (len > GSM23003_IMSI_MAX_DIGITS) { - vty_out(vty, "%% IMSI (%s) too long (max %u digits) -- ignored!%s", - argv[1], GSM23003_IMSI_MAX_DIGITS, VTY_NEWLINE); - return CMD_WARNING; - } - - osmo_strlcpy(imsi_sanitized + GSM23003_IMSI_MAX_DIGITS - len, argv[1], - sizeof(imsi_sanitized) - (GSM23003_IMSI_MAX_DIGITS - len)); - if (!strcmp(op, "add")) - rc = sgsn_acl_add(imsi, g_cfg); + rc = sgsn_acl_add(argv[1], g_cfg); else - rc = sgsn_acl_del(imsi, g_cfg); + rc = sgsn_acl_del(argv[1], g_cfg); if (rc < 0) { - vty_out(vty, "%% unable to %s ACL%s", op, VTY_NEWLINE); + vty_out(vty, "%% unable to %s ACL%s: %s", op, strerror(-rc), VTY_NEWLINE); return CMD_WARNING; } diff --git a/tests/sgsn/sgsn_test.ok b/tests/sgsn/sgsn_test.ok index 3d63a63..1a39e6e 100644 --- a/tests/sgsn/sgsn_test.ok +++ b/tests/sgsn/sgsn_test.ok @@ -25,7 +25,7 @@ Testing APN matching Testing GGSN selection Testing IMSI ACLs -[0] Adding ACL 1010000000016 [13]... added as 1010000000016 [13], total entries 1 +[0] Adding ACL 1010000000016 [13]... added as 001010000000016 [15], total entries 1 [1] Adding ACL 001010000000011 [15]... added as 001010000000011 [15], total entries 2 [2] Adding ACL 001010000000012 [15]... added as 001010000000012 [15], total entries 3 [3] Adding ACL 001010000000013 [15]... added as 001010000000013 [15], total entries 4 @@ -35,5 +35,5 @@ [2] Removing ACL 001010000000011... OK, total entries 1 [1] Removing ACL 001010000000013... OK, total entries 0 [0] Removing ACL 001010000000013... failed to remove acl 001010000000013, total entries 0 -[0] Adding ACL 00101002222222222222222200000011 [32]... failed to obtain added 00101002222222222222222200000011 entry, total entries 1 +[0] Adding ACL 00101002222222222222222200000011 [32]... failed to add acl 00101002222222222222222200000011, total entries 0 Done -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:37:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 13:37:30 +0000 Subject: Change in osmo-bsc[master]: set gscon FSM instances' log level to DEBUG In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12211 ) Change subject: set gscon FSM instances' log level to DEBUG ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12211/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12211/1//COMMIT_MSG at 11 PS1, Line 11: the passed level and the FSM instance's level. Too noisy! > Why do we do the max() instead of simply using the log level passed by the macro? that looks really [?] that comes from the initial idea of osmo_fsm logging: At first there was no LOGPFSML -- an FSM instance would have its single log level, and all of it would log on that level. The idea was that e.g. via CTRL interface, single FSM instances (for a specific subscriber...) could be tweaked. I think the idea was that it only logs osmo_fsm internal things like state transitions. But the log context of the FSM turned out super useful: no need to manually add logging context in each LOGP() anymore, just LOGPFSM("plain string"). So then I needed to add LOGPFSML(), because even though some FSM instance might be on DEBUG, I still need to be able to e.g. LOGL_ERROR, while still using that FSM instance's logging context printout. So now the situation is that basically all FSM instances should start out on DEBUG, but individual LOGPFSML() might pass higher-prio logging levels. However, if a user lifts a specific FSM instance's log level up to say NOTICE, she wants all log messages to rise, even for LOGPFSML(LOGL_DEBUG) messages. Lifting individual FSM instances' log levels has so far not come in handy for me, it might turn out to be a non-feature. But it might become useful in combination with log filters: in systems with thousands of subscribers, we have this bitrotten feature of showing only a specific subscriber's logging, using logging filter commands. If we at some point want to fix that, it might help by automatically lifting given subscribers' FSM instances' log levels... i've been pondering that every now and then, but not figured out a proper solution yet -- To view, visit https://gerrit.osmocom.org/12211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie021483e93ab174abac51357bcca8895756566c4 Gerrit-Change-Number: 12211 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 13:37:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:38:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 13:38:00 +0000 Subject: Change in libosmocore[master]: gsm0408_test: test encoding and decoding Mobile Identity In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12151 ) Change subject: gsm0408_test: test encoding and decoding Mobile Identity ...................................................................... gsm0408_test: test encoding and decoding Mobile Identity One would think by now we would solidly encode and decode Mobile Identities. Well, guess again. - rc is sometimes the amount of bytes written, sometimes actual strlen(). - on string truncation, rc is sometimes strlen() (assuming nul terminated), and sometimes snprintf()-style would-be strlen(). - returned string, when truncated by not enough buffer size, is sometimes nul terminated, sometimes not. - gsm48_mi_to_string() happily reads a byte from zero-length input buffer. - gsm48_mi_to_string() happily writes to zero length output buffer. - gsm48_mi_to_string() returns nonempty string for empty input. - encoding a MI type that still has the GSM_MI_ODD flag set results in encoding an even-length MI as odd-length (hence appending a stray 'F'). I am going to tweak the implementation of gsm48 mobile identity encoding / decoding, so first pinpoint the current behavior in a unit test, and show how perforated even such a seemingly trivial API can be. Change-Id: Iaae3af87f82f1a8f2e6273984c011b2813038cf7 --- M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 358 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 2a0e661..24f903a 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -352,11 +352,246 @@ printf("passed: [%u] %s\n", len, osmo_hexdump(buf, len)); } +struct test_mid_encode_decode_test { + uint8_t mi_type; + const char *mi_str; + size_t str_size; + const char *expect_mi_tlv_hex; + const char *expect_str; + int expect_rc; +}; + +static const struct test_mid_encode_decode_test test_mid_encode_decode_tests[] = { + { + .mi_type = GSM_MI_TYPE_IMSI, + .mi_str = "123456789012345", + .expect_mi_tlv_hex = "17081932547698103254", + }, + { + .mi_type = GSM_MI_TYPE_IMSI, + .mi_str = "12345678901234", + .expect_mi_tlv_hex = "170811325476981032f4", + }, + { + .mi_type = GSM_MI_TYPE_IMSI, + .mi_str = "423423", + .expect_mi_tlv_hex = "1704413224f3", + }, + { + .mi_type = GSM_MI_TYPE_IMSI | GSM_MI_ODD, + .mi_str = "423423", + .expect_mi_tlv_hex = "1704493224f3", /* encodes "odd" for even number of digits! */ + }, + { + .mi_type = GSM_MI_TYPE_IMSI, + .mi_str = "4234235", + .expect_mi_tlv_hex = "170449322453", + }, + { + .mi_type = GSM_MI_TYPE_IMSI, + .mi_str = "4234235", + .expect_mi_tlv_hex = "170449322453", + .str_size = 4, + .expect_str = "423", + .expect_rc = 3, /* exception: on truncation, gsm48_mi_to_string() returns strlen(), not bytes! */ + }, + { + .mi_type = GSM_MI_TYPE_IMEI, + .mi_str = "123456789012345", + .expect_mi_tlv_hex = "17081a32547698103254", + }, + { + .mi_type = GSM_MI_TYPE_IMEI, + .mi_str = "98765432109876", + .expect_mi_tlv_hex = "170892785634129078f6", + }, + { + .mi_type = GSM_MI_TYPE_IMEI, + .mi_str = "987654321098765", + .expect_mi_tlv_hex = "17089a78563412907856", + }, + { + .mi_type = GSM_MI_TYPE_IMEISV, + .mi_str = "987654321098765432", + .expect_mi_tlv_hex = "170a937856341290785634f2", + }, + { + .mi_type = GSM_MI_TYPE_IMEISV, + .mi_str = "987654321098765432", + .expect_mi_tlv_hex = "170a937856341290785634f2", + .str_size = 16, + .expect_str = "987654321098765", + .expect_rc = 15, /* exception: on truncation, gsm48_mi_to_string() returns strlen(), not bytes! */ + }, + { + /* gsm48 treats TMSI as decimal string */ + .mi_type = GSM_MI_TYPE_TMSI, + .mi_str = "305419896", /* 0x12345678 as decimal */ + .expect_mi_tlv_hex = "1705f412345678", + .expect_rc = 9, /* exception: gsm48_mi_to_string() for TMSI returns strlen(), not bytes! */ + }, + { + .mi_type = GSM_MI_TYPE_TMSI, + .mi_str = "12648430", /* 0xc0ffee as decimal */ + .expect_mi_tlv_hex = "1705f400c0ffee", + .expect_rc = 8, /* exception: gsm48_mi_to_string() for TMSI returns strlen(), not bytes! */ + }, + { + .mi_type = GSM_MI_TYPE_TMSI, + .mi_str = "0", + .expect_mi_tlv_hex = "1705f400000000", + .expect_rc = 1, /* exception: gsm48_mi_to_string() for TMSI returns strlen(), not bytes! */ + }, + { + /* gsm48 treats TMSI as decimal string */ + .mi_type = GSM_MI_TYPE_TMSI, + .mi_str = "305419896", /* 0x12345678 as decimal */ + .expect_mi_tlv_hex = "1705f412345678", + .str_size = 5, + .expect_str = "3054", + .expect_rc = 9, /* exception: gsm48_mi_to_string() for TMSI returns would-be strlen() like snprintf()! */ + }, + { + .mi_type = GSM_MI_TYPE_NONE, + .mi_str = "123", + .expect_mi_tlv_hex = "17021832", /* encoding invalid MI type */ + .expect_str = "", + }, + { + .mi_type = GSM_MI_TYPE_NONE, + .mi_str = "1234", + .expect_mi_tlv_hex = "17031032f4", /* encoding invalid MI type */ + .expect_str = "", + }, + { + .mi_type = GSM_MI_ODD, + .mi_str = "1234", + .expect_mi_tlv_hex = "17031832f4", /* encoding invalid MI type, and "odd" for an even number of digits */ + .expect_str = "", + }, +}; + +static void test_mid_encode_decode(void) +{ + int i; + + printf("\nTesting Mobile Identity conversions\n"); + + for (i = 0; i < ARRAY_SIZE(test_mid_encode_decode_tests); i++) { + const struct test_mid_encode_decode_test *t = &test_mid_encode_decode_tests[i]; + uint8_t tlv_buf[64]; + uint8_t *mi_buf; + int tlv_len; + int mi_len; + const char *tlv_hex; + char str[64] = {}; + size_t str_size = t->str_size ? : sizeof(str); + const char *expect_str = t->expect_str ? : t->mi_str; + int expect_rc = t->expect_rc ? : strlen(expect_str)+1; + int rc; + int str_len; + + printf("- %s %s\n", gsm48_mi_type_name(t->mi_type), t->mi_str); + if (t->mi_type == GSM_MI_TYPE_TMSI) + tlv_len = gsm48_generate_mid_from_tmsi(tlv_buf, (uint32_t)atoll(t->mi_str)); + else + tlv_len = gsm48_generate_mid(tlv_buf, t->mi_str, t->mi_type); + tlv_hex = osmo_hexdump_nospc(tlv_buf, tlv_len); + + printf(" -> MI-TLV-hex='%s'\n", tlv_hex); + if (t->expect_mi_tlv_hex && strcmp(tlv_hex, t->expect_mi_tlv_hex)) { + printf(" ERROR: expected '%s'\n", t->expect_mi_tlv_hex); + } + + /* skip the GSM48_IE_MOBILE_ID tag and length */ + mi_buf = tlv_buf + 2; + mi_len = tlv_len - 2; + + rc = gsm48_mi_to_string(str, str_size, mi_buf, mi_len); + printf(" -> MI-str=%s rc=%d\n", osmo_quote_str(str, -1), rc); + if (strcmp(str, expect_str)) + printf(" ERROR: expected MI-str=%s\n", osmo_quote_str(expect_str, -1)); + if (rc != expect_rc) + printf(" ERROR: expected rc=%d\n", expect_rc); + + /* Now make sure the resulting string is always '\0' terminated. + * The above started out with a zeroed buffer, now repeat with a tainted one. */ + str_len = strlen(str); + str[str_len] = '!'; + gsm48_mi_to_string(str, str_size, mi_buf, mi_len); + if (strlen(str) != str_len) + printf(" ERROR: resulting string is not explicitly nul terminated\n"); + } +} + +static const uint8_t test_mid_decode_zero_length_types[] = { GSM_MI_TYPE_IMSI, GSM_MI_TYPE_TMSI, GSM_MI_TYPE_NONE }; + +static void test_mid_decode_zero_length(void) +{ + int odd; + uint8_t valid_mi[64]; + int valid_mi_len; + + printf("\nDecoding zero length Mobile Identities\n"); + + /* IMSI = 123456789012345 */ + valid_mi_len = osmo_hexparse("1932547698103254", valid_mi, sizeof(valid_mi)); + + for (odd = 0; odd <= 1; odd++) { + int i; + for (i = 0; i < ARRAY_SIZE(test_mid_decode_zero_length_types); i++) { + uint8_t mi_type = test_mid_decode_zero_length_types[i] | (odd ? GSM_MI_ODD : 0); + char str[8] = {}; + int rc; + + printf("- MI type: %s%s\n", gsm48_mi_type_name(mi_type & GSM_MI_TYPE_MASK), + odd ? " | GSM_MI_ODD":""); + valid_mi[0] = (valid_mi[0] & 0xf0) | mi_type; + + printf(" - writing to zero-length string:\n"); + memset(str, '!', sizeof(str) - 1); + rc = gsm48_mi_to_string(str, 0, valid_mi, valid_mi_len); + printf(" rc=%d\n", rc); + if (str[0] == '!') + printf(" nothing written\n"); + else + printf(" ERROR: Wrote to invalid memory!\n"); + + printf(" - writing to 1-byte-length string:\n"); + memset(str, '!', sizeof(str) - 1); + rc = gsm48_mi_to_string(str, 1, valid_mi, valid_mi_len); + printf(" rc=%d\n", rc); + if (str[0] == '\0') + printf(" returned empty string\n"); + else if (str[0] == '!') + printf(" ERROR: nothing written, expected nul-terminated empty string\n"); + else + printf(" ERROR: Wrote unexpected string %s\n", osmo_quote_str(str, 5)); + if (str[1] != '!') + printf(" ERROR: Wrote to invalid memory!\n"); + + printf(" - decode zero-length mi:\n"); + memset(str, '!', sizeof(str) - 1); + rc = gsm48_mi_to_string(str, sizeof(str), valid_mi, 0); + printf(" rc=%d\n", rc); + if (str[0] == '\0') + printf(" returned empty string\n"); + else if (str[0] == '!') + printf(" ERROR: nothing written, expected nul-terminated empty string\n"); + else + printf(" ERROR: expected empty string, got output string: %s\n", osmo_quote_str(str, -1)); + } + } + printf("\n"); +} + int main(int argc, char **argv) { test_bearer_cap(); test_mid_from_tmsi(); test_mid_from_imsi(); + test_mid_encode_decode(); + test_mid_decode_zero_length(); test_ra_cap(); test_lai_encode_decode(); diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index c1d6a70..1dc4249 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -2,6 +2,129 @@ Test `Speech, all codecs' passed Simple TMSI encoding test....passed Simple IMSI encoding test....passed: [10] 17 08 99 10 07 00 00 00 64 02 + +Testing Mobile Identity conversions +- IMSI 123456789012345 + -> MI-TLV-hex='17081932547698103254' + -> MI-str="123456789012345" rc=16 +- IMSI 12345678901234 + -> MI-TLV-hex='170811325476981032f4' + -> MI-str="12345678901234" rc=15 +- IMSI 423423 + -> MI-TLV-hex='1704413224f3' + -> MI-str="423423" rc=7 +- unknown 0x9 423423 + -> MI-TLV-hex='1704493224f3' + -> MI-str="423423F" rc=8 + ERROR: expected MI-str="423423" + ERROR: expected rc=7 +- IMSI 4234235 + -> MI-TLV-hex='170449322453' + -> MI-str="4234235" rc=8 +- IMSI 4234235 + -> MI-TLV-hex='170449322453' + -> MI-str="423" rc=3 + ERROR: resulting string is not explicitly nul terminated +- IMEI 123456789012345 + -> MI-TLV-hex='17081a32547698103254' + -> MI-str="123456789012345" rc=16 +- IMEI 98765432109876 + -> MI-TLV-hex='170892785634129078f6' + -> MI-str="98765432109876" rc=15 +- IMEI 987654321098765 + -> MI-TLV-hex='17089a78563412907856' + -> MI-str="987654321098765" rc=16 +- IMEI-SV 987654321098765432 + -> MI-TLV-hex='170a937856341290785634f2' + -> MI-str="987654321098765432" rc=19 +- IMEI-SV 987654321098765432 + -> MI-TLV-hex='170a937856341290785634f2' + -> MI-str="987654321098765" rc=15 + ERROR: resulting string is not explicitly nul terminated +- TMSI 305419896 + -> MI-TLV-hex='1705f412345678' + -> MI-str="305419896" rc=9 +- TMSI 12648430 + -> MI-TLV-hex='1705f400c0ffee' + -> MI-str="12648430" rc=8 +- TMSI 0 + -> MI-TLV-hex='1705f400000000' + -> MI-str="0" rc=1 +- TMSI 305419896 + -> MI-TLV-hex='1705f412345678' + -> MI-str="3054" rc=9 +- NONE 123 + -> MI-TLV-hex='17021832' + -> MI-str="" rc=1 +- NONE 1234 + -> MI-TLV-hex='17031032f4' + -> MI-str="" rc=1 +- unknown 0x8 1234 + -> MI-TLV-hex='17031832f4' + -> MI-str="" rc=1 + +Decoding zero length Mobile Identities +- MI type: IMSI + - writing to zero-length string: + rc=1 + ERROR: Wrote to invalid memory! + - writing to 1-byte-length string: + rc=1 + ERROR: Wrote unexpected string "1!!!!" + - decode zero-length mi: + rc=2 + ERROR: expected empty string, got output string: "1" +- MI type: TMSI + - writing to zero-length string: + rc=1 + ERROR: Wrote to invalid memory! + - writing to 1-byte-length string: + rc=1 + returned empty string + - decode zero-length mi: + rc=1 + returned empty string +- MI type: NONE + - writing to zero-length string: + rc=1 + ERROR: Wrote to invalid memory! + - writing to 1-byte-length string: + rc=1 + returned empty string + - decode zero-length mi: + rc=1 + returned empty string +- MI type: IMSI | GSM_MI_ODD + - writing to zero-length string: + rc=1 + ERROR: Wrote to invalid memory! + - writing to 1-byte-length string: + rc=1 + ERROR: Wrote unexpected string "1!!!!" + - decode zero-length mi: + rc=2 + ERROR: expected empty string, got output string: "1" +- MI type: TMSI | GSM_MI_ODD + - writing to zero-length string: + rc=1 + ERROR: Wrote to invalid memory! + - writing to 1-byte-length string: + rc=1 + returned empty string + - decode zero-length mi: + rc=1 + returned empty string +- MI type: NONE | GSM_MI_ODD + - writing to zero-length string: + rc=1 + ERROR: Wrote to invalid memory! + - writing to 1-byte-length string: + rc=1 + returned empty string + - decode zero-length mi: + rc=1 + returned empty string + Constructed RA: 077-121-666-5 MCC+MNC in BCD: 70 17 21 -- To view, visit https://gerrit.osmocom.org/12151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaae3af87f82f1a8f2e6273984c011b2813038cf7 Gerrit-Change-Number: 12151 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:38:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 13:38:01 +0000 Subject: Change in libosmocore[master]: api doc: gsm48_mi_to_string(): warn of return value implementation In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12152 ) Change subject: api doc: gsm48_mi_to_string(): warn of return value implementation ...................................................................... api doc: gsm48_mi_to_string(): warn of return value implementation Change-Id: If5e7abd15dddf39cdfad8071f4cd5ca8244eabe0 --- M src/gsm/gsm48.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index ae9a1cf..e684a3c 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -643,7 +643,10 @@ * \param[in] str_len Length of \a string in bytes * \param[in] mi Mobile Identity to be stringified * \param[in] mi_len Length of \a mi in bytes - * \returns length of string written to \a string */ + * \returns WARNING: the return value of this function is not well implemented. + * Depending on the MI type and amount of output buffer, this may return + * the nr of written bytes, or the written strlen(), or the snprintf() + * style strlen()-if-the-buffer-were-large-enough. */ int gsm48_mi_to_string(char *string, const int str_len, const uint8_t *mi, const int mi_len) { -- To view, visit https://gerrit.osmocom.org/12152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If5e7abd15dddf39cdfad8071f4cd5ca8244eabe0 Gerrit-Change-Number: 12152 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:42:08 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 13:42:08 +0000 Subject: Change in libosmocore[master]: Constify llist_count() parameter In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12214 ) Change subject: Constify llist_count() parameter ...................................................................... Constify llist_count() parameter Counting list entires should not alter the list content: let's make this obvious from type signature. Change-Id: I414e67a3de733fab407161b3264d3b89070ba537 --- M include/osmocom/core/linuxlist.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/linuxlist.h b/include/osmocom/core/linuxlist.h index 8d0533f..7791310 100644 --- a/include/osmocom/core/linuxlist.h +++ b/include/osmocom/core/linuxlist.h @@ -387,7 +387,7 @@ * This function is not efficient, mostly useful for small lists and non time * critical cases like unit tests. */ -static inline unsigned int llist_count(struct llist_head *head) +static inline unsigned int llist_count(const struct llist_head *head) { struct llist_head *entry; unsigned int i = 0; -- To view, visit https://gerrit.osmocom.org/12214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I414e67a3de733fab407161b3264d3b89070ba537 Gerrit-Change-Number: 12214 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:43:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 13:43:19 +0000 Subject: Change in libosmocore[master]: add osmo_bcd2str() In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12153 to look at the new patch set (#6). Change subject: add osmo_bcd2str() ...................................................................... add osmo_bcd2str() Add a standalone bcd-to-string conversion function with generic parameters. Add a regression test in utils_test.c. So far there is no single universal implementation that converts a BCD to a string. I could only find gsm48_mi_to_string(), which also interprets surrounding bytes, MI type and TMSI as non-BCD value. The idea is to use this function from gsm48_mi_to_string() and similar implementations in subsequent commits. Root cause: in osmo-msc, I want to have an alternative MI-to-string function for composing an FSM name, which needs the BCD part of gsm48_mi_to_string() but not the TMSI part. Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 --- M include/osmocom/core/utils.h M src/utils.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 4 files changed, 186 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/53/12153/6 -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:44:17 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 13:44:17 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12226 to look at the new patch set (#2). Change subject: Add tests for IMSI ACLs ...................................................................... Add tests for IMSI ACLs Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 --- M tests/sgsn/sgsn_test.c M tests/sgsn/sgsn_test.ok 2 files changed, 115 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/26/12226/2 -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:44:17 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 13:44:17 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12227 to look at the new patch set (#2). Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... ACL: integrate sanitize check into sgsn_acl_* functions Having this check in vty makes it hard to unit-test. Let's move this into separate static function and use it directly from sgsn_acl_* functions. Adjust test output accordingly. Related: SYS#4300 Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 --- M src/gprs/sgsn_auth.c M src/gprs/sgsn_vty.c M tests/sgsn/sgsn_test.ok 3 files changed, 27 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/27/12227/2 -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 13:57:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 10 Dec 2018 13:57:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_chan_exhaustion: Send correct RA to alloc all different channels In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12215 ) Change subject: bsc: TC_chan_exhaustion: Send correct RA to alloc all different channels ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e58592c661fc004e648dbe46b67a3b3f5a20bc8 Gerrit-Change-Number: 12215 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 10 Dec 2018 13:57:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 14:03:11 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 14:03:11 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12228 Change subject: disable recording of LU timestamps by default ...................................................................... disable recording of LU timestamps by default Add VTY commands which enable or disable recording of Location Update timestamps in the HLR database. Because this feature has implications for the privacy of network users, it is now off by default. It needs to be explicitly enabled by the administrator who will see a warning about potential privacy concerns when doing so. The new commands added to the hlr configuration space are: record-lu-timestamps no record-lu-timestamps DB tests keep recording timestamps in the test database to ensure that the corresponding code is being exercised. Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Related: OS#2838 Depends: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a --- M src/db.h M src/db_hlr.c M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/db/db_test.c M tests/db/db_test.err 7 files changed, 63 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/28/12228/1 diff --git a/src/db.h b/src/db.h index ae592fb..2439196 100644 --- a/src/db.h +++ b/src/db.h @@ -131,7 +131,7 @@ struct hlr_subscriber *subscr); int db_subscr_nam(struct db_context *dbc, const char *imsi, bool nam_val, bool is_ps); int db_subscr_lu(struct db_context *dbc, int64_t subscr_id, - const char *vlr_or_sgsn_number, bool is_ps); + const char *vlr_or_sgsn_number, bool is_ps, bool record_timestamp); int db_subscr_purge(struct db_context *dbc, const char *by_imsi, bool purge_val, bool is_ps); diff --git a/src/db_hlr.c b/src/db_hlr.c index c6293f9..dd80aaf 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -591,11 +591,12 @@ * \param[in] subscr_id ID of the subscriber in the HLR db. * \param[in] vlr_or_sgsn_number ASCII string of identifier digits. * \param[in] is_ps when true, set sgsn_number, else set vlr_number. + * \param[in] record_timestamp if true, then store LU timestamp in the HLR db * \returns 0 on success, -ENOENT when the given subscriber does not exist, * -EIO on database errors. */ int db_subscr_lu(struct db_context *dbc, int64_t subscr_id, - const char *vlr_or_sgsn_number, bool is_ps) + const char *vlr_or_sgsn_number, bool is_ps, bool record_timestamp) { sqlite3_stmt *stmt; int rc, ret = 0; @@ -637,6 +638,9 @@ db_remove_reset(stmt); + if (!record_timestamp) + return 0; + if (osmo_clock_gettime(CLOCK_REALTIME, &localtime) != 0) { LOGP(DAUC, LOGL_ERROR, "Cannot get the current time: (%d) %s\n", errno, strerror(errno)); ret = -errno; diff --git a/src/hlr.c b/src/hlr.c index 4873a66..5020eae 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -325,7 +325,7 @@ LOGP(DAUC, LOGL_DEBUG, "IMSI='%s': storing %s = %s\n", subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number", osmo_quote_str((const char*)luop->peer, -1)); - if (db_subscr_lu(g_hlr->dbc, subscr->id, (const char *)luop->peer, luop->is_ps)) + if (db_subscr_lu(g_hlr->dbc, subscr->id, (const char *)luop->peer, luop->is_ps, g_hlr->record_lu_timestamps)) LOGP(DAUC, LOGL_ERROR, "IMSI='%s': Cannot update %s in the database\n", subscr->imsi, luop->is_ps ? "SGSN number" : "VLR number"); @@ -614,6 +614,9 @@ /* Init default (call independent) SS session guard timeout value */ g_hlr->ncss_guard_timeout = NCSS_GUARD_TIMEOUT_DEFAULT; + /* Do not record location update timestamps by default. */ + g_hlr->record_lu_timestamps = false; + rc = osmo_init_logging2(hlr_ctx, &hlr_log_info); if (rc < 0) { fprintf(stderr, "Error initializing logging\n"); diff --git a/src/hlr.h b/src/hlr.h index e9cc747..7add8b7 100644 --- a/src/hlr.h +++ b/src/hlr.h @@ -51,6 +51,9 @@ struct llist_head ussd_routes; struct llist_head ss_sessions; + + /* Shall we store Location Update timestamps in the database? */ + bool record_lu_timestamps; }; extern struct hlr *g_hlr; diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 6706aa4..d3caad5 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -71,6 +71,8 @@ static int config_write_hlr(struct vty *vty) { vty_out(vty, "hlr%s", VTY_NEWLINE); + if (g_hlr->record_lu_timestamps) + vty_out(vty, " record-lu-timestamps%s", VTY_NEWLINE); return CMD_SUCCESS; } @@ -123,6 +125,24 @@ return CMD_SUCCESS; } +DEFUN(cfg_record_lu_timestamps, cfg_record_lu_timestamps_cmd, + "record-lu-timestamps", + "Record timestamps of Location Updates in the HLR database (off by default)") +{ + g_hlr->record_lu_timestamps = true; + vty_out(vty, "Timestamps of Location Updates will be stored in the HLR database.%s", VTY_NEWLINE); + vty_out(vty, "Please carefully consider the privacy implications of recording the activity of your users!%s", VTY_NEWLINE); + return CMD_SUCCESS; +} + +DEFUN(cfg_no_record_lu_timestamps, cfg_no_record_lu_timestamps_cmd, + "no record-lu-timestamps", + NO_STR "Record timestamps of Location Updates in the HLR database") +{ + g_hlr->record_lu_timestamps = false; + return CMD_SUCCESS; +} + /*********************************************************************** * USSD Entity ***********************************************************************/ @@ -353,6 +373,8 @@ install_element(CONFIG_NODE, &cfg_hlr_cmd); install_node(&hlr_node, config_write_hlr); + install_element(HLR_NODE, &cfg_record_lu_timestamps_cmd); + install_element(HLR_NODE, &cfg_no_record_lu_timestamps_cmd); install_element(HLR_NODE, &cfg_gsup_cmd); install_node(&gsup_node, config_write_hlr_gsup); diff --git a/tests/db/db_test.c b/tests/db/db_test.c index c4ed6ed..e90661d 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -337,39 +337,39 @@ comment("Record LU for PS and CS (SGSN and VLR names)"); - ASSERT_RC(db_subscr_lu(dbc, id0, "5952", true), 0); + ASSERT_RC(db_subscr_lu(dbc, id0, "5952", true, true), 0); ASSERT_SEL(id, id0, 0); - ASSERT_RC(db_subscr_lu(dbc, id0, "712", false), 0); + ASSERT_RC(db_subscr_lu(dbc, id0, "712", false, true), 0); ASSERT_SEL(id, id0, 0); comment("Record LU for PS and CS (SGSN and VLR names) *again*"); - ASSERT_RC(db_subscr_lu(dbc, id0, "111", true), 0); + ASSERT_RC(db_subscr_lu(dbc, id0, "111", true, true), 0); ASSERT_SEL(id, id0, 0); - ASSERT_RC(db_subscr_lu(dbc, id0, "111", true), 0); + ASSERT_RC(db_subscr_lu(dbc, id0, "111", true, true), 0); ASSERT_SEL(id, id0, 0); - ASSERT_RC(db_subscr_lu(dbc, id0, "222", false), 0); + ASSERT_RC(db_subscr_lu(dbc, id0, "222", false, true), 0); ASSERT_SEL(id, id0, 0); - ASSERT_RC(db_subscr_lu(dbc, id0, "222", false), 0); + ASSERT_RC(db_subscr_lu(dbc, id0, "222", false, true), 0); ASSERT_SEL(id, id0, 0); comment("Unset LU info for PS and CS (SGSN and VLR names)"); - ASSERT_RC(db_subscr_lu(dbc, id0, "", true), 0); + ASSERT_RC(db_subscr_lu(dbc, id0, "", true, true), 0); ASSERT_SEL(id, id0, 0); - ASSERT_RC(db_subscr_lu(dbc, id0, "", false), 0); + ASSERT_RC(db_subscr_lu(dbc, id0, "", false, true), 0); ASSERT_SEL(id, id0, 0); - ASSERT_RC(db_subscr_lu(dbc, id0, "111", true), 0); - ASSERT_RC(db_subscr_lu(dbc, id0, "222", false), 0); + ASSERT_RC(db_subscr_lu(dbc, id0, "111", true, true), 0); + ASSERT_RC(db_subscr_lu(dbc, id0, "222", false, true), 0); ASSERT_SEL(id, id0, 0); - ASSERT_RC(db_subscr_lu(dbc, id0, NULL, true), 0); + ASSERT_RC(db_subscr_lu(dbc, id0, NULL, true, true), 0); ASSERT_SEL(id, id0, 0); - ASSERT_RC(db_subscr_lu(dbc, id0, NULL, false), 0); + ASSERT_RC(db_subscr_lu(dbc, id0, NULL, false, true), 0); ASSERT_SEL(id, id0, 0); comment("Record LU for non-existent ID"); - ASSERT_RC(db_subscr_lu(dbc, 99999, "5952", true), -ENOENT); - ASSERT_RC(db_subscr_lu(dbc, 99999, "712", false), -ENOENT); + ASSERT_RC(db_subscr_lu(dbc, 99999, "5952", true, true), -ENOENT); + ASSERT_RC(db_subscr_lu(dbc, 99999, "712", false, true), -ENOENT); ASSERT_SEL(id, 99999, -ENOENT); comment("Purge and un-purge PS and CS"); diff --git a/tests/db/db_test.err b/tests/db/db_test.err index 1d34045..d556102 100644 --- a/tests/db/db_test.err +++ b/tests/db/db_test.err @@ -373,7 +373,7 @@ --- Record LU for PS and CS (SGSN and VLR names) -db_subscr_lu(dbc, id0, "5952", true) --> 0 +db_subscr_lu(dbc, id0, "5952", true, true) --> 0 db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0 struct hlr_subscriber { @@ -383,7 +383,7 @@ .sgsn_number = '5952', } -db_subscr_lu(dbc, id0, "712", false) --> 0 +db_subscr_lu(dbc, id0, "712", false, true) --> 0 db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0 struct hlr_subscriber { @@ -397,7 +397,7 @@ --- Record LU for PS and CS (SGSN and VLR names) *again* -db_subscr_lu(dbc, id0, "111", true) --> 0 +db_subscr_lu(dbc, id0, "111", true, true) --> 0 db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0 struct hlr_subscriber { @@ -408,7 +408,7 @@ .sgsn_number = '111', } -db_subscr_lu(dbc, id0, "111", true) --> 0 +db_subscr_lu(dbc, id0, "111", true, true) --> 0 db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0 struct hlr_subscriber { @@ -419,7 +419,7 @@ .sgsn_number = '111', } -db_subscr_lu(dbc, id0, "222", false) --> 0 +db_subscr_lu(dbc, id0, "222", false, true) --> 0 db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0 struct hlr_subscriber { @@ -430,7 +430,7 @@ .sgsn_number = '111', } -db_subscr_lu(dbc, id0, "222", false) --> 0 +db_subscr_lu(dbc, id0, "222", false, true) --> 0 db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0 struct hlr_subscriber { @@ -444,7 +444,7 @@ --- Unset LU info for PS and CS (SGSN and VLR names) -db_subscr_lu(dbc, id0, "", true) --> 0 +db_subscr_lu(dbc, id0, "", true, true) --> 0 db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0 struct hlr_subscriber { @@ -454,7 +454,7 @@ .vlr_number = '222', } -db_subscr_lu(dbc, id0, "", false) --> 0 +db_subscr_lu(dbc, id0, "", false, true) --> 0 db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0 struct hlr_subscriber { @@ -463,9 +463,9 @@ .msisdn = '543210123456789', } -db_subscr_lu(dbc, id0, "111", true) --> 0 +db_subscr_lu(dbc, id0, "111", true, true) --> 0 -db_subscr_lu(dbc, id0, "222", false) --> 0 +db_subscr_lu(dbc, id0, "222", false, true) --> 0 db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0 struct hlr_subscriber { @@ -476,7 +476,7 @@ .sgsn_number = '111', } -db_subscr_lu(dbc, id0, NULL, true) --> 0 +db_subscr_lu(dbc, id0, NULL, true, true) --> 0 db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0 struct hlr_subscriber { @@ -486,7 +486,7 @@ .vlr_number = '222', } -db_subscr_lu(dbc, id0, NULL, false) --> 0 +db_subscr_lu(dbc, id0, NULL, false, true) --> 0 db_subscr_get_by_id(dbc, id0, &g_subscr) --> 0 struct hlr_subscriber { @@ -498,10 +498,10 @@ --- Record LU for non-existent ID -db_subscr_lu(dbc, 99999, "5952", true) --> -ENOENT +db_subscr_lu(dbc, 99999, "5952", true, true) --> -ENOENT DAUC Cannot update SGSN number for subscriber ID=99999: no such subscriber -db_subscr_lu(dbc, 99999, "712", false) --> -ENOENT +db_subscr_lu(dbc, 99999, "712", false, true) --> -ENOENT DAUC Cannot update VLR number for subscriber ID=99999: no such subscriber db_subscr_get_by_id(dbc, 99999, &g_subscr) --> -ENOENT -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 14:21:54 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 14:21:54 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12228 to look at the new patch set (#2). Change subject: disable recording of LU timestamps by default ...................................................................... disable recording of LU timestamps by default Add VTY commands which enable or disable recording of Location Update timestamps in the HLR database. Because this feature has implications for the privacy of network users, it is now off by default. It needs to be explicitly enabled by the administrator who will see a warning about potential privacy concerns when doing so. The new commands added to the hlr configuration space are: record-lu-timestamps no record-lu-timestamps DB tests keep recording timestamps in the test database to ensure that the corresponding code is being exercised. Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Related: OS#2838 Depends: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a --- M src/db.h M src/db_hlr.c M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/db/db_test.c M tests/db/db_test.err M tests/test_nodes.vty 8 files changed, 65 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/28/12228/2 -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 14:31:36 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 14:31:36 +0000 Subject: Change in osmo-sgsn[master]: Use explicit length check Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12229 Change subject: Use explicit length check ...................................................................... Use explicit length check Use OSMO_MIN macro to check for MSISDN length. This makes the code cleaner and will, hopefully, aid static analysis tools. Change-Id: Ic0fbeb8d248c74e54bfb51ba2cdea55c4f386ac7 Fixes: CID57879 --- M src/gprs/sgsn_libgtp.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/29/12229/1 diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c index 478d402..a8a1502 100644 --- a/src/gprs/sgsn_libgtp.c +++ b/src/gprs/sgsn_libgtp.c @@ -176,9 +176,7 @@ /* Put the MSISDN in case we have it */ if (mmctx->subscr && mmctx->subscr->sgsn_data->msisdn_len) { - pdp->msisdn.l = mmctx->subscr->sgsn_data->msisdn_len; - if (pdp->msisdn.l > sizeof(pdp->msisdn.v)) - pdp->msisdn.l = sizeof(pdp->msisdn.v); + pdp->msisdn.l = OSMO_MIN(mmctx->subscr->sgsn_data->msisdn_len, sizeof(pdp->msisdn.v)); memcpy(pdp->msisdn.v, mmctx->subscr->sgsn_data->msisdn, pdp->msisdn.l); } else { -- To view, visit https://gerrit.osmocom.org/12229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0fbeb8d248c74e54bfb51ba2cdea55c4f386ac7 Gerrit-Change-Number: 12229 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 14:43:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 14:43:22 +0000 Subject: Change in osmo-bsc[master]: Add VTY option to avoid sending empty Full BCCH Info for disabled SI In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12133 ) Change subject: Add VTY option to avoid sending empty Full BCCH Info for disabled SI ...................................................................... Patch Set 2: Verified+1 (1 comment) Tested by the user who initially had the issue and says nanoBTS works fine using "no system-information unused-send-empty". https://gerrit.osmocom.org/#/c/12133/1/src/osmo-bsc/gsm_data.c File src/osmo-bsc/gsm_data.c: https://gerrit.osmocom.org/#/c/12133/1/src/osmo-bsc/gsm_data.c at 858 PS1, Line 858: bts->si_unused_send_empty = true; > Sorry, I was confused by the name... So, we send empty SI [?] Hm perhaps si_unused_send_empty? -- To view, visit https://gerrit.osmocom.org/12133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 Gerrit-Change-Number: 12133 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 10 Dec 2018 14:43:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:24:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 15:24:28 +0000 Subject: Change in docker-playground[master]: gerrit: fix libopenid path In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12204 ) Change subject: gerrit: fix libopenid path ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 Gerrit-Change-Number: 12204 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 15:24:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:26:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 15:26:39 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12154 ) Change subject: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases ...................................................................... Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12154/6/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/12154/6/src/gsm/gsm48.c at 642 PS6, Line 642: * This function does not validate the Mobile Identity digits, i.e. digits > 9 are returned as 'A'-'F'. May be worth having a test case for this scenario. -- To view, visit https://gerrit.osmocom.org/12154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1b51b72a721e1cc9d69796b804ebda741ff0f36b Gerrit-Change-Number: 12154 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 15:26:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:27:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 15:27:51 +0000 Subject: Change in libosmocore[master]: gsm48_generate_mid(): mask out ODD flag from mi_type In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12155 ) Change subject: gsm48_generate_mid(): mask out ODD flag from mi_type ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 Gerrit-Change-Number: 12155 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 15:27:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:29:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 15:29:21 +0000 Subject: Change in osmo-hlr[master]: display last location update timestamp in vty In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12202 ) Change subject: display last location update timestamp in vty ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a Gerrit-Change-Number: 12202 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 10 Dec 2018 15:29:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:35:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 15:35:35 +0000 Subject: Change in osmo-msc[master]: move ASS-COMPL MGCP handling out of a_iface_bssap.c In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12201 ) Change subject: move ASS-COMPL MGCP handling out of a_iface_bssap.c ...................................................................... Patch Set 3: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/12201/3/include/osmocom/msc/msc_mgcp.h File include/osmocom/msc/msc_mgcp.h: https://gerrit.osmocom.org/#/c/12201/3/include/osmocom/msc/msc_mgcp.h at 27 PS3, Line 27: struct gsm0808_speech_codec; Why not adding correct headers instead? https://gerrit.osmocom.org/#/c/12201/3/include/osmocom/msc/ran_conn.h File include/osmocom/msc/ran_conn.h: https://gerrit.osmocom.org/#/c/12201/3/include/osmocom/msc/ran_conn.h at 10 PS3, Line 10: struct gsm0808_speech_codec; same -- To view, visit https://gerrit.osmocom.org/12201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8137215c443239bddf3e69b5715839a365b73b6c Gerrit-Change-Number: 12201 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 15:35:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:38:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 15:38:23 +0000 Subject: Change in osmo-sgsn[master]: gtphub: remove code duplication Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12230 Change subject: gtphub: remove code duplication ...................................................................... gtphub: remove code duplication Use libosmocore struct for GSN address. Change-Id: I75645fd5cd1016bd9a08096e3ee4101b2560cefd --- M include/osmocom/sgsn/gtphub.h M src/gprs/gtphub.c M src/gprs/gtphub_ares.c M tests/gtphub/gtphub_test.c 4 files changed, 54 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/30/12230/1 diff --git a/include/osmocom/sgsn/gtphub.h b/include/osmocom/sgsn/gtphub.h index 8fd9f38..93d647d 100644 --- a/include/osmocom/sgsn/gtphub.h +++ b/include/osmocom/sgsn/gtphub.h @@ -155,30 +155,22 @@ extern const char* const gtphub_side_idx_names[GTPH_SIDE_N]; -/* A host address in the form that is expected in the 7.7.32 GSN Address IE. - * len is either 4 (IPv4) or 16 (IPv6), any other value is invalid. If no - * address is set, len shall be 0. */ -struct gsn_addr { - uint16_t len; - uint8_t buf[16]; -}; - -void gsn_addr_copy(struct gsn_addr *gsna, const struct gsn_addr *src); -int gsn_addr_from_str(struct gsn_addr *gsna, const char *numeric_addr_str); +void gsn_addr_copy(struct osmo_gsn_address *gsna, const struct osmo_gsn_address *src); +int gsn_addr_from_str(struct osmo_gsn_address *gsna, const char *numeric_addr_str); /* Return gsna in numeric string form, in a static buffer. */ -const char *gsn_addr_to_str(const struct gsn_addr *gsna); +const char *gsn_addr_to_str(const struct osmo_gsn_address *gsna); /* note: strbuf_len doesn't need to be larger than INET6_ADDRSTRLEN + 1. */ -const char *gsn_addr_to_strb(const struct gsn_addr *gsna, +const char *gsn_addr_to_strb(const struct osmo_gsn_address *gsna, char *strbuf, int strbuf_len); /* Return 1 on match, zero otherwise. */ -int gsn_addr_same(const struct gsn_addr *a, const struct gsn_addr *b); +int gsn_addr_same(const struct osmo_gsn_address *a, const struct osmo_gsn_address *b); /* Decode sa to gsna. Return 0 on success. If port is non-NULL, the port number * from sa is also returned. */ -int gsn_addr_from_sockaddr(struct gsn_addr *gsna, uint16_t *port, +int gsn_addr_from_sockaddr(struct osmo_gsn_address *gsna, uint16_t *port, const struct osmo_sockaddr *sa); /* expiry */ @@ -379,7 +371,7 @@ struct llist_head entry; struct gtphub_peer *peer; - struct gsn_addr addr; + struct osmo_gsn_address addr; struct llist_head ports; }; @@ -411,7 +403,7 @@ }; struct gtphub_bind { - struct gsn_addr local_addr; + struct osmo_gsn_address local_addr; uint16_t local_port; struct osmo_fd ofd; @@ -506,14 +498,14 @@ struct gtphub_peer_port *gtphub_port_have(struct gtphub *hub, struct gtphub_bind *bind, - const struct gsn_addr *addr, + const struct osmo_gsn_address *addr, uint16_t port); struct gtphub_peer_port *gtphub_port_find_sa(const struct gtphub_bind *bind, const struct osmo_sockaddr *addr); void gtphub_resolved_ggsn(struct gtphub *hub, const char *apn_oi_str, - struct gsn_addr *resolved_addr, + struct osmo_gsn_address *resolved_addr, time_t now); const char *gtphub_port_str(struct gtphub_peer_port *port); diff --git a/src/gprs/gtphub.c b/src/gprs/gtphub.c index ca5857b..d35c076 100644 --- a/src/gprs/gtphub.c +++ b/src/gprs/gtphub.c @@ -161,12 +161,12 @@ } } -void gsn_addr_copy(struct gsn_addr *gsna, const struct gsn_addr *src) +void gsn_addr_copy(struct osmo_gsn_address *gsna, const struct osmo_gsn_address *src) { *gsna = *src; } -int gsn_addr_from_sockaddr(struct gsn_addr *gsna, uint16_t *port, +int gsn_addr_from_sockaddr(struct osmo_gsn_address *gsna, uint16_t *port, const struct osmo_sockaddr *sa) { char addr_str[256]; @@ -185,23 +185,23 @@ return gsn_addr_from_str(gsna, addr_str); } -int gsn_addr_from_str(struct gsn_addr *gsna, const char *numeric_addr_str) +int gsn_addr_from_str(struct osmo_gsn_address *gsna, const char *numeric_addr_str) { if ((!gsna) || (!numeric_addr_str)) return -1; int af = AF_INET; - gsna->len = 4; + gsna->length = 4; const char *pos = numeric_addr_str; for (; *pos; pos++) { if (*pos == ':') { af = AF_INET6; - gsna->len = 16; + gsna->length = 16; break; } } - int rc = inet_pton(af, numeric_addr_str, gsna->buf); + int rc = inet_pton(af, numeric_addr_str, gsna->addr); if (rc != 1) { LOG(LOGL_ERROR, "Cannot resolve numeric address: '%s'\n", numeric_addr_str); @@ -210,18 +210,18 @@ return 0; } -const char *gsn_addr_to_str(const struct gsn_addr *gsna) +const char *gsn_addr_to_str(const struct osmo_gsn_address *gsna) { static char buf[INET6_ADDRSTRLEN + 1]; return gsn_addr_to_strb(gsna, buf, sizeof(buf)); } -const char *gsn_addr_to_strb(const struct gsn_addr *gsna, +const char *gsn_addr_to_strb(const struct osmo_gsn_address *gsna, char *strbuf, int strbuf_len) { int af; - switch (gsna->len) { + switch (gsna->length) { case 4: af = AF_INET; break; @@ -232,29 +232,29 @@ return NULL; } - const char *r = inet_ntop(af, gsna->buf, strbuf, strbuf_len); + const char *r = inet_ntop(af, gsna->addr, strbuf, strbuf_len); if (!r) { - LOG(LOGL_ERROR, "Cannot convert gsn_addr to string:" + LOG(LOGL_ERROR, "Cannot convert osmo_gsn_address to string:" " %s: len=%d, buf=%s\n", strerror(errno), - (int)gsna->len, - osmo_hexdump(gsna->buf, sizeof(gsna->buf))); + (int)gsna->length, + osmo_hexdump(gsna->addr, sizeof(gsna->addr))); } return r; } -int gsn_addr_same(const struct gsn_addr *a, const struct gsn_addr *b) +int gsn_addr_same(const struct osmo_gsn_address *a, const struct osmo_gsn_address *b) { if (a == b) return 1; if ((!a) || (!b)) return 0; - if (a->len != b->len) + if (a->length != b->length) return 0; - return (memcmp(a->buf, b->buf, a->len) == 0)? 1 : 0; + return (memcmp(a->addr, b->addr, a->length) == 0)? 1 : 0; } -static int gsn_addr_get(struct gsn_addr *gsna, const struct gtp_packet_desc *p, +static int gsn_addr_get(struct osmo_gsn_address *gsna, const struct gtp_packet_desc *p, int idx) { if (p->rc != GTP_RC_PDU_C) @@ -263,14 +263,14 @@ unsigned int len; /* gtpie.h fails to declare gtpie_gettlv()'s first arg as const. */ if (gtpie_gettlv((union gtpie_member**)p->ie, GTPIE_GSN_ADDR, idx, - &len, gsna->buf, sizeof(gsna->buf)) + &len, gsna->addr, sizeof(gsna->addr)) != 0) return -1; - gsna->len = len; + gsna->length = len; return 0; } -static int gsn_addr_put(const struct gsn_addr *gsna, struct gtp_packet_desc *p, +static int gsn_addr_put(const struct osmo_gsn_address *gsna, struct gtp_packet_desc *p, int idx) { if (p->rc != GTP_RC_PDU_C) @@ -284,14 +284,14 @@ struct gtpie_tlv *ie = &p->ie[ie_idx]->tlv; int ie_l = ntoh16(ie->l); - if (ie_l != gsna->len) { + if (ie_l != gsna->length) { LOG(LOGL_ERROR, "Not implemented:" " replace an IE address of different size:" - " replace %d with %d\n", (int)ie_l, (int)gsna->len); + " replace %d with %d\n", (int)ie_l, (int)gsna->length); return -1; } - memcpy(ie->v, gsna->buf, (int)ie_l); + memcpy(ie->v, gsna->addr, (int)ie_l); return 0; } @@ -574,7 +574,7 @@ } for (i = 0; i < 2; i++) { - struct gsn_addr addr; + struct osmo_gsn_address addr; if (gsn_addr_get(&addr, res, i) == 0) LOG(LOGL_DEBUG, "| addr %s\n", gsn_addr_to_str(&addr)); } @@ -1535,7 +1535,7 @@ for_each_plane(plane_idx) { int rc; - struct gsn_addr use_addr; + struct osmo_gsn_address use_addr; uint16_t use_port; uint32_t tei_from_ie; int ie_idx; @@ -1552,7 +1552,7 @@ LOG(LOGL_DEBUG, "Read %s GSN addr %s (%d)\n", gtphub_plane_idx_names[plane_idx], gsn_addr_to_str(&use_addr), - use_addr.len); + use_addr.length); ie_idx = gtpie_getie(p->ie, ie_type[plane_idx], 0); if (ie_idx < 0) { @@ -2069,7 +2069,7 @@ return 0; } -static int gsn_addr_to_sockaddr(struct gsn_addr *src, +static int gsn_addr_to_sockaddr(struct osmo_gsn_address *src, uint16_t port, struct osmo_sockaddr *dst) { @@ -2220,7 +2220,7 @@ return -1; } - struct gsn_addr from_gsna; + struct osmo_gsn_address from_gsna; uint16_t from_port; if (gsn_addr_from_sockaddr(&from_gsna, &from_port, from_addr) != 0) return -1; @@ -2354,7 +2354,7 @@ } void gtphub_resolved_ggsn(struct gtphub *hub, const char *apn_oi_str, - struct gsn_addr *resolved_addr, + struct osmo_gsn_address *resolved_addr, time_t now) { struct gtphub_peer_port *pp; @@ -2524,7 +2524,7 @@ if (!addr->addr_str) return 0; - struct gsn_addr gsna; + struct osmo_gsn_address gsna; if (gsn_addr_from_str(&gsna, addr->addr_str) != 0) return -1; @@ -2600,7 +2600,7 @@ } static struct gtphub_peer_addr *gtphub_peer_find_addr(const struct gtphub_peer *peer, - const struct gsn_addr *addr) + const struct osmo_gsn_address *addr) { struct gtphub_peer_addr *a; llist_for_each_entry(a, &peer->addresses, entry) { @@ -2623,7 +2623,7 @@ } static struct gtphub_peer_addr *gtphub_addr_find(const struct gtphub_bind *bind, - const struct gsn_addr *addr) + const struct osmo_gsn_address *addr) { struct gtphub_peer *peer; llist_for_each_entry(peer, &bind->peers, entry) { @@ -2635,7 +2635,7 @@ } static struct gtphub_peer_port *gtphub_port_find(const struct gtphub_bind *bind, - const struct gsn_addr *addr, + const struct osmo_gsn_address *addr, uint16_t port) { struct gtphub_peer_addr *a = gtphub_addr_find(bind, addr); @@ -2647,7 +2647,7 @@ struct gtphub_peer_port *gtphub_port_find_sa(const struct gtphub_bind *bind, const struct osmo_sockaddr *addr) { - struct gsn_addr gsna; + struct osmo_gsn_address gsna; uint16_t port; if (gsn_addr_from_sockaddr(&gsna, &port, addr) != 0) return NULL; @@ -2677,7 +2677,7 @@ } static struct gtphub_peer_addr *gtphub_peer_add_addr(struct gtphub_peer *peer, - const struct gsn_addr *addr) + const struct osmo_gsn_address *addr) { struct gtphub_peer_addr *a; a = talloc_zero(osmo_gtphub_ctx, struct gtphub_peer_addr); @@ -2692,7 +2692,7 @@ static struct gtphub_peer_addr *gtphub_addr_have(struct gtphub *hub, struct gtphub_bind *bind, - const struct gsn_addr *addr) + const struct osmo_gsn_address *addr) { struct gtphub_peer_addr *a = gtphub_addr_find(bind, addr); if (a) @@ -2747,7 +2747,7 @@ struct gtphub_peer_port *gtphub_port_have(struct gtphub *hub, struct gtphub_bind *bind, - const struct gsn_addr *addr, + const struct osmo_gsn_address *addr, uint16_t port) { struct gtphub_peer_addr *a = gtphub_addr_have(hub, bind, addr); @@ -2767,7 +2767,7 @@ struct gtphub_peer_addr *pa; struct gtphub_peer_port *pp; - struct gsn_addr gsna; + struct osmo_gsn_address gsna; uint16_t port; int rc = gsn_addr_from_sockaddr(&gsna, &port, addr); if (rc < 0) diff --git a/src/gprs/gtphub_ares.c b/src/gprs/gtphub_ares.c index 87dc860..be26f55 100644 --- a/src/gprs/gtphub_ares.c +++ b/src/gprs/gtphub_ares.c @@ -85,10 +85,10 @@ goto remove_from_queue; } - struct gsn_addr resolved_addr; - if (hostent->h_length > sizeof(resolved_addr.buf)) { + struct osmo_gsn_address resolved_addr; + if (hostent->h_length > sizeof(resolved_addr.addr)) { LOGP(DGTPHUB, LOGL_ERROR, "Addr size too large: %d > %d\n", - (int)hostent->h_length, (int)sizeof(resolved_addr.buf)); + (int)hostent->h_length, (int)sizeof(resolved_addr.addr)); goto remove_from_queue; } @@ -99,8 +99,8 @@ goto remove_from_queue; } - memcpy(resolved_addr.buf, addr0, hostent->h_length); - resolved_addr.len = hostent->h_length; + memcpy(resolved_addr.addr, addr0, hostent->h_length); + resolved_addr.length = hostent->h_length; LOGP(DGTPHUB, LOGL_NOTICE, "resolved addr %s\n", osmo_hexdump((unsigned char*)&resolved_addr, diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c index 2e48bb1..214b7d4 100644 --- a/tests/gtphub/gtphub_test.c +++ b/tests/gtphub/gtphub_test.c @@ -424,7 +424,7 @@ const char *imsi_str, const char *apn_ni_str) { - struct gsn_addr resolved_gsna; + struct osmo_gsn_address resolved_gsna; uint16_t resolved_port; OSMO_ASSERT(gsn_addr_from_sockaddr(&resolved_gsna, &resolved_port, -- To view, visit https://gerrit.osmocom.org/12230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I75645fd5cd1016bd9a08096e3ee4101b2560cefd Gerrit-Change-Number: 12230 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:48:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 15:48:56 +0000 Subject: Change in osmo-sgsn[master]: Remove misleading comment In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12220 ) Change subject: Remove misleading comment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe9c62e0beb89eecced941b8831d49ca266c7330 Gerrit-Change-Number: 12220 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 15:48:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:52:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 15:52:52 +0000 Subject: Change in osmo-sgsn[master]: Use explicit parameter for sgsn_auth_init() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12221 ) Change subject: Use explicit parameter for sgsn_auth_init() ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12221/1/src/gprs/sgsn_auth.c File src/gprs/sgsn_auth.c: https://gerrit.osmocom.org/#/c/12221/1/src/gprs/sgsn_auth.c at a43 PS1, Line 43: Where did this sgsn var come from before? I see you declare a new var in sgsn which get allocated, but you are not removing the one being used here? https://gerrit.osmocom.org/#/c/12221/1/tests/sgsn/sgsn_test.c File tests/sgsn/sgsn_test.c: https://gerrit.osmocom.org/#/c/12221/1/tests/sgsn/sgsn_test.c at 51 PS1, Line 51: struct sgsn_instance *sgsn = &sgsn_inst; Ah here it is. Why is this being removed in this commit if we allocate a new one in main? -- To view, visit https://gerrit.osmocom.org/12221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1 Gerrit-Change-Number: 12221 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 15:52:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:53:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 15:53:47 +0000 Subject: Change in osmo-sgsn[master]: Constify sgsn_acl_lookup() parameter In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12222 ) Change subject: Constify sgsn_acl_lookup() parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie92637dd900b0f9eba891d5aad0b4ba0ee69c08c Gerrit-Change-Number: 12222 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 15:53:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:54:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 15:54:43 +0000 Subject: Change in osmo-sgsn[master]: Use libosmocore constant for IMSI length in ACL entry In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12224 ) Change subject: Use libosmocore constant for IMSI length in ACL entry ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h at 417 PS2, Line 417: char imsi[GSM23003_IMSI_MAX_DIGITS + 2]; why +2? Explain in commit description or/and here in this line. -- To view, visit https://gerrit.osmocom.org/12224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 Gerrit-Change-Number: 12224 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 15:54:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:55:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 15:55:43 +0000 Subject: Change in osmo-sgsn[master]: ACL: move allocation check forward in sgsn_acl_add() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12225 ) Change subject: ACL: move allocation check forward in sgsn_acl_add() ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12225/2/src/gprs/sgsn_auth.c File src/gprs/sgsn_auth.c: https://gerrit.osmocom.org/#/c/12225/2/src/gprs/sgsn_auth.c at 63 PS2, Line 63: return -EEXIST; memleak(acl)++ -- To view, visit https://gerrit.osmocom.org/12225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5906304fd3c96002ca1fdc649609e5a4d9ca299b Gerrit-Change-Number: 12225 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 15:55:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:56:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 15:56:49 +0000 Subject: Change in osmo-sgsn[master]: Add sgsn_acl_count() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12223 ) Change subject: Add sgsn_acl_count() ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12223/2/src/gprs/sgsn_auth.c File src/gprs/sgsn_auth.c: https://gerrit.osmocom.org/#/c/12223/2/src/gprs/sgsn_auth.c at 56 PS2, Line 56: size_t sgsn_acl_count(const struct sgsn_config *cfg) Do we really need this kind of one line functions? Furthermore, it's not in any header file, and it's not static. -- To view, visit https://gerrit.osmocom.org/12223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia7c5b36d07672ea43bfa2b531b9b6c56ba65161d Gerrit-Change-Number: 12223 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 15:56:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 15:59:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 15:59:44 +0000 Subject: Change in osmo-sgsn[master]: Add sgsn_acl_count() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12223 ) Change subject: Add sgsn_acl_count() ...................................................................... Patch Set 2: Ok since we have sgs_acl_add/del if it was used in regular code (not in test one). Since it's only used in the test code, move it to that file or use the llist_count directly. -- To view, visit https://gerrit.osmocom.org/12223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia7c5b36d07672ea43bfa2b531b9b6c56ba65161d Gerrit-Change-Number: 12223 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 15:59:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 16:02:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 16:02:59 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12226 ) Change subject: Add tests for IMSI ACLs ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c File tests/sgsn/sgsn_test.c: https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c at 1343 PS2, Line 1343: size_t old = sgsn_acl_count(cfg), new; This line is suuuuuper ugly, mixing declaration, initialization and function call. https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c at 1374 PS2, Line 1374: size_t old = sgsn_acl_count(cfg), new; same https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c at 1383 PS2, Line 1383: printf("failed to remove acl %s, total entries %zu\n", imsi, sgsn_acl_count(cfg)); You can use "new" here instead of sgsn_acl_count(cfg) -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 16:02:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 16:08:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 16:08:07 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12227 ) Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... Patch Set 2: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_auth.c File src/gprs/sgsn_auth.c: https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_auth.c at 46 PS2, Line 46: static bool imsi_sanitize(char *dst, size_t dst_len, const char *imsi) Document minimally what this function does. https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_auth.c at 53 PS2, Line 53: return true; This return code looks weird, returning true if it did nothing on the dst buffer and false otherwise. https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_auth.c at 65 PS2, Line 65: if (imsi_sanitize(imsi_sanitized, sizeof(imsi_sanitized), imsi)) same as comment in sgsn_acl_add. https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_auth.c at 89 PS2, Line 89: if (imsi_sanitize(acl->imsi, sizeof(acl->imsi), imsi)) I think sanitizing the imsi should be done by caller of sgsn_acl_* based on where the information come from (from the wire or from known sanitized source). Is there any good reason to do it here? https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_vty.c at a650 PS2, Line 650: See my comment, I think osmo_imsi_sanitize() should be used here. -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 16:08:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 16:08:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 10 Dec 2018 16:08:16 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12177 ) Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... Patch Set 4: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/12177/4/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12177/4/src/libmsc/msc_vty.c at 464 PS4, Line 464: . Usually, we don't use dots in VTY, in particular for a single sentence. https://gerrit.osmocom.org/#/c/12177/4/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12177/4/src/libvlr/vlr.c at 1225 PS4, Line 1225: Unrelated ws. https://gerrit.osmocom.org/#/c/12177/4/tests/msc_vlr/msc_vlr_tests.c File tests/msc_vlr/msc_vlr_tests.c: https://gerrit.osmocom.org/#/c/12177/4/tests/msc_vlr/msc_vlr_tests.c at 564 PS4, Line 564: ws -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 10 Dec 2018 16:08:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 10 16:09:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 16:09:04 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-iuh_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#2637?= Message-ID: <643159809.1210.1544458144371.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 115.34 KB...] checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/timerfd.h usability... yes checking sys/timerfd.h presence... yes checking for sys/timerfd.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for library containing dlsym... -ldl checking for backtrace in -lexecinfo... no checking for library containing clock_gettime... none required checking for doxygen... /usr/bin/doxygen checking whether SYS_getrandom is declared... yes checking if gcc supports -fvisibility=hidden... yes checking for clock_gettime... yes checking for localtime_r... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether to enable VTY/CTRL tests... no checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.12.0.144-c01c > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory ' GEN osmocom/core/bit16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_29_118.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm29118.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc64gen.c GEN crc16gen.c GEN crc8gen.c GEN crc32gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC select.lo CC timer_clockgettime.lo CC signal.lo CC msgb.lo CC bitvec.lo CC bits.lo /bin/bash: line 2: 14125 Illegal instruction /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT select.lo -MD -MP -MF $depbase.Tpo -c -o select.lo select.c Makefile:560: recipe for target 'select.lo' failed make[3]: *** [select.lo] Error 132 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:664: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Dec 10 16:11:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 16:11:41 +0000 Subject: Change in osmo-bsc[master]: set gscon FSM instances' log level to DEBUG In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12211 ) Change subject: set gscon FSM instances' log level to DEBUG ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie021483e93ab174abac51357bcca8895756566c4 Gerrit-Change-Number: 12211 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 16:11:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 16:12:07 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 16:12:07 +0000 Subject: Change in osmo-hlr[master]: display last location update timestamp in vty In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/12202 ) Change subject: display last location update timestamp in vty ...................................................................... display last location update timestamp in vty Read the subscriber's last location update timestamp from the database and display it in the output of 'show subscriber'. For example: OsmoHLR> show subscriber id 1 ID: 1 IMSI: 123456789000000 MSISDN: 543210123456789 VLR number: 712 SGSN number: 5952 last LU seen: Fri Dec 7 11:30:51 2018 UTC While the database stores the timestamp as a string, we convert the timestamp into time_t for internal use. This allows for flexible potential use of the timestamp in contexts other than the VTY in the future. The timestamp displayed in the VTY is created with ctime_r(3). It does not match the format of the raw string in the database: sqlite> select id,last_lu_seen from subscriber; 1|2018-12-07 11:30:51 Related: OS#2838 Change-Id: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a --- M src/db.h M src/db_hlr.c M src/hlr_vty_subscr.c 3 files changed, 44 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/db.h b/src/db.h index 5129b8d..ae592fb 100644 --- a/src/db.h +++ b/src/db.h @@ -84,8 +84,14 @@ uint32_t lmsi; bool ms_purged_cs; bool ms_purged_ps; + time_t last_lu_seen; }; +/* A format string for use with strptime(3). This format string is + * used to parse the last_lu_seen column stored in the HLR database. + * See https://sqlite.org/lang_datefunc.html, function datetime(). */ +#define DB_LAST_LU_SEEN_FMT "%Y-%m-%d %H:%M:%S" + /* Like struct osmo_sub_auth_data, but the keys are in hexdump representation. * This is useful because SQLite requires them in hexdump format, and callers * like the VTY and CTRL interface also have them available as hexdump to begin diff --git a/src/db_hlr.c b/src/db_hlr.c index db31009..c97cd82 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -17,6 +17,11 @@ * */ +#define _POSIX_C_SOURCE 200809L /* for strptime(3) */ +/* These are needed as well due to the above _POSIX_C_SOURCE definition: */ +#define _DEFAULT_SOURCE /* for struct timezone */ +#define _XOPEN_SOURCE /* for clockid_t */ + #include #include #include @@ -387,6 +392,8 @@ { int rc; int ret = 0; + const char *last_lu_seen_str; + struct tm tm; /* execute the statement */ rc = sqlite3_step(stmt); @@ -419,6 +426,20 @@ subscr->lmsi = sqlite3_column_int(stmt, 10); subscr->ms_purged_cs = sqlite3_column_int(stmt, 11); subscr->ms_purged_ps = sqlite3_column_int(stmt, 12); + last_lu_seen_str = (const char *)sqlite3_column_text(stmt, 13); + if (last_lu_seen_str && last_lu_seen_str[0] != '\0') { + if (strptime(last_lu_seen_str, DB_LAST_LU_SEEN_FMT, &tm) == NULL) { + LOGP(DAUC, LOGL_ERROR, "Cannot parse last LU timestamp '%s' of subscriber with IMSI='%s': %s\n", + last_lu_seen_str, subscr->imsi, strerror(errno)); + } else { + subscr->last_lu_seen = mktime(&tm); + if (subscr->last_lu_seen == -1) { + LOGP(DAUC, LOGL_ERROR, "Cannot convert LU timestamp '%s' to time_t: %s\n", + last_lu_seen_str, strerror(errno)); + subscr->last_lu_seen = 0; + } + } + } out: db_remove_reset(stmt); diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index bc6f6a5..92cfa2a 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include #include @@ -33,11 +35,24 @@ #define hexdump_buf(buf) osmo_hexdump_nospc((void*)buf, sizeof(buf)) +static char * +get_datestr(const time_t *t, char *datebuf) +{ + char *p, *s = ctime_r(t, datebuf); + + /* Strip trailing newline. */ + p = strchr(s, '\n'); + if (p) + *p = '\0'; + return s; +} + static void subscr_dump_full_vty(struct vty *vty, struct hlr_subscriber *subscr) { int rc; struct osmo_sub_auth_data aud2g; struct osmo_sub_auth_data aud3g; + char datebuf[26]; /* for ctime_r(3) */ vty_out(vty, " ID: %"PRIu64"%s", subscr->id, VTY_NEWLINE); @@ -63,6 +78,8 @@ vty_out(vty, " PS disabled%s", VTY_NEWLINE); if (subscr->ms_purged_ps) vty_out(vty, " PS purged%s", VTY_NEWLINE); + if (subscr->last_lu_seen) + vty_out(vty, " last LU seen: %s UTC%s", get_datestr(&subscr->last_lu_seen, datebuf), VTY_NEWLINE); if (!*subscr->imsi) return; -- To view, visit https://gerrit.osmocom.org/12202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a Gerrit-Change-Number: 12202 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 16:15:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 16:15:12 +0000 Subject: Change in libosmocore[master]: add osmo_bcd2str() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12153 ) Change subject: add osmo_bcd2str() ...................................................................... Patch Set 6: Code-Review+1 Since I'm not confident with this topic, leaving others to +1 or +2. -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 16:15:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 16:21:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 16:21:12 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12228/2/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12228/2/src/db_hlr.c at 644 PS2, Line 644: if (osmo_clock_gettime(CLOCK_REALTIME, &localtime) != 0) { Since starting from this line it seems to be a separate logic (updating VLR subscriber timestamp), I think it'd be clearer to have it in a separate function. Can be done in a follow-up patch. What do you think? https://gerrit.osmocom.org/#/c/12228/2/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/#/c/12228/2/src/hlr_vty.c at 133 PS2, Line 133: vty_out(vty, "Timestamps of Location Updates will be stored in the HLR database.%s", VTY_NEWLINE); IMHO these vty_out lines can be dropped, but fine otherwise. We are storing subscriber data anyway, like "name", etc. -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 16:21:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 16:22:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 16:22:17 +0000 Subject: Change in osmo-sgsn[master]: Use explicit length check In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12229 ) Change subject: Use explicit length check ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0fbeb8d248c74e54bfb51ba2cdea55c4f386ac7 Gerrit-Change-Number: 12229 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 16:22:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 16:58:42 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 16:58:42 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12177 to look at the new patch set (#5). Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... make gsup ipa name configurable in osmo-msc.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the MSC. This is a prerequisite for inter-MSC handover. Related: OS#3355 Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/test_nodes.vty 20 files changed, 159 insertions(+), 128 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/12177/5 -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:00:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 10 Dec 2018 17:00:08 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12177 ) Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 10 Dec 2018 17:00:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:01:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 10 Dec 2018 17:01:06 +0000 Subject: Change in osmo-msc[master]: provide software version information to gsup peer In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12178 ) Change subject: provide software version information to gsup peer ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2eba32569349facdbb1fda201067c62cc804ccf4 Gerrit-Change-Number: 12178 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 10 Dec 2018 17:01:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:02:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:02:12 +0000 Subject: Change in osmo-sgsn[master]: Remove misleading comment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12220 ) Change subject: Remove misleading comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe9c62e0beb89eecced941b8831d49ca266c7330 Gerrit-Change-Number: 12220 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:02:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:04:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:04:04 +0000 Subject: Change in libosmocore[master]: gsm48_generate_mid(): mask out ODD flag from mi_type In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12155 ) Change subject: gsm48_generate_mid(): mask out ODD flag from mi_type ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 Gerrit-Change-Number: 12155 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 17:04:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:05:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:05:12 +0000 Subject: Change in libosmocore[master]: add osmo_bcd2str() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12153 ) Change subject: add osmo_bcd2str() ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 17:05:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:05:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:05:50 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12154 ) Change subject: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1b51b72a721e1cc9d69796b804ebda741ff0f36b Gerrit-Change-Number: 12154 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 17:05:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:06:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:06:11 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): guard against zero length output buffer In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12156 ) Change subject: gsm48_mi_to_string(): guard against zero length output buffer ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I709ac3b9efb7b4258d8660715b10312e11b9b571 Gerrit-Change-Number: 12156 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 17:06:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:06:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 17:06:20 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12228/2/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/#/c/12228/2/src/hlr_vty.c at 133 PS2, Line 133: vty_out(vty, "Timestamps of Location Updates will be stored in the HLR database.%s", VTY_NEWLINE); > IMHO these vty_out lines can be dropped, but fine otherwise. [?] Can you elaborate what you're referring to when you say we're storing subscriber names? Which field of the DB do you mean? Do you mean some other database then the HLR db? -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:06:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:06:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:06:28 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): do not read from zero length input buffer In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12157 ) Change subject: gsm48_mi_to_string(): do not read from zero length input buffer ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I12cada7c2c5187146ca5a33d1ebfefb4cad65632 Gerrit-Change-Number: 12157 Gerrit-PatchSet: 8 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 17:06:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:06:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:06:30 +0000 Subject: Change in libosmocore[master]: add osmo_bcd2str() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12153 ) Change subject: add osmo_bcd2str() ...................................................................... add osmo_bcd2str() Add a standalone bcd-to-string conversion function with generic parameters. Add a regression test in utils_test.c. So far there is no single universal implementation that converts a BCD to a string. I could only find gsm48_mi_to_string(), which also interprets surrounding bytes, MI type and TMSI as non-BCD value. The idea is to use this function from gsm48_mi_to_string() and similar implementations in subsequent commits. Root cause: in osmo-msc, I want to have an alternative MI-to-string function for composing an FSM name, which needs the BCD part of gsm48_mi_to_string() but not the TMSI part. Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 --- M include/osmocom/core/utils.h M src/utils.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 4 files changed, 186 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 0b54c88..04f2fb4 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -49,6 +49,8 @@ /* only works for numbers in ascci */ uint8_t osmo_char2bcd(char c); +int osmo_bcd2str(char *dst, size_t dst_size, const uint8_t *bcd, int start_nibble, int end_nibble, bool allow_hex); + int osmo_hexparse(const char *str, uint8_t *b, int max_len); char *osmo_ubit_dump(const uint8_t *bits, unsigned int len); diff --git a/src/utils.c b/src/utils.c index e6adcf8..4b4e6d2 100644 --- a/src/utils.c +++ b/src/utils.c @@ -129,6 +129,47 @@ return 0; } +/*! Convert BCD to string. + * The given nibble offsets are interpreted in BCD order, i.e. nibble 0 is bcd[0] & 0xf, nibble 1 is bcd[0] >> 4, nibble + * 3 is bcd[1] & 0xf, etc.. + * \param[out] dst Output string buffer, is always nul terminated when dst_size > 0. + * \param[in] dst_size sizeof() the output string buffer. + * \param[in] bcd Binary coded data buffer. + * \param[in] start_nibble Offset to start from, in nibbles, typically 1 to skip the first nibble. + * \param[in] end_nibble Offset to stop before, in nibbles, e.g. sizeof(bcd) - (bcd[0] & GSM_MI_ODD? 0:1). + * \param[in] allow_hex If false, return error if there are digits other than 0-9. If true, return those as [A-F]. + * \returns The strlen that would be written if the output buffer is large enough, excluding nul byte (like + * snprintf()), or -EINVAL if allow_hex is false and a digit > 9 is encountered. On -EINVAL, the conversion is + * still completed as if allow_hex were passed as true. Return -ENOMEM if dst is NULL or dst_size is zero. + * If end_nibble <= start_nibble, write an empty string to dst and return 0. + */ +int osmo_bcd2str(char *dst, size_t dst_size, const uint8_t *bcd, int start_nibble, int end_nibble, bool allow_hex) +{ + char *dst_end = dst + dst_size - 1; + int nibble_i; + int rc = 0; + + if (!dst || dst_size < 1) + return -ENOMEM; + + for (nibble_i = start_nibble; nibble_i < end_nibble && dst < dst_end; nibble_i++, dst++) { + uint8_t nibble = bcd[nibble_i >> 1]; + if ((nibble_i & 1)) + nibble >>= 4; + nibble &= 0xf; + + if (!allow_hex && nibble > 9) + rc = -EINVAL; + + *dst = osmo_bcd2char(nibble); + } + *dst = '\0'; + + if (rc < 0) + return rc; + return OSMO_MAX(0, end_nibble - start_nibble); +} + /*! Parse a string containing hexadecimal digits * \param[in] str string containing ASCII encoded hexadecimal digits * \param[out] b output buffer diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index 2bb1f9c..a773b3f 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -32,6 +32,7 @@ #include #include #include +#include static void hexdump_test(void) { @@ -383,6 +384,118 @@ } } +struct bcd2str_test { + const char *bcd_hex; + int start_nibble; + int end_nibble; + bool allow_hex; + size_t str_size; + const char *expect_str; + int expect_rc; +}; + +static const struct bcd2str_test bcd2str_tests[] = { + { + .bcd_hex = "1a 32 54 76 98 f0", + .start_nibble = 1, + .end_nibble = 11, + .expect_str = "1234567890", + .expect_rc = 10, + }, + { + .bcd_hex = "1a 32 a4 cb 9d f0", + .start_nibble = 1, + .end_nibble = 11, + .expect_str = "1234ABCD90", + .expect_rc = -EINVAL, + }, + { + .bcd_hex = "1a 32 a4 cb 9d f0", + .start_nibble = 1, + .end_nibble = 11, + .allow_hex = true, + .expect_str = "1234ABCD90", + .expect_rc = 10, + }, + { + .bcd_hex = "1a 32 54 76 98 f0", + .start_nibble = 1, + .end_nibble = 12, + .expect_str = "1234567890F", + .expect_rc = -EINVAL, + }, + { + .bcd_hex = "1a 32 54 76 98 f0", + .start_nibble = 1, + .end_nibble = 12, + .allow_hex = true, + .expect_str = "1234567890F", + .expect_rc = 11, + }, + { + .bcd_hex = "1a 32 54 76 98 f0", + .start_nibble = 0, + .end_nibble = 12, + .allow_hex = true, + .expect_str = "A1234567890F", + .expect_rc = 12, + }, + { + .bcd_hex = "1a 32 54 76 98 f0", + .start_nibble = 1, + .end_nibble = 12, + .str_size = 5, + .expect_str = "1234", + .expect_rc = 11, + }, + { + .bcd_hex = "", + .start_nibble = 1, + .end_nibble = 1, + .expect_str = "", + .expect_rc = 0, + }, +}; + +static void bcd2str_test(void) +{ + int i; + uint8_t bcd[64]; + int rc; + + printf("\nTesting bcd to string conversion\n"); + + for (i = 0; i < ARRAY_SIZE(bcd2str_tests); i++) { + const struct bcd2str_test *t = &bcd2str_tests[i]; + char str[64] = {}; + size_t str_size = t->str_size ? : sizeof(str); + + osmo_hexparse(t->bcd_hex, bcd, sizeof(bcd)); + + printf("- BCD-input='%s' nibbles=[%d..%d[ str_size=%zu\n", t->bcd_hex, + t->start_nibble, t->end_nibble, str_size); + rc = osmo_bcd2str(str, str_size, bcd, t->start_nibble, t->end_nibble, t->allow_hex); + + printf(" rc=%d\n", rc); + + OSMO_ASSERT(str[str_size-1] == '\0'); + printf(" -> %s\n", osmo_quote_str(str, -1)); + + if (rc != t->expect_rc) + printf(" ERROR: expected rc=%d\n", t->expect_rc); + if (strcmp(str, t->expect_str)) + printf(" ERROR: expected result %s\n", osmo_quote_str(t->expect_str, -1)); + } + + printf("- zero output buffer\n"); + rc = osmo_bcd2str(NULL, 100, bcd, 1, 2, false); + printf(" bcd2str(NULL, ...) -> %d\n", rc); + OSMO_ASSERT(rc < 0); + rc = osmo_bcd2str((char*)23, 0, bcd, 1, 2, false); + printf(" bcd2str(dst, 0, ...) -> %d\n", rc); + OSMO_ASSERT(rc < 0); +} + static void str_escape_test(void) { int i; @@ -810,6 +923,7 @@ test_ipa_ccm_id_resp_parsing(); test_is_hexstr(); bcd_test(); + bcd2str_test(); str_escape_test(); str_quote_test(); isqrt_test(); diff --git a/tests/utils/utils_test.ok b/tests/utils/utils_test.ok index 3ea8ec6..65e32ed 100644 --- a/tests/utils/utils_test.ok +++ b/tests/utils/utils_test.ok @@ -80,6 +80,35 @@ val=0xe, expected=E, found=E val=0xf, expected=F, found=F +Testing bcd to string conversion +- BCD-input='1a 32 54 76 98 f0' nibbles=[1..11[ str_size=64 + rc=10 + -> "1234567890" +- BCD-input='1a 32 a4 cb 9d f0' nibbles=[1..11[ str_size=64 + rc=-22 + -> "1234ABCD90" +- BCD-input='1a 32 a4 cb 9d f0' nibbles=[1..11[ str_size=64 + rc=10 + -> "1234ABCD90" +- BCD-input='1a 32 54 76 98 f0' nibbles=[1..12[ str_size=64 + rc=-22 + -> "1234567890F" +- BCD-input='1a 32 54 76 98 f0' nibbles=[1..12[ str_size=64 + rc=11 + -> "1234567890F" +- BCD-input='1a 32 54 76 98 f0' nibbles=[0..12[ str_size=64 + rc=12 + -> "A1234567890F" +- BCD-input='1a 32 54 76 98 f0' nibbles=[1..12[ str_size=5 + rc=11 + -> "1234" +- BCD-input='' nibbles=[1..1[ str_size=64 + rc=0 + -> "" +- zero output buffer + bcd2str(NULL, ...) -> -12 + bcd2str(dst, 0, ...) -> -12 + Testing string escaping - all chars from 0 to 255 in batches of 16: "\0\1\2\3\4\5\6\a\b\t\n\v\f\r\14\15" -- To view, visit https://gerrit.osmocom.org/12153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I86b09d37ceef33331c1a56046a5443127d6c6be0 Gerrit-Change-Number: 12153 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:06:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:06:31 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12154 ) Change subject: gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases ...................................................................... gsm48_mi_to_string: use osmo_bcd2str(), fix some corner cases By using osmo_bcd2str(), ensure that the resulting string is always nul terminated, and always return strlen()+1 whether truncated or not. Still keep up the previous return value style, even if that isn't consistent at all. The difference between IMSI/IMEI and TMSI return values remains and is not part of this patch. Change-Id: I1b51b72a721e1cc9d69796b804ebda741ff0f36b --- M src/gsm/gsm48.c M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 3 files changed, 24 insertions(+), 29 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index e684a3c..4558dfb 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -638,7 +638,8 @@ return gsm48_generate_mid(buf, imsi, GSM_MI_TYPE_IMSI); } -/*! Convert TS 04.08 Mobile Identity (10.5.1.4) to string +/*! Convert TS 04.08 Mobile Identity (10.5.1.4) to string. + * This function does not validate the Mobile Identity digits, i.e. digits > 9 are returned as 'A'-'F'. * \param[out] string Caller-provided buffer for output * \param[in] str_len Length of \a string in bytes * \param[in] mi Mobile Identity to be stringified @@ -650,7 +651,7 @@ int gsm48_mi_to_string(char *string, const int str_len, const uint8_t *mi, const int mi_len) { - int i; + int rc; uint8_t mi_type; char *str_cur = string; uint32_t tmsi; @@ -670,17 +671,15 @@ case GSM_MI_TYPE_IMSI: case GSM_MI_TYPE_IMEI: case GSM_MI_TYPE_IMEISV: - *str_cur++ = osmo_bcd2char(mi[0] >> 4); - - for (i = 1; i < mi_len; i++) { - if (str_cur + 2 >= string + str_len) - return str_cur - string; - *str_cur++ = osmo_bcd2char(mi[i] & 0xf); - /* skip last nibble in last input byte when GSM_EVEN */ - if( (i != mi_len-1) || (mi[0] & GSM_MI_ODD)) - *str_cur++ = osmo_bcd2char(mi[i] >> 4); - } - break; + rc = osmo_bcd2str(string, str_len, mi, + 1, mi_len * 2 - ((mi[0] & GSM_MI_ODD) ? 0 : 1), true); + /* osmo_bcd2str() returns snprintf style strlen(), this returns bytes written. */ + if (rc < 0) + return 0; + else if (rc < str_len) + return rc + 1; + else + return strlen(string) + 1; default: break; } diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 24f903a..c786d38 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -393,7 +393,6 @@ .expect_mi_tlv_hex = "170449322453", .str_size = 4, .expect_str = "423", - .expect_rc = 3, /* exception: on truncation, gsm48_mi_to_string() returns strlen(), not bytes! */ }, { .mi_type = GSM_MI_TYPE_IMEI, @@ -421,7 +420,6 @@ .expect_mi_tlv_hex = "170a937856341290785634f2", .str_size = 16, .expect_str = "987654321098765", - .expect_rc = 15, /* exception: on truncation, gsm48_mi_to_string() returns strlen(), not bytes! */ }, { /* gsm48 treats TMSI as decimal string */ diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 1dc4249..2db58de 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -23,8 +23,7 @@ -> MI-str="4234235" rc=8 - IMSI 4234235 -> MI-TLV-hex='170449322453' - -> MI-str="423" rc=3 - ERROR: resulting string is not explicitly nul terminated + -> MI-str="423" rc=4 - IMEI 123456789012345 -> MI-TLV-hex='17081a32547698103254' -> MI-str="123456789012345" rc=16 @@ -39,8 +38,7 @@ -> MI-str="987654321098765432" rc=19 - IMEI-SV 987654321098765432 -> MI-TLV-hex='170a937856341290785634f2' - -> MI-str="987654321098765" rc=15 - ERROR: resulting string is not explicitly nul terminated + -> MI-str="987654321098765" rc=16 - TMSI 305419896 -> MI-TLV-hex='1705f412345678' -> MI-str="305419896" rc=9 @@ -66,14 +64,14 @@ Decoding zero length Mobile Identities - MI type: IMSI - writing to zero-length string: - rc=1 - ERROR: Wrote to invalid memory! + rc=0 + nothing written - writing to 1-byte-length string: rc=1 - ERROR: Wrote unexpected string "1!!!!" + returned empty string - decode zero-length mi: - rc=2 - ERROR: expected empty string, got output string: "1" + rc=1 + returned empty string - MI type: TMSI - writing to zero-length string: rc=1 @@ -96,14 +94,14 @@ returned empty string - MI type: IMSI | GSM_MI_ODD - writing to zero-length string: - rc=1 - ERROR: Wrote to invalid memory! + rc=0 + nothing written - writing to 1-byte-length string: rc=1 - ERROR: Wrote unexpected string "1!!!!" + returned empty string - decode zero-length mi: - rc=2 - ERROR: expected empty string, got output string: "1" + rc=1 + returned empty string - MI type: TMSI | GSM_MI_ODD - writing to zero-length string: rc=1 -- To view, visit https://gerrit.osmocom.org/12154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1b51b72a721e1cc9d69796b804ebda741ff0f36b Gerrit-Change-Number: 12154 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:06:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:06:31 +0000 Subject: Change in libosmocore[master]: gsm48_generate_mid(): mask out ODD flag from mi_type In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12155 ) Change subject: gsm48_generate_mid(): mask out ODD flag from mi_type ...................................................................... gsm48_generate_mid(): mask out ODD flag from mi_type For MI encoding, see 3GPP TS 24.008, 10.5.1.4 Mobile Identity. The 'odd' flag indicates whether the last BCD nibble is used. Of course that flag should be made sure to reflect the actual length. Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 --- M src/gsm/gsm48.c M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 3 files changed, 6 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 4558dfb..0f0889b 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -611,7 +611,7 @@ uint8_t length = strnlen(id, 255), i, off = 0, odd = (length & 1) == 1; buf[0] = GSM48_IE_MOBILE_ID; - buf[2] = osmo_char2bcd(id[0]) << 4 | mi_type | (odd << 3); + buf[2] = osmo_char2bcd(id[0]) << 4 | (mi_type & GSM_MI_TYPE_MASK) | (odd << 3); /* if the length is even we will fill half of the last octet */ buf[1] = (length + (odd ? 1 : 2)) >> 1; diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index c786d38..9bb320d 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -380,7 +380,7 @@ { .mi_type = GSM_MI_TYPE_IMSI | GSM_MI_ODD, .mi_str = "423423", - .expect_mi_tlv_hex = "1704493224f3", /* encodes "odd" for even number of digits! */ + .expect_mi_tlv_hex = "1704413224f3", }, { .mi_type = GSM_MI_TYPE_IMSI, @@ -464,7 +464,7 @@ { .mi_type = GSM_MI_ODD, .mi_str = "1234", - .expect_mi_tlv_hex = "17031832f4", /* encoding invalid MI type, and "odd" for an even number of digits */ + .expect_mi_tlv_hex = "17031032f4", /* encoding invalid MI type */ .expect_str = "", }, }; diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 2db58de..6e99f5b 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -14,10 +14,8 @@ -> MI-TLV-hex='1704413224f3' -> MI-str="423423" rc=7 - unknown 0x9 423423 - -> MI-TLV-hex='1704493224f3' - -> MI-str="423423F" rc=8 - ERROR: expected MI-str="423423" - ERROR: expected rc=7 + -> MI-TLV-hex='1704413224f3' + -> MI-str="423423" rc=7 - IMSI 4234235 -> MI-TLV-hex='170449322453' -> MI-str="4234235" rc=8 @@ -58,7 +56,7 @@ -> MI-TLV-hex='17031032f4' -> MI-str="" rc=1 - unknown 0x8 1234 - -> MI-TLV-hex='17031832f4' + -> MI-TLV-hex='17031032f4' -> MI-str="" rc=1 Decoding zero length Mobile Identities -- To view, visit https://gerrit.osmocom.org/12155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id6e695ebf9f86b295eaa7e2c6228989256f37e68 Gerrit-Change-Number: 12155 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:06:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:06:32 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): guard against zero length output buffer In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12156 ) Change subject: gsm48_mi_to_string(): guard against zero length output buffer ...................................................................... gsm48_mi_to_string(): guard against zero length output buffer All successful cases already return from the switch(), so simply handle all errors below it by returning an empty string (if there is enough string buffer). Change-Id: I709ac3b9efb7b4258d8660715b10312e11b9b571 --- M src/gsm/gsm48.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 13 insertions(+), 13 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 0f0889b..af3e14c 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -653,14 +653,11 @@ { int rc; uint8_t mi_type; - char *str_cur = string; uint32_t tmsi; mi_type = mi[0] & GSM_MI_TYPE_MASK; switch (mi_type) { - case GSM_MI_TYPE_NONE: - break; case GSM_MI_TYPE_TMSI: /* Table 10.5.4.3, reverse generate_mid_from_tmsi */ if (mi_len == GSM48_TMSI_LEN && mi[0] == (0xf0 | GSM_MI_TYPE_TMSI)) { @@ -680,12 +677,15 @@ return rc + 1; else return strlen(string) + 1; + default: break; } - *str_cur++ = '\0'; - return str_cur - string; + if (str_len < 1) + return 0; + *string = '\0'; + return 1; } /*! Parse TS 04.08 Routing Area Identifier diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 6e99f5b..d6579e5 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -72,8 +72,8 @@ returned empty string - MI type: TMSI - writing to zero-length string: - rc=1 - ERROR: Wrote to invalid memory! + rc=0 + nothing written - writing to 1-byte-length string: rc=1 returned empty string @@ -82,8 +82,8 @@ returned empty string - MI type: NONE - writing to zero-length string: - rc=1 - ERROR: Wrote to invalid memory! + rc=0 + nothing written - writing to 1-byte-length string: rc=1 returned empty string @@ -102,8 +102,8 @@ returned empty string - MI type: TMSI | GSM_MI_ODD - writing to zero-length string: - rc=1 - ERROR: Wrote to invalid memory! + rc=0 + nothing written - writing to 1-byte-length string: rc=1 returned empty string @@ -112,8 +112,8 @@ returned empty string - MI type: NONE | GSM_MI_ODD - writing to zero-length string: - rc=1 - ERROR: Wrote to invalid memory! + rc=0 + nothing written - writing to 1-byte-length string: rc=1 returned empty string -- To view, visit https://gerrit.osmocom.org/12156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I709ac3b9efb7b4258d8660715b10312e11b9b571 Gerrit-Change-Number: 12156 Gerrit-PatchSet: 8 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:06:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:06:32 +0000 Subject: Change in libosmocore[master]: gsm48_mi_to_string(): do not read from zero length input buffer In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12157 ) Change subject: gsm48_mi_to_string(): do not read from zero length input buffer ...................................................................... gsm48_mi_to_string(): do not read from zero length input buffer Change-Id: I12cada7c2c5187146ca5a33d1ebfefb4cad65632 --- M src/gsm/gsm48.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index af3e14c..190622f 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -655,7 +655,7 @@ uint8_t mi_type; uint32_t tmsi; - mi_type = mi[0] & GSM_MI_TYPE_MASK; + mi_type = (mi && mi_len) ? (mi[0] & GSM_MI_TYPE_MASK) : GSM_MI_TYPE_NONE; switch (mi_type) { case GSM_MI_TYPE_TMSI: -- To view, visit https://gerrit.osmocom.org/12157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I12cada7c2c5187146ca5a33d1ebfefb4cad65632 Gerrit-Change-Number: 12157 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:07:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:07:05 +0000 Subject: Change in osmo-sgsn[master]: Remove misleading comment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12220 ) Change subject: Remove misleading comment ...................................................................... Remove misleading comment The code which has been used for 4 years is hardly temporary. Change-Id: Ibe9c62e0beb89eecced941b8831d49ca266c7330 --- M src/gprs/sgsn_auth.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c index 694bece..e3d9127 100644 --- a/src/gprs/sgsn_auth.c +++ b/src/gprs/sgsn_auth.c @@ -43,7 +43,6 @@ INIT_LLIST_HEAD(&sgsn->cfg.imsi_acl); } -/* temporary IMSI ACL hack */ struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, struct sgsn_config *cfg) { struct imsi_acl_entry *acl; -- To view, visit https://gerrit.osmocom.org/12220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibe9c62e0beb89eecced941b8831d49ca266c7330 Gerrit-Change-Number: 12220 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:07:07 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 17:07:07 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12228/2/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12228/2/src/db_hlr.c at 644 PS2, Line 644: if (osmo_clock_gettime(CLOCK_REALTIME, &localtime) != 0) { > Since starting from this line it seems to be a separate logic (updating VLR subscriber timestamp), I [?] Yes, good idea. I'll roll that into this patch. -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:07:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:07:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 17:07:36 +0000 Subject: Change in docker-playground[master]: gerrit: fix libopenid path In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12204 ) Change subject: gerrit: fix libopenid path ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 Gerrit-Change-Number: 12204 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 17:07:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:15:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 17:15:52 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12228 to look at the new patch set (#3). Change subject: disable recording of LU timestamps by default ...................................................................... disable recording of LU timestamps by default Add VTY commands which enable or disable recording of Location Update timestamps in the HLR database. Because this feature has implications for the privacy of network users, it is now off by default. It needs to be explicitly enabled by the administrator who will see a warning about potential privacy concerns when doing so. The new commands added to the hlr configuration space are: record-lu-timestamps no record-lu-timestamps DB tests keep recording timestamps in the test database to ensure that the corresponding code is being exercised. Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Related: OS#2838 Depends: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a --- M src/db.h M src/db_hlr.c M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/db/db_test.c M tests/db/db_test.err M tests/test_nodes.vty 8 files changed, 117 insertions(+), 71 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/28/12228/3 -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:18:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:18:34 +0000 Subject: Change in osmo-sgsn[master]: Constify sgsn_acl_lookup() parameter In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12222 to look at the new patch set (#2). Change subject: Constify sgsn_acl_lookup() parameter ...................................................................... Constify sgsn_acl_lookup() parameter This requires I414e67a3de733fab407161b3264d3b89070ba537 in libosmocore to avoid warning about discarded const. Change-Id: Ie92637dd900b0f9eba891d5aad0b4ba0ee69c08c --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_auth.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/22/12222/2 -- To view, visit https://gerrit.osmocom.org/12222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie92637dd900b0f9eba891d5aad0b4ba0ee69c08c Gerrit-Change-Number: 12222 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:18:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:18:34 +0000 Subject: Change in osmo-sgsn[master]: Use libosmocore constant for IMSI length in ACL entry In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12224 to look at the new patch set (#3). Change subject: Use libosmocore constant for IMSI length in ACL entry ...................................................................... Use libosmocore constant for IMSI length in ACL entry Presumably the length is chosen to match that of imsi in osmo_gsup_message. Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 --- M include/osmocom/sgsn/gprs_sgsn.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/24/12224/3 -- To view, visit https://gerrit.osmocom.org/12224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 Gerrit-Change-Number: 12224 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:18:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:18:34 +0000 Subject: Change in osmo-sgsn[master]: Use explicit parameter for sgsn_auth_init() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12221 to look at the new patch set (#2). Change subject: Use explicit parameter for sgsn_auth_init() ...................................................................... Use explicit parameter for sgsn_auth_init() This is necessary to properly test ACLs in follow-up patches. Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1 --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_auth.c M src/gprs/sgsn_main.c M tests/sgsn/sgsn_test.c 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/21/12221/2 -- To view, visit https://gerrit.osmocom.org/12221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1 Gerrit-Change-Number: 12221 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:18:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:18:34 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12226 to look at the new patch set (#3). Change subject: Add tests for IMSI ACLs ...................................................................... Add tests for IMSI ACLs Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 --- M include/osmocom/sgsn/gprs_sgsn.h M tests/sgsn/sgsn_test.c M tests/sgsn/sgsn_test.ok 3 files changed, 121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/26/12226/3 -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:18:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:18:34 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12227 to look at the new patch set (#3). Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... ACL: integrate sanitize check into sgsn_acl_* functions Having this check in vty makes it hard to unit-test. Let's move this into separate static function and use it directly from sgsn_acl_* functions. Adjust test output accordingly. Related: SYS#4300 Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 --- M src/gprs/sgsn_auth.c M src/gprs/sgsn_vty.c M tests/sgsn/sgsn_test.ok 3 files changed, 33 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/27/12227/3 -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:19:32 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:19:32 +0000 Subject: Change in osmo-sgsn[master]: ACL: move allocation check forward in sgsn_acl_add() In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12225 ) Change subject: ACL: move allocation check forward in sgsn_acl_add() ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I5906304fd3c96002ca1fdc649609e5a4d9ca299b Gerrit-Change-Number: 12225 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:19:50 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:19:50 +0000 Subject: Change in osmo-sgsn[master]: Add sgsn_acl_count() In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12223 ) Change subject: Add sgsn_acl_count() ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ia7c5b36d07672ea43bfa2b531b9b6c56ba65161d Gerrit-Change-Number: 12223 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:21:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:21:38 +0000 Subject: Change in osmo-sgsn[master]: Use libosmocore constant for IMSI length in ACL entry In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12224 ) Change subject: Use libosmocore constant for IMSI length in ACL entry ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h at 417 PS2, Line 417: char imsi[GSM23003_IMSI_MAX_DIGITS + 2]; > why +2? Explain in commit description or/and here in this line. I'm not sure why this length is used and there're no comments about it before the patch. I've added my guess to commit log. -- To view, visit https://gerrit.osmocom.org/12224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 Gerrit-Change-Number: 12224 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:21:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:23:19 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:23:19 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12226 ) Change subject: Add tests for IMSI ACLs ...................................................................... Patch Set 3: (1 comment) The rest is fixed in next revision. https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c File tests/sgsn/sgsn_test.c: https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c at 1343 PS2, Line 1343: } > This line is suuuuuper ugly, mixing declaration, initialization and function call. That's pretty common code patern both in osmocom and other projects - I don't see anything ugly about it. -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:23:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:27:45 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:27:45 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12227 ) Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_auth.c File src/gprs/sgsn_auth.c: https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_auth.c at 89 PS2, Line 89: return -ENOMEM; > based on where the information come from The sgsn_acl_add() and _del() are only called by vty code so where it comes from is always the same. > Is there any good reason to do it here? Yes - see commit description. https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_vty.c at a650 PS2, Line 650: > See my comment, I think osmo_imsi_sanitize() should be used here. In which library it's defined? -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:27:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:30:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 17:30:18 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12228/2/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/#/c/12228/2/src/hlr_vty.c at 133 PS2, Line 133: vty_out(vty, "Timestamps of Location Updates will be stored in the HLR database.%s", VTY_NEWLINE); > Can you elaborate what you're referring to when you say we're storing subscriber names? [?] Hm I cannot find it anymore, so maybe it got remove, but I'm pretty sure at some point it was possible to attach some "human information" to subscriber through VTY in order to identify them. -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:30:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:33:19 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:33:19 +0000 Subject: Change in osmo-sgsn[master]: Drop unused osmo-sgsn.pc Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12231 Change subject: Drop unused osmo-sgsn.pc ...................................................................... Drop unused osmo-sgsn.pc We do not install any libraries so we don't need it: most likely it's a forgotten leftover from pre-split repo time. Change-Id: Ifabb26d1e6384659789061bc2abe23cb5ceca4cb --- M Makefile.am M configure.ac M debian/copyright D osmo-sgsn.pc.in 4 files changed, 0 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/31/12231/1 diff --git a/Makefile.am b/Makefile.am index 7ff989d..3f89896 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,9 +16,6 @@ tests \ $(NULL) -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = osmo-sgsn.pc - BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version diff --git a/configure.ac b/configure.ac index f0bef52..c0d3770 100644 --- a/configure.ac +++ b/configure.ac @@ -242,7 +242,6 @@ AM_CONFIG_HEADER(bscconfig.h) AC_OUTPUT( - osmo-sgsn.pc include/Makefile include/osmocom/Makefile include/osmocom/sgsn/Makefile diff --git a/debian/copyright b/debian/copyright index cc631f4..4e53664 100644 --- a/debian/copyright +++ b/debian/copyright @@ -45,7 +45,6 @@ include/osmocom/sgsn/sgsn.h include/osmocom/sgsn/vty.h m4/README - osmo-sgsn.pc.in src/Makefile.am src/gprs/.gitignore src/gprs/Makefile.am diff --git a/osmo-sgsn.pc.in b/osmo-sgsn.pc.in deleted file mode 100644 index 45aef57..0000000 --- a/osmo-sgsn.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/ - -Name: OsmoSGSN -Description: Osmocom's Serving GPRS Support Node for 2G and 3G packet-switched mobile networks -Requires: -Version: @VERSION@ -Cflags: -I${includedir} -- To view, visit https://gerrit.osmocom.org/12231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifabb26d1e6384659789061bc2abe23cb5ceca4cb Gerrit-Change-Number: 12231 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:34:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 17:34:12 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12228/3/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12228/3/src/db_hlr.c at 688 PS3, Line 688: db_remove_reset(stmt); This looks weird. Why not always first do db_remove_reset(stmt), then remove it second time inside the if after calling db_subscr_lu_record_timestamp()? Doesn't look more sane to you? -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 17:34:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:34:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 17:34:41 +0000 Subject: Change in osmo-sgsn[master]: Constify sgsn_acl_lookup() parameter In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12222 ) Change subject: Constify sgsn_acl_lookup() parameter ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie92637dd900b0f9eba891d5aad0b4ba0ee69c08c Gerrit-Change-Number: 12222 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:34:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 10 17:36:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 10 Dec 2018 17:36:25 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-iuh_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#2638?= In-Reply-To: <643159809.1210.1544458144371.JavaMail.jenkins@jenkins.osmocom.org> References: <643159809.1210.1544458144371.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1455391417.1211.1544463385226.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:41:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 17:41:18 +0000 Subject: Change in osmo-sgsn[master]: Use libosmocore constant for IMSI length in ACL entry In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12224 ) Change subject: Use libosmocore constant for IMSI length in ACL entry ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h at 417 PS2, Line 417: char imsi[GSM23003_IMSI_MAX_DIGITS + 2]; > I'm not sure why this length is used and there're no comments about it before the patch. [?] Comes from openbsc d3fa84dbba3b67cdbe2d8c789b2833b5ddf42068 -- To view, visit https://gerrit.osmocom.org/12224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 Gerrit-Change-Number: 12224 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:41:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:42:22 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 17:42:22 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12228/3/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12228/3/src/db_hlr.c at 688 PS3, Line 688: db_remove_reset(stmt); > This looks weird. [?] Yes it looks weird, but it is correct. Is it OK to run other statements before the most recently used statement has been reset? If so we could simplify this code. Otherwise, moving some code into a function has the downside that the 'goto out:' doesn't work anymore for the code which was moved to the function. -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 17:42:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:43:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 17:43:33 +0000 Subject: Change in osmo-sgsn[master]: Use libosmocore constant for IMSI length in ACL entry In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12224 ) Change subject: Use libosmocore constant for IMSI length in ACL entry ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h at 417 PS2, Line 417: char imsi[GSM23003_IMSI_MAX_DIGITS + 2]; > Comes from openbsc d3fa84dbba3b67cdbe2d8c789b2833b5ddf42068 And in there we use +1, which makes more sense: openbsc/src/osmo-bsc_nat/bsc_ussd.c 405: if (strlen(con->filter_state.imsi) > GSM23003_IMSI_MAX_DIGITS) openbsc/src/libmsc/ctrl_commands.c 67: else if (strlen(imsi) > GSM23003_IMSI_MAX_DIGITS) openbsc/include/openbsc/bsc_subscriber.h 16: char imsi[GSM23003_IMSI_MAX_DIGITS+1]; openbsc/include/openbsc/gsm_subscriber.h 47: char imsi[GSM23003_IMSI_MAX_DIGITS+1]; openbsc/include/openbsc/ipaccess.h 15: char imsi[GSM23003_IMSI_MAX_DIGITS+1]; -- To view, visit https://gerrit.osmocom.org/12224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 Gerrit-Change-Number: 12224 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:43:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:43:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 17:43:42 +0000 Subject: Change in osmo-sgsn[master]: Use libosmocore constant for IMSI length in ACL entry In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12224 ) Change subject: Use libosmocore constant for IMSI length in ACL entry ...................................................................... Patch Set 3: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/12224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 Gerrit-Change-Number: 12224 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:43:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:46:40 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 17:46:40 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12228/3/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12228/3/src/db_hlr.c at 688 PS3, Line 688: db_remove_reset(stmt); > Yes it looks weird, but it is correct. [?] Maybe the previous version was better after all? Refactoring this block of code actually adds a lot of line churn no matter what we do. -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 17:46:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:47:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:47:11 +0000 Subject: Change in osmo-sgsn[master]: Use libosmocore constant for IMSI length in ACL entry In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12224 ) Change subject: Use libosmocore constant for IMSI length in ACL entry ...................................................................... Patch Set 3: (1 comment) I do agree that extra byte is probably unnecessary but lets wait for Harald's comment since he did OpenBSC change. https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h at 417 PS2, Line 417: char imsi[GSM23003_IMSI_MAX_DIGITS + 2]; > And in there we use +1, which makes more sense Not only - there's also +2 in gsup part. -- To view, visit https://gerrit.osmocom.org/12224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 Gerrit-Change-Number: 12224 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:47:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:48:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 17:48:01 +0000 Subject: Change in osmo-sgsn[master]: Constify sgsn_acl_lookup() parameter In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12222 ) Change subject: Constify sgsn_acl_lookup() parameter ...................................................................... Constify sgsn_acl_lookup() parameter This requires I414e67a3de733fab407161b3264d3b89070ba537 in libosmocore to avoid warning about discarded const. Change-Id: Ie92637dd900b0f9eba891d5aad0b4ba0ee69c08c --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_auth.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index cf78766..0b721a3 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -460,7 +460,7 @@ extern const struct value_string *sgsn_auth_state_names; void sgsn_auth_init(void); -struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, struct sgsn_config *cfg); +struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, const struct sgsn_config *cfg); int sgsn_acl_add(const char *imsi, struct sgsn_config *cfg); int sgsn_acl_del(const char *imsi, struct sgsn_config *cfg); /* Request authorization */ diff --git a/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c index e3d9127..50f2126 100644 --- a/src/gprs/sgsn_auth.c +++ b/src/gprs/sgsn_auth.c @@ -43,7 +43,7 @@ INIT_LLIST_HEAD(&sgsn->cfg.imsi_acl); } -struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, struct sgsn_config *cfg) +struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, const struct sgsn_config *cfg) { struct imsi_acl_entry *acl; llist_for_each_entry(acl, &cfg->imsi_acl, list) { -- To view, visit https://gerrit.osmocom.org/12222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie92637dd900b0f9eba891d5aad0b4ba0ee69c08c Gerrit-Change-Number: 12222 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:53:09 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 17:53:09 +0000 Subject: Change in osmo-msc[master]: detach cancelled subscribers from VLR Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12232 Change subject: detach cancelled subscribers from VLR ...................................................................... detach cancelled subscribers from VLR When a subscriber is cancelled, fake an IMSI detach to ensure that the subscriber gets removed from the VLR. I am not entirely sure if this change is correct but it does make TTCN3 test MSC_Tests.TC_gsup_cancel pass. Change-Id: I5918106e4a94ba2e6c61bcd7b90d3bf0565513cc Related: OS#2886 --- M src/libvlr/vlr.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/12232/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 76c84de..3369914 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -970,6 +970,8 @@ gmm_cause_to_fsm_and_mm_cause(gsup_msg->cause, &fsm_cause, &gsm48_rej); vlr_subscr_cancel_attach_fsm(vsub, fsm_cause, gsm48_rej); + vlr_subscr_rx_imsi_detach(vsub); + return rc; } -- To view, visit https://gerrit.osmocom.org/12232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5918106e4a94ba2e6c61bcd7b90d3bf0565513cc Gerrit-Change-Number: 12232 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 17:57:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 17:57:47 +0000 Subject: Change in osmo-sgsn[master]: Use libosmocore constant for IMSI length in ACL entry In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12224 ) Change subject: Use libosmocore constant for IMSI length in ACL entry ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h at 417 PS2, Line 417: char imsi[GSM23003_IMSI_MAX_DIGITS + 2]; > > And in there we use +1, which makes more sense [?] So commit openbsc d3fa84dbba3b67cdbe2d8c789b2833b5ddf42068 changed GSM_IMSI_LENGTH to be GSM23003_IMSI_MAX_DIGITS+1 in all places except one to GSM23003_IMSI_MAX_DIGITS+2. That looks like a typo in that commit to me. @Harald, can you confirm (you are the author of the commit)? -- To view, visit https://gerrit.osmocom.org/12224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 Gerrit-Change-Number: 12224 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 17:57:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:01:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 18:01:18 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12226 ) Change subject: Add tests for IMSI ACLs ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12226/3/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/12226/3/include/osmocom/sgsn/gprs_sgsn.h at 466 PS3, Line 466: size_t sgsn_acl_count(const struct sgsn_config *cfg); unrelated whitespace. https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c File tests/sgsn/sgsn_test.c: https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c at 1343 PS2, Line 1343: size_t old = sgsn_acl_count(cfg), new; > That's pretty common code patern both in osmocom and other projects - I don't see anything ugly abou [?] Doing these stuff while having another variable after calling the function separate by a comma? Let me doubt so (and if there's any place like that it should be cleaned up). -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 18:01:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:03:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 18:03:24 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12227 ) Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... Patch Set 2: (1 comment) So I'm fine with moving it into a function, but I think the function should be called by the caller of sgsn_acl_* only if needed, not always inside sgsn_acl_* https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12227/2/src/gprs/sgsn_vty.c at a650 PS2, Line 650: > In which library it's defined? sorry, I meant the imsi_sanitize() you add in this commit. -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 18:03:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:04:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 18:04:23 +0000 Subject: Change in osmo-sgsn[master]: Drop unused osmo-sgsn.pc In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12231 ) Change subject: Drop unused osmo-sgsn.pc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifabb26d1e6384659789061bc2abe23cb5ceca4cb Gerrit-Change-Number: 12231 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 18:04:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:05:58 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 18:05:58 +0000 Subject: Change in osmo-sgsn[master]: Drop unused osmo-sgsn.pc In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12231 ) Change subject: Drop unused osmo-sgsn.pc ...................................................................... Drop unused osmo-sgsn.pc We do not install any libraries so we don't need it: most likely it's a forgotten leftover from pre-split repo time. Change-Id: Ifabb26d1e6384659789061bc2abe23cb5ceca4cb --- M Makefile.am M configure.ac M debian/copyright D osmo-sgsn.pc.in 4 files changed, 0 insertions(+), 15 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index 7ff989d..3f89896 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,9 +16,6 @@ tests \ $(NULL) -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = osmo-sgsn.pc - BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version diff --git a/configure.ac b/configure.ac index f0bef52..c0d3770 100644 --- a/configure.ac +++ b/configure.ac @@ -242,7 +242,6 @@ AM_CONFIG_HEADER(bscconfig.h) AC_OUTPUT( - osmo-sgsn.pc include/Makefile include/osmocom/Makefile include/osmocom/sgsn/Makefile diff --git a/debian/copyright b/debian/copyright index cc631f4..4e53664 100644 --- a/debian/copyright +++ b/debian/copyright @@ -45,7 +45,6 @@ include/osmocom/sgsn/sgsn.h include/osmocom/sgsn/vty.h m4/README - osmo-sgsn.pc.in src/Makefile.am src/gprs/.gitignore src/gprs/Makefile.am diff --git a/osmo-sgsn.pc.in b/osmo-sgsn.pc.in deleted file mode 100644 index 45aef57..0000000 --- a/osmo-sgsn.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/ - -Name: OsmoSGSN -Description: Osmocom's Serving GPRS Support Node for 2G and 3G packet-switched mobile networks -Requires: -Version: @VERSION@ -Cflags: -I${includedir} -- To view, visit https://gerrit.osmocom.org/12231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifabb26d1e6384659789061bc2abe23cb5ceca4cb Gerrit-Change-Number: 12231 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:06:08 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 10 Dec 2018 18:06:08 +0000 Subject: Change in osmo-sgsn[master]: Use explicit length check In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12229 ) Change subject: Use explicit length check ...................................................................... Use explicit length check Use OSMO_MIN macro to check for MSISDN length. This makes the code cleaner and will, hopefully, aid static analysis tools. Change-Id: Ic0fbeb8d248c74e54bfb51ba2cdea55c4f386ac7 Fixes: CID57879 --- M src/gprs/sgsn_libgtp.c 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c index 478d402..a8a1502 100644 --- a/src/gprs/sgsn_libgtp.c +++ b/src/gprs/sgsn_libgtp.c @@ -176,9 +176,7 @@ /* Put the MSISDN in case we have it */ if (mmctx->subscr && mmctx->subscr->sgsn_data->msisdn_len) { - pdp->msisdn.l = mmctx->subscr->sgsn_data->msisdn_len; - if (pdp->msisdn.l > sizeof(pdp->msisdn.v)) - pdp->msisdn.l = sizeof(pdp->msisdn.v); + pdp->msisdn.l = OSMO_MIN(mmctx->subscr->sgsn_data->msisdn_len, sizeof(pdp->msisdn.v)); memcpy(pdp->msisdn.v, mmctx->subscr->sgsn_data->msisdn, pdp->msisdn.l); } else { -- To view, visit https://gerrit.osmocom.org/12229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic0fbeb8d248c74e54bfb51ba2cdea55c4f386ac7 Gerrit-Change-Number: 12229 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:06:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 18:06:52 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12228/3/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12228/3/src/db_hlr.c at 688 PS3, Line 688: db_remove_reset(stmt); > Maybe the previous version was better after all? Refactoring this block of code actually adds a lot [?] Ah good point about the goto :) -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:06:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:08:28 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 18:08:28 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12228 to look at the new patch set (#4). Change subject: disable recording of LU timestamps by default ...................................................................... disable recording of LU timestamps by default Add VTY commands which enable or disable recording of Location Update timestamps in the HLR database. Because this feature has implications for the privacy of network users, it is now off by default. It needs to be explicitly enabled by the administrator who will see a warning about potential privacy concerns when doing so. The new commands added to the hlr configuration space are: record-lu-timestamps no record-lu-timestamps DB tests keep recording timestamps in the test database to ensure that the corresponding code is being exercised. Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Related: OS#2838 Depends: Ie180c434f02ffec0d4b2f651a73258a8126b2e1a --- M src/db.h M src/db_hlr.c M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/db/db_test.c M tests/db/db_test.err M tests/test_nodes.vty 8 files changed, 65 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/28/12228/4 -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:08:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 18:08:50 +0000 Subject: Change in osmo-msc[master]: detach cancelled subscribers from VLR In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12232 ) Change subject: detach cancelled subscribers from VLR ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5918106e4a94ba2e6c61bcd7b90d3bf0565513cc Gerrit-Change-Number: 12232 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 18:08:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:08:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 18:08:57 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12228/3/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12228/3/src/db_hlr.c at 688 PS3, Line 688: * \param[in] by_imsi ASCII string of IMSI digits. > Ah good point about the goto :) I'll restore the previous version then. I liked it better. -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:08:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:11:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 18:11:13 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12228/3/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12228/3/src/db_hlr.c at 688 PS3, Line 688: db_remove_reset(stmt); > I'll restore the previous version then. I liked it better. I actually prefer this version, it's still more split between different parts. -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:11:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:11:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 18:11:48 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:11:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:12:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 18:12:27 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 4: Please don't merge this before Harald has had a chance to respond. In the issue he suggested that he does not agree with this approach but I wrote this patch anyway, hoping to convince him. -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:12:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:14:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 18:14:34 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has removed a vote on this change. Change subject: disable recording of LU timestamps by default ...................................................................... Removed Code-Review+2 by Pau Espin Pedrol -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:14:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 18:14:38 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:14:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:25:01 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 18:25:01 +0000 Subject: Change in libosmocore[master]: stats.h: Fix build on MacOS In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12212 ) Change subject: stats.h: Fix build on MacOS ...................................................................... Patch Set 1: Code-Review+1 Oooohh! a non-Linux platform! :) -- To view, visit https://gerrit.osmocom.org/12212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I037c3ca141ecee2d457e0a881a56e32ee24cec4d Gerrit-Change-Number: 12212 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:25:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:29:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 18:29:39 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 17: (1 comment) https://gerrit.osmocom.org/#/c/12020/13/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/13/tests/gsm0808/gsm0808_test.c at 615 PS13, Line 615: struct msgb *msg; > If decoding failed (gsm0808_dec_gcr returned <0), it makes no sense using p and printing related p s [?] I agree with Pau. This code can simply skip all further p checks if decoding failed in the first place. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 17 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:29:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:34:59 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 18:34:59 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Patch Set 23: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11827/23/tests/gsm29205/gsm29205_test.c File tests/gsm29205/gsm29205_test.c: https://gerrit.osmocom.org/#/c/11827/23/tests/gsm29205/gsm29205_test.c at 69 PS23, Line 69: Same problem as pointed out by Pau in https://gerrit.osmocom.org/c/libosmocore/+/12020 The decoder failed, so we should treat the contents of p as undefined and just skip the code below. The osmo_dec_gcr() API does not allow for any other reasonable course of action because the caller can't tell how the decoder failed exactly. -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 23 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:34:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:36:30 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 18:36:30 +0000 Subject: Change in libosmo-netif[master]: logging: fix typo in stream.c In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12217 ) Change subject: logging: fix typo in stream.c ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5dcae1f19e18f04709ce7585943af1d582ebc7ed Gerrit-Change-Number: 12217 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:36:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:39:30 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 18:39:30 +0000 Subject: Change in osmo-msc[master]: drop gsm48 RR ciph mode compl from permitted initial messages In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12207 ) Change subject: drop gsm48 RR ciph mode compl from permitted initial messages ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0079f07271ca76bd457d0e700f3a736eb9066b47 Gerrit-Change-Number: 12207 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:39:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:48:18 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 18:48:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_chan_exhaustion: Send correct RA to alloc all different channels In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12215 ) Change subject: bsc: TC_chan_exhaustion: Send correct RA to alloc all different channels ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12215/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12215/1//COMMIT_MSG at 10 PS1, Line 10: rate capable but was asking speciifically for only TCH/F channel. As a Typo: speciifically -> specifically -- To view, visit https://gerrit.osmocom.org/12215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e58592c661fc004e648dbe46b67a3b3f5a20bc8 Gerrit-Change-Number: 12215 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 10 Dec 2018 18:48:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:53:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 18:53:41 +0000 Subject: Change in osmo-bsc[master]: Add VTY option to avoid sending empty Full BCCH Info for disabled SI In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12133 ) Change subject: Add VTY option to avoid sending empty Full BCCH Info for disabled SI ...................................................................... Patch Set 2: Code-Review+1 (4 comments) https://gerrit.osmocom.org/#/c/12133/2/src/osmo-bsc/bsc_init.c File src/osmo-bsc/bsc_init.c: https://gerrit.osmocom.org/#/c/12133/2/src/osmo-bsc/bsc_init.c at 184 PS2, Line 184: rc = 0; /* some nanoBTs fw don't like receiving empty unsupported SI */ BTs -> BTS ? https://gerrit.osmocom.org/#/c/12133/2/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/12133/2/src/osmo-bsc/bsc_vty.c at 3096 PS2, Line 3096: "Some nanoBTS fw versions are known to fail upron receival of these messages.\n") typo: upron -> upon https://gerrit.osmocom.org/#/c/12133/2/src/osmo-bsc/bsc_vty.c at 3109 PS2, Line 3109: "Some nanoBTS fw versions are known to fail upron receival of these messages.\n") Same typo https://gerrit.osmocom.org/#/c/12133/1/src/osmo-bsc/gsm_data.c File src/osmo-bsc/gsm_data.c: https://gerrit.osmocom.org/#/c/12133/1/src/osmo-bsc/gsm_data.c at 858 PS1, Line 858: bts->si_unused_send_empty = true; > Hm perhaps si_unused_send_empty? Yeah, si_unused_send_empy seems fine. -- To view, visit https://gerrit.osmocom.org/12133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 Gerrit-Change-Number: 12133 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 10 Dec 2018 18:53:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:54:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 18:54:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_chan_exhaustion: Send correct RA to alloc all different channels In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12215 ) Change subject: bsc: TC_chan_exhaustion: Send correct RA to alloc all different channels ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e58592c661fc004e648dbe46b67a3b3f5a20bc8 Gerrit-Change-Number: 12215 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 10 Dec 2018 18:54:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:54:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 18:54:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_chan_exhaustion: Send correct RA to alloc all different channels In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12215 ) Change subject: bsc: TC_chan_exhaustion: Send correct RA to alloc all different channels ...................................................................... bsc: TC_chan_exhaustion: Send correct RA to alloc all different channels Previous RA value (23, Establishment cause = 0010XXXX) meant MS was dual rate capable but was asking speciifically for only TCH/F channel. As a result, TCH/H was not being allocated and an immediate assignment reject was sent. Change-Id: I3e58592c661fc004e648dbe46b67a3b3f5a20bc8 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index aaa4580..77da306 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -489,9 +489,11 @@ chreq_total := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total"); chreq_nochan := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:no_channel"); - /* expect 5xTCH/F to succeed */ + /* GSM 04.08 Table 9.9a: + * RA = '33'O -> Establishment cause = 0011xxxx (MS dual rate capable and asks for "TCH/H or TCH/F"). + * With current setup, expect 4xSDCCH + 4xTCH/F + 1xTCH/H to succeed */ for (i := 0; i < NUM_TCHF_PER_BTS + NUM_TCHH_PER_BTS + NUM_SDCCH_PER_BTS; i := i+1) { - var RslChannelNr chan_nr := f_chreq_act_ack('23'O, i); + var RslChannelNr chan_nr := f_chreq_act_ack('33'O, i); } IPA_RSL[0].clear; -- To view, visit https://gerrit.osmocom.org/12215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3e58592c661fc004e648dbe46b67a3b3f5a20bc8 Gerrit-Change-Number: 12215 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:56:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 18:56:27 +0000 Subject: Change in osmo-msc[master]: drop gsm48 RR ciph mode compl from permitted initial messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12207 ) Change subject: drop gsm48 RR ciph mode compl from permitted initial messages ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0079f07271ca76bd457d0e700f3a736eb9066b47 Gerrit-Change-Number: 12207 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:56:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:58:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 18:58:13 +0000 Subject: Change in osmo-msc[master]: move ASS-COMPL MGCP handling out of a_iface_bssap.c In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12201 ) Change subject: move ASS-COMPL MGCP handling out of a_iface_bssap.c ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8137215c443239bddf3e69b5715839a365b73b6c Gerrit-Change-Number: 12201 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 18:58:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:59:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 18:59:21 +0000 Subject: Change in osmo-msc[master]: detach cancelled subscribers from VLR In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12232 ) Change subject: detach cancelled subscribers from VLR ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5918106e4a94ba2e6c61bcd7b90d3bf0565513cc Gerrit-Change-Number: 12232 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 18:59:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:59:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 18:59:34 +0000 Subject: Change in libosmocore[master]: stats.h: Fix build on MacOS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12212 ) Change subject: stats.h: Fix build on MacOS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I037c3ca141ecee2d457e0a881a56e32ee24cec4d Gerrit-Change-Number: 12212 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:59:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:59:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 18:59:50 +0000 Subject: Change in libosmo-netif[master]: logging: fix typo in stream.c In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12217 ) Change subject: logging: fix typo in stream.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5dcae1f19e18f04709ce7585943af1d582ebc7ed Gerrit-Change-Number: 12217 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 18:59:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 18:59:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 18:59:52 +0000 Subject: Change in libosmo-netif[master]: logging: fix typo in stream.c In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12217 ) Change subject: logging: fix typo in stream.c ...................................................................... logging: fix typo in stream.c Change-Id: I5dcae1f19e18f04709ce7585943af1d582ebc7ed --- M src/stream.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index 4548414..902e688 100644 --- a/src/stream.c +++ b/src/stream.c @@ -91,7 +91,7 @@ &event, sizeof(event)); if (rc < 0) - LOGP(DLINP, LOGL_ERROR, "coudldn't activate SCTP events " + LOGP(DLINP, LOGL_ERROR, "couldn't activate SCTP events " "on FD %u\n", fd); return rc; #else -- To view, visit https://gerrit.osmocom.org/12217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5dcae1f19e18f04709ce7585943af1d582ebc7ed Gerrit-Change-Number: 12217 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 19:01:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 19:01:11 +0000 Subject: Change in docker-playground[master]: cosmetic: gerrit: use variables for the files to patch In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12205 ) Change subject: cosmetic: gerrit: use variables for the files to patch ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771 Gerrit-Change-Number: 12205 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 10 Dec 2018 19:01:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 19:03:59 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 19:03:59 +0000 Subject: Change in osmo-msc[master]: move ASS-COMPL MGCP handling out of a_iface_bssap.c In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12201 ) Change subject: move ASS-COMPL MGCP handling out of a_iface_bssap.c ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12201/3/include/osmocom/msc/msc_mgcp.h File include/osmocom/msc/msc_mgcp.h: https://gerrit.osmocom.org/#/c/12201/3/include/osmocom/msc/msc_mgcp.h at 27 PS3, Line 27: struct gsm0808_speech_codec; > Why not adding correct headers instead? Yes, seems like osmocom/msc/ran_conn.h and osmocom/gsm/protocol/gsm_08_08.h would do? -- To view, visit https://gerrit.osmocom.org/12201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8137215c443239bddf3e69b5715839a365b73b6c Gerrit-Change-Number: 12201 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 19:03:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 19:06:47 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 19:06:47 +0000 Subject: Change in osmo-bsc[master]: set gscon FSM instances' log level to DEBUG In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12211 ) Change subject: set gscon FSM instances' log level to DEBUG ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie021483e93ab174abac51357bcca8895756566c4 Gerrit-Change-Number: 12211 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 19:06:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 19:13:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 19:13:22 +0000 Subject: Change in osmo-bsc[master]: Add VTY option to avoid sending empty Full BCCH Info for disabled SI In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12133 to look at the new patch set (#3). Change subject: Add VTY option to avoid sending empty Full BCCH Info for disabled SI ...................................................................... Add VTY option to avoid sending empty Full BCCH Info for disabled SI According to 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION: "If the Full BCCH information element is not included this indicates that transmission of the indicated SYSTEM INFORMATION message shall be stopped." However, some ipaccess nanoBTS firmware versions are known to not support some SI elements and also to dislike receiving BCCH Information for those SI, even if received with empty BCCH Information meaning they should not be used. Upon receival of this kind of message, nanoBTS sends a Failure Report with following text: Type=processing failure, Severity=critical failure, Probable cause=Manufacturer specific values: Fatal software error, Additional Text=l2_bch.c:1149 **** ** l2_bch.c#1149:BCHbcchSItypeValid( prim_p->infoType ) ** IPA_SW_FATAL_ERROR ** In task "TRX Proc:L2_BCH" @ (325). **** This kind of issue only appears with some fw versions, since it's known to work fine in other ones, so let's not disable this kind of mesage by default on all BTs of type "nanobts". Instead, add a VTY command that allows disabling this kind of message in order to be able to operate those nanoBTS units. Fixes: OS#3707 Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_data.c 4 files changed, 50 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/12133/3 -- To view, visit https://gerrit.osmocom.org/12133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 Gerrit-Change-Number: 12133 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 19:14:53 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 19:14:53 +0000 Subject: Change in osmo-sgsn[master]: Use explicit parameter for sgsn_auth_init() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12221 ) Change subject: Use explicit parameter for sgsn_auth_init() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12221/1/tests/sgsn/sgsn_test.c File tests/sgsn/sgsn_test.c: https://gerrit.osmocom.org/#/c/12221/1/tests/sgsn/sgsn_test.c at 51 PS1, Line 51: struct sgsn_instance *sgsn = &sgsn_inst; > Ah here it is. [?] Probably because other tests, such as test_gmm_cancel(), still depend on the global variable. -- To view, visit https://gerrit.osmocom.org/12221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1 Gerrit-Change-Number: 12221 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 19:14:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 19:18:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 10 Dec 2018 19:18:24 +0000 Subject: Change in osmo-sgsn[master]: Use explicit parameter for sgsn_auth_init() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12221 ) Change subject: Use explicit parameter for sgsn_auth_init() ...................................................................... Patch Set 2: Code-Review+1 Can you provide some patches to get rid of the global variable then? or at least keep it only for VTY if needed. -- To view, visit https://gerrit.osmocom.org/12221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1 Gerrit-Change-Number: 12221 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 19:18:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 19:21:34 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 19:21:34 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12226 ) Change subject: Add tests for IMSI ACLs ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c File tests/sgsn/sgsn_test.c: https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c at 1343 PS2, Line 1343: } > Doing these stuff while having another variable after calling the function separate by a comma? Let [?] May I suggest a variable name change: old_count and new_count? -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 19:21:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 19:35:50 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 10 Dec 2018 19:35:50 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12227 ) Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12227/3/src/gprs/sgsn_auth.c File src/gprs/sgsn_auth.c: https://gerrit.osmocom.org/#/c/12227/3/src/gprs/sgsn_auth.c at 58 PS3, Line 58: return true; The docstring says the imsi is truncated if we return true from this function. "truncated" implies that dst contains all imsi data up to MAX_DIGITS, and any remaining imsi data beyond MAX_DIGITS will be missing from dst. But in fact, when we return true here, the destination buffer is still empty - it does not contain any imsi data! So this is a contradiciton. I cannot actully tell what this code intends to do. It looks to me like either the docstring or the code should be fixed. -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 10 Dec 2018 19:35:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 20:09:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 20:09:03 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11751 ) Change subject: GSUP/SMS: introduce READY-FOR-SM message ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Gerrit-Change-Number: 11751 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 10 Dec 2018 20:09:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 20:09:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 10 Dec 2018 20:09:50 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 10 Dec 2018 20:09:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 20:46:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 20:46:25 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 4: Code-Review+2 (5 comments) I still see some of my points not addressed, but it's better to have this now than nothing. If you will, you could address below review and ping me to +2 again; or merge and come back with anoter patch later; or merge and disagree with me and I will eternally dislike it but probably forget about it soon :P https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc at 509 PS4, Line 509: Direction: MSC / SGSN => SMSC (through HLR) (a nicer term is "via", not "through" ... but nm) https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc at 541 PS4, Line 541: _MO (Mobile Originated)_ short message delivery. The corresponding I still think it is really irritating to explain the same abbreviations over and over. If you have to, place the braces once above and then don't do that anymore for the rest of the doc. But actually, instead make sure MO and MT are in the glossary and then rely on that completely. We did agree on that before, right? I think we also agreed before on less fancy fontsy stuff, i.e. try to avoid italics and bold script. Especially don't place an entire "FOO (yada)" in italics? https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc at 543 PS4, Line 543: section 12.2. it's much nicer with the reference in the end, thanks :) https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc at 578 PS4, Line 578: This message is used to forward _MT (Mobile Terminated)_ short messages MT from glossary https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc at 579 PS4, Line 579: from an SMSC to MSC (CS domain) / SGSN (PS domain). The corresponding MAP and I still don't like this. I am still of the same opinion: the protocol definition is not the place to explain MSC = CS domain and SGSN = PS domain, especially not N times over and over. -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 10 Dec 2018 20:46:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 21:38:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 21:38:29 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages ...................................................................... Patch Set 10: Code-Review-1 (25 comments) many comments aren't critical, except: - I think the OA/DA IE structure needs to be flattened. - Use punctuation and other doxygen misc. couldn't resist to remark on some peculiarities that you are just taking over from other code around there, please ignore those... https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup.h File include/osmocom/gsm/gsup.h: https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup.h at 94 PS10, Line 94: OSMO_GSUP_SM_RP_MR_IE = 0x40, oh ok, we really have "_IE" in the end then? well... ok then. https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup.h at 134 PS10, Line 134: OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST = 0b00100100, also interesting that we define the message type in binary... ok then https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup.h at 235 PS10, Line 235: * Please note that there is no SM-RP-MR in TCAP/MAP! SM-RP-MR in doxygen this becomes SM-RP-MR (see 3GPP TS 29.002, 7.6.1.1), Message Reference Please note that... Please use punctuation!! https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup.h at 237 PS10, Line 237: const uint8_t *sm_rp_mr; oh wow, so we don't inline uint8_t[] then? hmm. ok. ok then... and we use tabs... well then https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup_sms.h File include/osmocom/gsm/gsup_sms.h: https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup_sms.h at 17 PS10, Line 17: OSMO_GSUP_SMS_SM_RP_ODA_NONE = 0x00, isn't "SMS_SM" redundant? could it be just OSMO_GSUP_SMS_ or just OSMO_GSUP_SM_? https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup_sms.h at 25 PS10, Line 25: /* Forward declarations (to avoid mutual include) */ yes, that's what they are, and I think all C programmers should be aware of that concept? https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup_sms.h at 29 PS10, Line 29: /* SM-RP-DA IE coding functions */ a) I see that in the function name; unless you also explain "SM", "RP" or "DA", you might as well drop the entire comment. (I would opt for dropping cruft) b) place function comments in the .c file plz https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup.c File src/gsm/gsup.c: https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup.c at 569 PS10, Line 569: int idx, rc; (rather place each var on its own line) https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup.c at 668 PS10, Line 668: sizeof(u8), gsup_msg->sm_rp_mr); (either line up with '(' or use a single tab as indent) https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c File src/gsm/gsup_sms.c: https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 33 PS10, Line 33: * SMS (Short Message Service) extensions for Osmocom GSUP please please use punctuation to end the summary line. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 35 PS10, Line 35: (I think we usually write in one line /*! Foo yada but then again I think Linus Torvalds referred to that as brain damaged once, so whatever.) https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 37 PS10, Line 37: * Encode SM-RP-DA IE (see 7.6.8.1), Destination Address please please use punctuation to end the summary line. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 43 PS10, Line 43: const struct osmo_gsup_message *gsup_msg) (I guess this fits on a 120 wide line?) https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 53 PS10, Line 53: /*! Special case for noSM-RP-DA and noSM-RP-OA */ i doubt code inline doxygen makes sense. it might even end up in above function doc block? https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 62 PS10, Line 62: "(type=0x%02x)!\n", gsup_msg->sm_rp_da_type); (also looks like comfortable fit for 120 width, at least for the char constant) https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 74 PS10, Line 74: ie_len = msg->tail + 1; /* To be calculated later */ max recently added API for this, see msgb_tl_put() https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 82 PS10, Line 82: *ie_len = msg->tail - (ie_len + 1); so ... this looks like this now? [DA_IE, len, [DA_TYPE, len, DA data...] ] Can this instead remain a flat layer of TLV structures? There are two nested layers, I think we should avoid that. Otherwise we are opening up corner cases, and both len fields need to be checked: the first one implicitly by our TLV decoder (nice), and the second one manually after having retrieved the first V (sigh) Define the IE as [ DA_IE, len, TYPE, data ] and you can derive data_len = overall_len - sizeof(TYPE), and you're already sure that this len doesn't break the TLV structure. Furthermore, if this will ever be likely to need extension, there should be a reserved type value that indicates a differing structure. Like, type = 0xff indicates a format to be defined in the future. Inner TLVs? That would be quite ugly, but if we can officially reserve one type value for that now (which we can still get for free), we might be glad in the future. Then maybe NULL could be 0xfe... https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 88 PS10, Line 88: * Decode SM-RP-DA IE (see 7.6.8.1), Destination Address . https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 125 PS10, Line 125: /*! Special case for noSM-RP-DA and noSM-RP-OA */ . https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 142 PS10, Line 142: gsup_msg->sm_rp_da_len = id_len; you are failing to check that the inner len does not surpass the outer TLV. Hence flatten please and this becomes unnecessary: define the IE as [ DA_IE, len, TYPE, data ] and you can derive data_len = overall_len - sizeof(TYPE), and you're already sure that this len doesn't break the TLV structure. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 163 PS10, Line 163: /*! Special case for noSM-RP-DA and noSM-RP-OA */ . https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 189 PS10, Line 189: gsup_msg->sm_rp_oa_len, gsup_msg->sm_rp_oa); (same) https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 251 PS10, Line 251: gsup_msg->sm_rp_oa_len = id_len; (same) https://gerrit.osmocom.org/#/c/11069/10/tests/gsup/gsup_test.c File tests/gsup/gsup_test.c: https://gerrit.osmocom.org/#/c/11069/10/tests/gsup/gsup_test.c at 231 PS10, Line 231: 0xff, 0x00, /* Special case: noSM-RP-OA */ (again the inner len issue; would it still be valid with a nonzero len? would have to add tests...) https://gerrit.osmocom.org/#/c/11069/10/tests/gsup/gsup_test.c at 247 PS10, Line 247: 0x03, 0x07, /* SMSC address */ (again the inner len issue; if you kept it this way you would have to add tests that assure a mismatching inner len results in parse error) -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 10 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 10 Dec 2018 21:38:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:18:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:18:25 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: What about -1 vote counting? ...................................................................... Removed Code-Review+2 by Pau Espin Pedrol -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:18:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:18:37 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: What about -1 vote counting? ...................................................................... Removed Code-Review-1 by osmith -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:18:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:18:39 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: What about -1 vote counting? ...................................................................... Removed -Code-Review by osmith -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:18:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:18:41 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: What about -1 vote counting? ...................................................................... Removed -Code-Review by osmith -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:18:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:18:47 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 23:18:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:19:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:19:31 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 23:19:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:19:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:19:44 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: What about -1 vote counting? ...................................................................... Removed Code-Review+2 by Neels Hofmeyr -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:19:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:19:53 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: What about -1 vote counting? ...................................................................... Removed Verified+1 by Pau Espin Pedrol -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:20:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:20:11 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 23:20:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:20:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:20:30 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: What about -1 vote counting? ...................................................................... Removed Code-Review+2 by Neels Hofmeyr -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:20:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:20:34 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 23:20:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:21:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:21:03 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 23:21:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:21:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:21:11 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: What about -1 vote counting? ...................................................................... Removed Code-Review+1 by Max -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:21:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:21:53 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: What about -1 vote counting? ...................................................................... Removed Code-Review+2 by Neels Hofmeyr -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 10 23:22:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 10 Dec 2018 23:22:01 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 10 Dec 2018 23:22:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 01:06:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 01:06:19 +0000 Subject: Change in osmo-msc[master]: LU: do not always invoke sub_pres_vlr_fsm_start() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12233 Change subject: LU: do not always invoke sub_pres_vlr_fsm_start() ...................................................................... LU: do not always invoke sub_pres_vlr_fsm_start() sub_pres_vlr_fsm_start() starts the FSM, invokes the START event, and then this FSM invariably always directly terminates when vsub->ms_not_reachable_flag == false. So if it is false, there is not much use in instantiating a whole FSM instance that just terminates again, we might as well directly issue the parent-term-event and save some logging space. The same condition is already in place in the vlr_proc_acc_fsm.c in _proc_arq_vlr_node2_post_vlr() for CM Service Request and Paging Response. Now also skip this for LU. Change-Id: Id2303a795dfd381f76e94ff8ff2f495926ca8ba0 --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/12233/1 diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 02e49e0..74a6939 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -413,7 +413,12 @@ osmo_fsm_inst_state_chg(fi, LU_COMPL_VLR_S_WAIT_SUB_PRES, LU_TIMEOUT_LONG, 0); - sub_pres_vlr_fsm_start(&lcvp->sub_pres_vlr_fsm, fi, vsub, LU_COMPL_VLR_E_SUB_PRES_COMPL); + /* If ms_not_reachable_flag == false, the sub_pres_vlr_fsm will anyway terminate straight away and dispatch + * LU_COMPL_VLR_E_SUB_PRES_COMPL to this fi, so we might as well skip that dance here and save some logging. */ + if (vsub->ms_not_reachable_flag) + sub_pres_vlr_fsm_start(&lcvp->sub_pres_vlr_fsm, fi, vsub, LU_COMPL_VLR_E_SUB_PRES_COMPL); + else + osmo_fsm_inst_dispatch(fi, LU_COMPL_VLR_E_SUB_PRES_COMPL, NULL); } static void lu_compl_vlr_new_tmsi(struct osmo_fsm_inst *fi) -- To view, visit https://gerrit.osmocom.org/12233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id2303a795dfd381f76e94ff8ff2f495926ca8ba0 Gerrit-Change-Number: 12233 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 01:06:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 01:06:19 +0000 Subject: Change in osmo-msc[master]: tweak comment to indicate sub_pres_vlr fsm as dead code Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12234 Change subject: tweak comment to indicate sub_pres_vlr fsm as dead code ...................................................................... tweak comment to indicate sub_pres_vlr fsm as dead code sub_pres_vlr_fsm_start() only ever has an effect if ms_not_reachable_flag == true. But there simply is no code that sets this flag. So sub_pres_vlr_fsm_start() is currently dead code. Also, examining the FSM, if it should ever be set to true, this would halt the LU/CM Service/Paging response, since the FSM would merely change its state without dispatching asynchronous messages. No chance of finishing. Short of dropping the code entirely, first just mark it. The point being that this models some FSM definition from 3GPP specs, and we have a couple other "if (0)" branches in the VLR... Change-Id: I198d442e9ed288f37c7d4e5ec87b82dc53114e99 --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/12234/1 diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 74a6939..a0cbcab 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -271,7 +271,9 @@ return (struct vlr_subscr*)fi->priv; } -/* Note that the start event is dispatched right away, so in case the FSM immediately concludes from that +/* THIS IS CURRENTLY DEAD CODE, SINCE WE NEVER SET vsub->ms_not_reachable_flag = true. + * + * Note that the start event is dispatched right away, so in case the FSM immediately concludes from that * event, the created FSM struct may no longer be valid as it already deallocated again, and it may * furthermore already have invoked the parent FSM instance's deallocation as well. Hence, instead of * returning, store the created FSM instance address in *fi_p before dispatching the event. It is thus -- To view, visit https://gerrit.osmocom.org/12234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I198d442e9ed288f37c7d4e5ec87b82dc53114e99 Gerrit-Change-Number: 12234 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 01:11:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 01:11:43 +0000 Subject: Change in osmo-msc[master]: LU: do not always invoke sub_pres_vlr_fsm_start() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12233 to look at the new patch set (#2). Change subject: LU: do not always invoke sub_pres_vlr_fsm_start() ...................................................................... LU: do not always invoke sub_pres_vlr_fsm_start() sub_pres_vlr_fsm_start() starts the FSM, invokes the START event, and then this FSM invariably always directly terminates when vsub->ms_not_reachable_flag == false. So if it is false, there is not much use in instantiating a whole FSM instance that just terminates again, we might as well directly issue the parent-term-event and save some logging space. The same condition is already in place in the vlr_proc_acc_fsm.c in _proc_arq_vlr_node2_post_vlr() for CM Service Request and Paging Response. Now also skip this for LU. Change-Id: Id2303a795dfd381f76e94ff8ff2f495926ca8ba0 --- M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 12 files changed, 6 insertions(+), 497 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/12233/2 -- To view, visit https://gerrit.osmocom.org/12233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id2303a795dfd381f76e94ff8ff2f495926ca8ba0 Gerrit-Change-Number: 12233 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 01:14:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 01:14:39 +0000 Subject: Change in libosmocore[master]: fix api doc for osmo_bcd2str() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12235 Change subject: fix api doc for osmo_bcd2str() ...................................................................... fix api doc for osmo_bcd2str() Change-Id: I504ea849fc9daeb34a1b3c5343371161deba743e --- M src/utils.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/35/12235/1 diff --git a/src/utils.c b/src/utils.c index 4b4e6d2..35d70ac 100644 --- a/src/utils.c +++ b/src/utils.c @@ -136,7 +136,7 @@ * \param[in] dst_size sizeof() the output string buffer. * \param[in] bcd Binary coded data buffer. * \param[in] start_nibble Offset to start from, in nibbles, typically 1 to skip the first nibble. - * \param[in] end_nibble Offset to stop before, in nibbles, e.g. sizeof(bcd) - (bcd[0] & GSM_MI_ODD? 0:1). + * \param[in] end_nibble Offset to stop before, in nibbles, e.g. sizeof(bcd)*2 - (bcd[0] & GSM_MI_ODD? 0:1). * \param[in] allow_hex If false, return error if there are digits other than 0-9. If true, return those as [A-F]. * \returns The strlen that would be written if the output buffer is large enough, excluding nul byte (like * snprintf()), or -EINVAL if allow_hex is false and a digit > 9 is encountered. On -EINVAL, the conversion is -- To view, visit https://gerrit.osmocom.org/12235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I504ea849fc9daeb34a1b3c5343371161deba743e Gerrit-Change-Number: 12235 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 01:15:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 01:15:21 +0000 Subject: Change in osmo-msc[master]: move ASS-COMPL MGCP handling out of a_iface_bssap.c In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12201 ) Change subject: move ASS-COMPL MGCP handling out of a_iface_bssap.c ...................................................................... move ASS-COMPL MGCP handling out of a_iface_bssap.c BSSMAP Assignment Complete: sort MGCP handling upon Assignment Complete to the proper locations. a_iface_bssap.c is not the right place to invoke the MGCP related procedures. - in a_iface_bssap.c only decode the IEs. - call ran_conn_assign_compl() and pass decoded values. - drop msc_assign_compl(), it was dead code; instead: - add ran_conn_assign_compl() - pass on all MGCP related info to msc_mgcp_ass_complete() - move all MGCP ctx related handling from a_iface_bssap.c to msc_mgcp.c. I'm dropping some comments to save some time, because if I adjust them IMHO they would still anyway restate the obvious. ran_conn_assign_compl() is now quite a thin shim, but it makes sense to have it: - This is the place that should tear down the ran_conn in case assignment failed, left for a future patch. - In the light of upcoming inter-MSC handover, ran_conn_assign_compl() will be the place where the Assignment Complete message might be relayed to a remote MSC. Change-Id: I8137215c443239bddf3e69b5715839a365b73b6c --- M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/ran_conn.h M src/libmsc/a_iface_bssap.c M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 5 files changed, 88 insertions(+), 88 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h index 9d8b01d..db8dff2 100644 --- a/include/osmocom/msc/msc_mgcp.h +++ b/include/osmocom/msc/msc_mgcp.h @@ -24,6 +24,8 @@ #include struct ran_conn; +struct gsm0808_speech_codec; +struct sockaddr_storage; /* MGCP state handler context. This context information stores all information * to handle the direction of the RTP streams via MGCP. There is one instance @@ -58,6 +60,7 @@ }; int msc_mgcp_call_assignment(struct gsm_trans *trans); -int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr); +int msc_mgcp_ass_complete(struct ran_conn *conn, const struct gsm0808_speech_codec *speech_codec_chosen, + const struct sockaddr_storage *aoip_transport_addr); int msc_mgcp_call_complete(struct gsm_trans *trans, uint16_t port, char *addr); int msc_mgcp_call_release(struct gsm_trans *trans); diff --git a/include/osmocom/msc/ran_conn.h b/include/osmocom/msc/ran_conn.h index d71872e..3716f86 100644 --- a/include/osmocom/msc/ran_conn.h +++ b/include/osmocom/msc/ran_conn.h @@ -7,6 +7,9 @@ #include #include +struct gsm0808_speech_codec; +struct sockaddr_storage; + enum ran_type { RAN_UNKNOWN, RAN_GERAN_A, /* 2G / A-interface */ @@ -197,6 +200,8 @@ void ran_conn_classmark_chg(struct ran_conn *conn, const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len); +void ran_conn_assign_compl(struct ran_conn *conn, const struct gsm0808_speech_codec *speech_codec_chosen, + const struct sockaddr_storage *aoip_transport_addr); void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause); void ran_conn_init(void); diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index d84a234..4e8b146 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -34,7 +34,6 @@ #include #include #include -#include #include @@ -498,51 +497,12 @@ return 0; } -/* Use the speech codec info we go with the assignment complete to dtermine - * which codec we will signal to the MGW */ -static enum mgcp_codecs mgcp_codec_from_sc(struct gsm0808_speech_codec *sc) -{ - switch (sc->type) { - case GSM0808_SCT_FR1: - return CODEC_GSM_8000_1; - break; - case GSM0808_SCT_FR2: - return CODEC_GSMEFR_8000_1; - break; - case GSM0808_SCT_FR3: - return CODEC_AMR_8000_1; - break; - case GSM0808_SCT_FR4: - return CODEC_AMRWB_16000_1; - break; - case GSM0808_SCT_FR5: - return CODEC_AMRWB_16000_1; - break; - case GSM0808_SCT_HR1: - return CODEC_GSMHR_8000_1; - break; - case GSM0808_SCT_HR3: - return CODEC_AMR_8000_1; - break; - case GSM0808_SCT_HR4: - return CODEC_AMRWB_16000_1; - break; - case GSM0808_SCT_HR6: - return CODEC_AMRWB_16000_1; - break; - default: - return CODEC_PCMU_8000_1; - break; - } -} - /* Endpoint to handle assignment complete */ static int bssmap_rx_ass_compl(struct ran_conn *conn, struct msgb *msg, struct tlv_parsed *tp) { struct sockaddr_storage rtp_addr; struct gsm0808_speech_codec sc; - struct sockaddr_in *rtp_addr_in; int rc; LOGPCONN(conn, LOGL_INFO, "Rx BSSMAP ASSIGNMENT COMPLETE message\n"); @@ -567,18 +527,8 @@ LOGPCONN(conn, LOGL_ERROR, "Unable to decode speech codec (choosen).\n"); return -EINVAL; } - conn->rtp.codec_ran = mgcp_codec_from_sc(&sc); - /* use address / port supplied with the AoIP - * transport address element */ - if (rtp_addr.ss_family == AF_INET) { - rtp_addr_in = (struct sockaddr_in *)&rtp_addr; - msc_mgcp_ass_complete(conn, osmo_ntohs(rtp_addr_in->sin_port), inet_ntoa(rtp_addr_in->sin_addr)); - } else { - LOGPCONN(conn, LOGL_ERROR, "Unsopported addressing scheme. (supports only IPV4)\n"); - return -EINVAL; - } - + ran_conn_assign_compl(conn, &sc, &rtp_addr); return 0; } diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 1ddec08..7aeab4a 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -26,6 +26,8 @@ #include #include #include +#include + #include #include #include @@ -1025,51 +1027,89 @@ return 0; } -/* Inform the FSM that the assignment (RAN connection) is now complete. - * Parameter: - * conn: RAN connection context. - * port: port number of the remote leg. - * addr: IP-address of the remote leg. - * Returns -EINVAL on error, 0 on success. */ -int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr) +static enum mgcp_codecs mgcp_codec_from_sc(const struct gsm0808_speech_codec *sc) { - struct mgcp_ctx *mgcp_ctx; + switch (sc->type) { + case GSM0808_SCT_FR1: + return CODEC_GSM_8000_1; + break; + case GSM0808_SCT_FR2: + return CODEC_GSMEFR_8000_1; + break; + case GSM0808_SCT_FR3: + return CODEC_AMR_8000_1; + break; + case GSM0808_SCT_FR4: + return CODEC_AMRWB_16000_1; + break; + case GSM0808_SCT_FR5: + return CODEC_AMRWB_16000_1; + break; + case GSM0808_SCT_HR1: + return CODEC_GSMHR_8000_1; + break; + case GSM0808_SCT_HR3: + return CODEC_AMR_8000_1; + break; + case GSM0808_SCT_HR4: + return CODEC_AMRWB_16000_1; + break; + case GSM0808_SCT_HR6: + return CODEC_AMRWB_16000_1; + break; + default: + return CODEC_PCMU_8000_1; + break; + } +} - OSMO_ASSERT(conn); +int msc_mgcp_ass_complete(struct ran_conn *conn, const struct gsm0808_speech_codec *speech_codec_chosen, + const struct sockaddr_storage *aoip_transport_addr) +{ + struct sockaddr_in *rtp_addr_in; + const char *addr; + uint16_t port; + struct mgcp_ctx *mgcp_ctx = conn->rtp.mgcp_ctx; + struct osmo_fsm_inst *fi; + + if (!mgcp_ctx || !mgcp_ctx->fsm) { + LOGPCONN(conn, LOGL_ERROR, "Invalid MGCP context, Assignment Complete failed.\n"); + return -EINVAL; + } + + fi = mgcp_ctx->fsm; + + if (fi->state != ST_MDCX_RAN) { + LOGPFSML(fi, LOGL_ERROR, "Assignment Complete not allowed in this state\n"); + return -ENOTSUP; + } + + /* use address / port supplied with the AoIP transport address element */ + if (aoip_transport_addr->ss_family != AF_INET) { + LOGPCONN(conn, LOGL_ERROR, "Assignment Complete: Unsupported addressing scheme (only IPV4 supported)\n"); + return -EINVAL; + } + + rtp_addr_in = (struct sockaddr_in *)&aoip_transport_addr; + addr = inet_ntoa(rtp_addr_in->sin_addr); + port = osmo_ntohs(rtp_addr_in->sin_port); if (port == 0) { - LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) invalid remote call leg port, assignment completion failed\n", - vlr_subscr_name(conn->vsub)); + LOGPCONN(conn, LOGL_ERROR, "Assignment Complete: invalid remote call leg port (0)\n"); return -EINVAL; } if (!addr || strlen(addr) <= 0) { - LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) missing remote call leg address, assignment completion failed\n", - vlr_subscr_name(conn->vsub)); + LOGPCONN(conn, LOGL_ERROR, "Assignment Complete: invalid remote call leg address (empty)\n"); return -EINVAL; } - mgcp_ctx = conn->rtp.mgcp_ctx; - if (!mgcp_ctx) { - LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) invalid mgcp context, assignment completion failed.\n", - vlr_subscr_name(conn->vsub)); - return -EINVAL; - } - - /* Memorize port and IP-Address of the remote RAN call leg. We need this - * information at latest when we enter the MDCX phase for the RAN side. */ - conn->rtp.remote_port_ran = port; + conn->rtp.codec_ran = mgcp_codec_from_sc(speech_codec_chosen); osmo_strlcpy(conn->rtp.remote_addr_ran, addr, sizeof(conn->rtp.remote_addr_ran)); + conn->rtp.remote_port_ran = port; - LOGP(DMGCP, LOGL_DEBUG, "(subscriber:%s) assignment completed, rtp %s:%d.\n", - vlr_subscr_name(conn->vsub), conn->rtp.remote_addr_ran, port); + LOGPCONN(conn, LOGL_DEBUG, "Assignment Complete: rtp %s:%u\n", addr, port); - /* Note: We only dispatch the event if we are really waiting for the - * assignment, if we are not yet waiting, there is no need to loudly - * broadcast an event that the all other states do not understand anyway */ - if (mgcp_ctx->fsm->state == ST_MDCX_RAN) - osmo_fsm_inst_dispatch(mgcp_ctx->fsm, EV_ASSIGN, mgcp_ctx); - - return 0; + return osmo_fsm_inst_dispatch(fi, EV_ASSIGN, mgcp_ctx); } /* Make the connection of a previously assigned call complete diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 37c1d15..8cc5ee7 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "../../bscconfig.h" #ifdef BUILD_IU @@ -113,17 +114,18 @@ } /* Receive an ASSIGNMENT COMPLETE from BSC */ -void msc_assign_compl(struct ran_conn *conn, - uint8_t rr_cause, uint8_t chosen_channel, - uint8_t encr_alg_id, uint8_t speec) +void ran_conn_assign_compl(struct ran_conn *conn, const struct gsm0808_speech_codec *speech_codec_chosen, + const struct sockaddr_storage *aoip_transport_addr) { - LOGP(DRR, LOGL_DEBUG, "MSC assign complete (do nothing).\n"); + msc_mgcp_ass_complete(conn, speech_codec_chosen, aoip_transport_addr); + /* FIXME: tear down conn upon failure */ } /* Receive an ASSIGNMENT FAILURE from BSC */ void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause) { LOGP(DRR, LOGL_DEBUG, "MSC assign failure (do nothing).\n"); + /* FIXME: tear down conn upon failure */ } /* Receive a CLASSMARK CHANGE from BSC */ -- To view, visit https://gerrit.osmocom.org/12201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8137215c443239bddf3e69b5715839a365b73b6c Gerrit-Change-Number: 12201 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 01:15:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 01:15:22 +0000 Subject: Change in osmo-msc[master]: drop gsm48 RR ciph mode compl from permitted initial messages In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12207 ) Change subject: drop gsm48 RR ciph mode compl from permitted initial messages ...................................................................... drop gsm48 RR ciph mode compl from permitted initial messages It is a message that is initially permitted, but it is in fact not handled in the L3 code but already before, upon receiving BSS_MAP_MSG_CIPHER_MODE_COMPLETE. Change-Id: I0079f07271ca76bd457d0e700f3a736eb9066b47 --- M src/libmsc/gsm_04_08.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 2962760..95c3183 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1296,7 +1296,8 @@ break; case GSM48_PDISC_RR: switch (msg_type) { - case GSM48_MT_RR_CIPH_M_COMPL: + /* GSM48_MT_RR_CIPH_M_COMPL is actually handled in bssmap_rx_ciph_compl() and gets redirected in the + * BSSAP layer to ran_conn_cipher_mode_compl() (before this here is reached) */ case GSM48_MT_RR_PAG_RESP: return true; default: -- To view, visit https://gerrit.osmocom.org/12207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0079f07271ca76bd457d0e700f3a736eb9066b47 Gerrit-Change-Number: 12207 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 01:17:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 01:17:11 +0000 Subject: Change in osmo-bsc[master]: set gscon FSM instances' log level to DEBUG In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12211 ) Change subject: set gscon FSM instances' log level to DEBUG ...................................................................... set gscon FSM instances' log level to DEBUG Currently, we see all subscribers' FSM transitions on NOTICE level even though the code uses LOGPFSML(LOGL_DEBUG), because LOGPFSML() uses the max loglevel of the passed level and the FSM instance's level. Too noisy! By default, start out all gscon FSM instances on DEBUG level, so it is possible to silence the osmo-bsc log. Individual instances can still be lifted (I presume using the CTRL interface?). Change-Id: Ie021483e93ab174abac51357bcca8895756566c4 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 074c238..fac0bc0 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -877,7 +877,7 @@ /* don't allocate from 'conn' context, as gscon_cleanup() will call talloc_free(conn) before * libosmocore will call talloc_free(conn->fi), i.e. avoid use-after-free during cleanup */ - conn->fi = osmo_fsm_inst_alloc(&gscon_fsm, net, conn, LOGL_NOTICE, NULL); + conn->fi = osmo_fsm_inst_alloc(&gscon_fsm, net, conn, LOGL_DEBUG, NULL); if (!conn->fi) { talloc_free(conn); return NULL; -- To view, visit https://gerrit.osmocom.org/12211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie021483e93ab174abac51357bcca8895756566c4 Gerrit-Change-Number: 12211 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 01:18:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 01:18:01 +0000 Subject: Change in libosmocore[master]: fix api doc for osmo_bcd2str() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12235 ) Change subject: fix api doc for osmo_bcd2str() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I504ea849fc9daeb34a1b3c5343371161deba743e Gerrit-Change-Number: 12235 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 01:18:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 01:18:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 01:18:03 +0000 Subject: Change in libosmocore[master]: fix api doc for osmo_bcd2str() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12235 ) Change subject: fix api doc for osmo_bcd2str() ...................................................................... fix api doc for osmo_bcd2str() Change-Id: I504ea849fc9daeb34a1b3c5343371161deba743e --- M src/utils.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/utils.c b/src/utils.c index 4b4e6d2..35d70ac 100644 --- a/src/utils.c +++ b/src/utils.c @@ -136,7 +136,7 @@ * \param[in] dst_size sizeof() the output string buffer. * \param[in] bcd Binary coded data buffer. * \param[in] start_nibble Offset to start from, in nibbles, typically 1 to skip the first nibble. - * \param[in] end_nibble Offset to stop before, in nibbles, e.g. sizeof(bcd) - (bcd[0] & GSM_MI_ODD? 0:1). + * \param[in] end_nibble Offset to stop before, in nibbles, e.g. sizeof(bcd)*2 - (bcd[0] & GSM_MI_ODD? 0:1). * \param[in] allow_hex If false, return error if there are digits other than 0-9. If true, return those as [A-F]. * \returns The strlen that would be written if the output buffer is large enough, excluding nul byte (like * snprintf()), or -EINVAL if allow_hex is false and a digit > 9 is encountered. On -EINVAL, the conversion is -- To view, visit https://gerrit.osmocom.org/12235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I504ea849fc9daeb34a1b3c5343371161deba743e Gerrit-Change-Number: 12235 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 02:31:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 02:31:21 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12236 Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI There is no state transition from INIT to WAIT_IMEI, only to WAIT_SUB_PRES. If there were code to skip WAIT_SUB_PRES, the allowed state transitions would have to be the same as for WAIT_SUB_PRES, i.e. also WAIT_IMEI_IMSI and WAIT_TMSI_CNF. For now just opt for the status quo. Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/36/12236/1 diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index a0cbcab..5d171d5 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -555,8 +555,7 @@ [LU_COMPL_VLR_S_INIT] = { .in_event_mask = S(LU_COMPL_VLR_E_START), .out_state_mask = S(LU_COMPL_VLR_S_DONE) | - S(LU_COMPL_VLR_S_WAIT_SUB_PRES) | - S(LU_COMPL_VLR_S_WAIT_IMEI), + S(LU_COMPL_VLR_S_WAIT_SUB_PRES), .name = OSMO_STRINGIFY(LU_COMPL_VLR_S_INIT), .action = lu_compl_vlr_init, }, -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:13:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 11 Dec 2018 09:13:17 +0000 Subject: Change in docker-playground[master]: cosmetic: gerrit: use variables for the files to patch In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12205 ) Change subject: cosmetic: gerrit: use variables for the files to patch ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/12205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771 Gerrit-Change-Number: 12205 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 11 Dec 2018 09:13:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:13:21 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 11 Dec 2018 09:13:21 +0000 Subject: Change in docker-playground[master]: gerrit: fix libopenid path In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12204 ) Change subject: gerrit: fix libopenid path ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/12204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 Gerrit-Change-Number: 12204 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 11 Dec 2018 09:13:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:13:32 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 11 Dec 2018 09:13:32 +0000 Subject: Change in docker-playground[master]: gerrit: fix libopenid path In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12204 ) Change subject: gerrit: fix libopenid path ...................................................................... gerrit: fix libopenid path Update the path to libopenid.jar, to fix the following error and make the container build again. This change is necessary, because we are patching a file inside "gerrit.war", and the path to that file has been changed upstream. Step 4/8 : RUN unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/gerrit-openid-libopenid.jar ... ---> Running in 815585d87fdd Archive: /var/gerrit/bin/gerrit.war caution: filename not matched: WEB-INF/lib/gerrit-openid-libopenid.jar Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 --- M gerrit/Dockerfile 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve osmith: Verified diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index e67c760..9edae12 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -4,15 +4,15 @@ RUN yum -y install zip unzip patch RUN \ - unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/gerrit-openid-libopenid.jar && \ - unzip WEB-INF/lib/gerrit-openid-libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html + unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar && \ + unzip WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html COPY add_osmocom.diff /tmp RUN patch -p0 < /tmp/add_osmocom.diff RUN \ - zip -u WEB-INF/lib/gerrit-openid-libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html && \ - zip -u /var/gerrit/bin/gerrit.war WEB-INF/lib/gerrit-openid-libopenid.jar + zip -u WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html && \ + zip -u /var/gerrit/bin/gerrit.war WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar USER gerrit -- To view, visit https://gerrit.osmocom.org/12204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaed2429a776ae587043dc2651293bb354fceeb72 Gerrit-Change-Number: 12204 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:13:33 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 11 Dec 2018 09:13:33 +0000 Subject: Change in docker-playground[master]: cosmetic: gerrit: use variables for the files to patch In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12205 ) Change subject: cosmetic: gerrit: use variables for the files to patch ...................................................................... cosmetic: gerrit: use variables for the files to patch Make the code more readable, and make it easier to update the paths if they should change again. Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771 --- M gerrit/Dockerfile 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve osmith: Verified diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index 9edae12..98599f0 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -3,16 +3,21 @@ USER root RUN yum -y install zip unzip patch +# Patch LoginForm.html (unpack and repack from gerrit.war) +ARG gerritwar="/var/gerrit/bin/gerrit.war" +ARG libopenid="WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar" +ARG loginform="com/google/gerrit/httpd/auth/openid/LoginForm.html" + RUN \ - unzip /var/gerrit/bin/gerrit.war WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar && \ - unzip WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html + unzip "$gerritwar" "$libopenid" && \ + unzip "$libopenid" "$loginform" COPY add_osmocom.diff /tmp RUN patch -p0 < /tmp/add_osmocom.diff RUN \ - zip -u WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar com/google/gerrit/httpd/auth/openid/LoginForm.html && \ - zip -u /var/gerrit/bin/gerrit.war WEB-INF/lib/com_google_gerrit_httpd_auth_openid_libopenid.jar + zip -u "$libopenid" "$loginform" && \ + zip -u "$gerritwar" "$libopenid" USER gerrit -- To view, visit https://gerrit.osmocom.org/12205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I285f7908de64f2d92fa99ae9d74fb2e29ec72771 Gerrit-Change-Number: 12205 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:16:15 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 09:16:15 +0000 Subject: Change in osmo-msc[master]: detach cancelled subscribers from VLR In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/12232 ) Change subject: detach cancelled subscribers from VLR ...................................................................... detach cancelled subscribers from VLR When a subscriber is cancelled, fake an IMSI detach to ensure that the subscriber gets removed from the VLR. I am not entirely sure if this change is correct but it does make TTCN3 test MSC_Tests.TC_gsup_cancel pass. Change-Id: I5918106e4a94ba2e6c61bcd7b90d3bf0565513cc Related: OS#2886 --- M src/libvlr/vlr.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 76c84de..3369914 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -970,6 +970,8 @@ gmm_cause_to_fsm_and_mm_cause(gsup_msg->cause, &fsm_cause, &gsm48_rej); vlr_subscr_cancel_attach_fsm(vsub, fsm_cause, gsm48_rej); + vlr_subscr_rx_imsi_detach(vsub); + return rc; } -- To view, visit https://gerrit.osmocom.org/12232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5918106e4a94ba2e6c61bcd7b90d3bf0565513cc Gerrit-Change-Number: 12232 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:31:53 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 09:31:53 +0000 Subject: Change in osmo-sgsn[master]: Use explicit parameter for sgsn_auth_init() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12221 ) Change subject: Use explicit parameter for sgsn_auth_init() ...................................................................... Patch Set 2: > Patch Set 2: Code-Review+1 > > Can you provide some patches to get rid of the global variable then? or at least keep it only for VTY if needed. That would require changing gmm_attach_timer_cb() which probably would in turn require changes to struct sgsn_mm_ctx which overall seems like pretty intrusive change. I've updated the patch to keep old global variable to minimize the changes. -- To view, visit https://gerrit.osmocom.org/12221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1 Gerrit-Change-Number: 12221 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 09:31:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:41:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 09:41:19 +0000 Subject: Change in osmo-msc[master]: LU: do not always invoke sub_pres_vlr_fsm_start() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12233 ) Change subject: LU: do not always invoke sub_pres_vlr_fsm_start() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id2303a795dfd381f76e94ff8ff2f495926ca8ba0 Gerrit-Change-Number: 12233 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 09:41:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:45:33 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 09:45:33 +0000 Subject: Change in osmo-msc[master]: tweak comment to indicate sub_pres_vlr fsm as dead code In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12234 ) Change subject: tweak comment to indicate sub_pres_vlr fsm as dead code ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I198d442e9ed288f37c7d4e5ec87b82dc53114e99 Gerrit-Change-Number: 12234 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 09:45:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:48:03 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 09:48:03 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12236 ) Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12236/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12236/1//COMMIT_MSG at 12 PS1, Line 12: have to be the same as for WAIT_SUB_PRES, i.e. also WAIT_IMEI_IMSI and Don't you mean WAIT_IEMI_TMSI (TMSI, not IMSI)? -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 09:48:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:55:50 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 09:55:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: fix pattern warning Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12237 Change subject: MGCP: fix pattern warning ...................................................................... MGCP: fix pattern warning Remove implied \r to fix following warnings: "Duplicate character `\r' in the character set. Please note the \n includes the \r implicitly. Use \q{0,0,0,10} if you would like to match the LF only." Change-Id: I99948e4b82b5b4bd5b8f7c1a4c60a97fcab3c0eb --- M library/MGCP_Types.ttcn 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/12237/1 diff --git a/library/MGCP_Types.ttcn b/library/MGCP_Types.ttcn index 6bb266e..324ed57 100644 --- a/library/MGCP_Types.ttcn +++ b/library/MGCP_Types.ttcn @@ -54,7 +54,7 @@ } with { variant "SEPARATOR(' ', '[\t ]+')" //variant "END('\r\n', '(\n)|(\r\n)')" - variant "END('\r\n', '([\r\n])|(\r\n)')" + variant "END('\n', '([\n])|(\n)')" } type record MgcpParameter { @@ -64,7 +64,7 @@ variant "BEGIN('')" variant "SEPARATOR(': ', ':[\t ]+')" //variant "END('\r\n', '(\n)|(\r\n)')" - variant "END('\r\n', '([\r\n])|(\r\n)')" + variant "END('\n', '([\n])|(\n)')" } type set of MgcpParameter MgcpParameterList with { @@ -77,7 +77,7 @@ SDP_Message sdp optional } with { variant "BEGIN('')" - variant (sdp) "BEGIN('\r\n','([\r\n])|(\r\n)')" + variant (sdp) "BEGIN('\n','([\n])|(\n)')" } external function enc_MgcpCommand(in MgcpCommand id) return charstring @@ -92,7 +92,7 @@ } with { variant "SEPARATOR(' ', '[\t ]+')" //variant "END('\r\n', '(\n)|(\r\n)')" - variant "END('\r\n', '([\r\n])|(\r\n)')" + variant "END('\n', '([\n])|(\n)')" } type record MgcpResponse { @@ -101,7 +101,7 @@ SDP_Message sdp optional } with { variant "BEGIN('')" - variant (sdp) "BEGIN('\r\n','([\r\n])|(\r\n)')" + variant (sdp) "BEGIN('\n','([\n])|(\n)')" } external function enc_MgcpResponse(in MgcpResponse id) return charstring -- To view, visit https://gerrit.osmocom.org/12237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I99948e4b82b5b4bd5b8f7c1a4c60a97fcab3c0eb Gerrit-Change-Number: 12237 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:55:51 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 09:55:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: remove commented variants Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12238 Change subject: MGCP: remove commented variants ...................................................................... MGCP: remove commented variants It's unclear why those variants were commented - looks like artifact from initial development. Let's drop them to avoid confusion. Change-Id: I3f11a93634fc50243a7210edcd501bd4b90d6dcd --- M library/MGCP_Types.ttcn 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/12238/1 diff --git a/library/MGCP_Types.ttcn b/library/MGCP_Types.ttcn index 324ed57..88fdbeb 100644 --- a/library/MGCP_Types.ttcn +++ b/library/MGCP_Types.ttcn @@ -53,7 +53,6 @@ MgcpVersion ver } with { variant "SEPARATOR(' ', '[\t ]+')" - //variant "END('\r\n', '(\n)|(\r\n)')" variant "END('\n', '([\n])|(\n)')" } @@ -63,7 +62,6 @@ } with { variant "BEGIN('')" variant "SEPARATOR(': ', ':[\t ]+')" - //variant "END('\r\n', '(\n)|(\r\n)')" variant "END('\n', '([\n])|(\n)')" } @@ -91,7 +89,6 @@ charstring string optional } with { variant "SEPARATOR(' ', '[\t ]+')" - //variant "END('\r\n', '(\n)|(\r\n)')" variant "END('\n', '([\n])|(\n)')" } -- To view, visit https://gerrit.osmocom.org/12238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3f11a93634fc50243a7210edcd501bd4b90d6dcd Gerrit-Change-Number: 12238 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:56:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 09:56:52 +0000 Subject: Change in osmo-bsc[master]: Add VTY option to avoid sending empty Full BCCH Info for disabled SI In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12133 ) Change subject: Add VTY option to avoid sending empty Full BCCH Info for disabled SI ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 Gerrit-Change-Number: 12133 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Dec 2018 09:56:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 09:59:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 09:59:20 +0000 Subject: Change in osmo-sgsn[master]: Use explicit parameter for sgsn_auth_init() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12221 ) Change subject: Use explicit parameter for sgsn_auth_init() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1 Gerrit-Change-Number: 12221 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 09:59:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 10:07:25 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 10:07:25 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11751 ) Change subject: GSUP/SMS: introduce READY-FOR-SM message ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Gerrit-Change-Number: 11751 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Dec 2018 10:07:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 10:17:30 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 10:17:30 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10185 to look at the new patch set (#5). Change subject: port arfcn range encode support from osmo-bsc ...................................................................... port arfcn range encode support from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports one of the prerequisites for doing so: osmo-bsc code for range-encoding ARFCNs, including tests. An osmo_gsm48_ prefix has been prepended to public symbols in order to avoid clashes with existing symbols in osmo-bsc code. Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Related: OS#3075 --- M include/Makefile.am A include/osmocom/gsm/gsm48_arfcn_range_encode.h M src/gsm/Makefile.am A src/gsm/gsm48_arfcn_range_encode.c M src/gsm/libosmogsm.map M tests/gsm0408/gsm0408_test.c A tests/gsm0408/gsm0408_test.err M tests/gsm0408/gsm0408_test.ok 8 files changed, 796 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/10185/5 -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 10:29:04 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 10:29:04 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12226 to look at the new patch set (#4). Change subject: Add tests for IMSI ACLs ...................................................................... Add tests for IMSI ACLs Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 --- M include/osmocom/sgsn/gprs_sgsn.h M tests/sgsn/sgsn_test.c M tests/sgsn/sgsn_test.ok 3 files changed, 121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/26/12226/4 -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 10:29:04 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 10:29:04 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12227 to look at the new patch set (#4). Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... ACL: integrate sanitize check into sgsn_acl_* functions Having this check in vty makes it hard to unit-test. Let's move this into separate static function and use it directly from sgsn_acl_* functions. Adjust test output accordingly. Related: SYS#4300 Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 --- M src/gprs/sgsn_auth.c M src/gprs/sgsn_vty.c M tests/sgsn/sgsn_test.ok 3 files changed, 33 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/27/12227/4 -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 10:31:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 10:31:55 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12226 to look at the new patch set (#5). Change subject: Add tests for IMSI ACLs ...................................................................... Add tests for IMSI ACLs Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 --- M tests/sgsn/sgsn_test.c M tests/sgsn/sgsn_test.ok 2 files changed, 120 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/26/12226/5 -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 10:34:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 10:34:55 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12226 ) Change subject: Add tests for IMSI ACLs ...................................................................... Patch Set 5: (1 comment) Please keep comments constructive and actionable - things like "suuuuuper ugly" does not convey much meaning. https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c File tests/sgsn/sgsn_test.c: https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c at 1343 PS2, Line 1343: } > while having another variable after calling the function separate by a comma Ah, so you want me to change the order of variable? Than please say so. -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 10:34:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 10:59:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 10:59:49 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12177 ) Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... Patch Set 6: Code-Review+2 (2 comments) nice! maybe fix that space first https://gerrit.osmocom.org/#/c/12177/6/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12177/6/src/libvlr/vlr.c at 1217 PS6, Line 1217: const char *gsup_server_addr_str, uint16_t gsup_server_port) (still got the space indent here from the earlier patch set) https://gerrit.osmocom.org/#/c/12177/6/tests/msc_vlr/msc_vlr_tests.c File tests/msc_vlr/msc_vlr_tests.c: https://gerrit.osmocom.org/#/c/12177/6/tests/msc_vlr/msc_vlr_tests.c at 556 PS6, Line 556: struct osmo_oap_client_config *oap_config) (for some reason gerrit shows indenting changes above?) (when I wrote this, it should have lined up with '(' ... we could fix that now) -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Dec 2018 10:59:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:13:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 11:13:31 +0000 Subject: Change in libosmocore[master]: port rest octets encoding code from osmo-bsc In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10189 ) Change subject: port rest octets encoding code from osmo-bsc ...................................................................... Patch Set 3: has anything changed about the licensing? no, right? -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 11:13:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:35:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 11:35:01 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 5: Code-Review-1 (7 comments) found some hither nor thither with logging ... either set log_set_category_filter(osmo_stderr_target, DLGLOBAL, 1, LOGL_DEBUG); and also see the debug logging from the implementation, or remove logging from the regression test entirely. (no DMAIN needed) Also rather printf to stdout only. I know it is just copying from osmo-bsc, but still... here the stuff I wrote before... https://gerrit.osmocom.org/#/c/10185/5/src/gsm/gsm48_arfcn_range_encode.c File src/gsm/gsm48_arfcn_range_encode.c: https://gerrit.osmocom.org/#/c/10185/5/src/gsm/gsm48_arfcn_range_encode.c at 26 PS5, Line 26: #include looks like this file has no logging. That's a good thing. We don't need this header? https://gerrit.osmocom.org/#/c/10185/5/src/gsm/gsm48_arfcn_range_encode.c at 213 PS5, Line 213: k, wk_len, octet_offs, bit_offs, level, lvl_left); ah damn. I think in a libosmocore utility function like this we shouldn't log though? not sure... https://gerrit.osmocom.org/#/c/10185/5/tests/gsm0408/gsm0408_test.c File tests/gsm0408/gsm0408_test.c: https://gerrit.osmocom.org/#/c/10185/5/tests/gsm0408/gsm0408_test.c at 618 PS5, Line 618: int arfcns_num, int silent) (weird indent .. but this is just copying, right?) https://gerrit.osmocom.org/#/c/10185/5/tests/gsm0408/gsm0408_test.c at 646 PS5, Line 646: range, arfcns_used, f0, f0_included); rather printf()? https://gerrit.osmocom.org/#/c/10185/5/tests/gsm0408/gsm0408_test.c at 702 PS5, Line 702: fprintf(stderr, " w = "); printf https://gerrit.osmocom.org/#/c/10185/5/tests/gsm0408/gsm0408_test.c at 705 PS5, Line 705: fprintf(stderr, "\n"); ... https://gerrit.osmocom.org/#/c/10185/5/tests/gsm0408/gsm0408_test.c at 941 PS5, Line 941: log_init(&log_info, NULL); Usually in regression tests, to get reproducable output I have to call: log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); so how does it work that you get reproducable output on stderr? Is that even DMAIN logging there? If there is no logging happening, we could either not init logging at all, or have empty categories[]. You could also decide to ignore stderr; if this is from fprintf(stderr,..) then maybe rather printf() to stdout -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Tue, 11 Dec 2018 11:35:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:35:18 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 11:35:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen-makefile.sh: add link to related Debian bug in comment Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12239 Change subject: regen-makefile.sh: add link to related Debian bug in comment ...................................................................... regen-makefile.sh: add link to related Debian bug in comment This makes it easier to track when this workaround can be disabled once Debian/upstream (hopefully) resolve the issue. Change-Id: I3c4ed0ae5c1145f162b2745f4a46705b51874b5b --- M regen-makefile.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/12239/1 diff --git a/regen-makefile.sh b/regen-makefile.sh index b8be4ea..a9f8562 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -6,6 +6,8 @@ # the binaries to different paths without patching the make file # generator, leading in inconsistent non-working Makefiles. # +# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884303 for details. +# # The regexes below patch the generated Makefile to work on Debian 9 and # unstable, so far tested with TITAN 6.1.0, 6.2.0 and 6.3.0 # -- To view, visit https://gerrit.osmocom.org/12239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3c4ed0ae5c1145f162b2745f4a46705b51874b5b Gerrit-Change-Number: 12239 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:36:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 11:36:10 +0000 Subject: Change in osmo-msc[master]: LU: do not always invoke sub_pres_vlr_fsm_start() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12233 ) Change subject: LU: do not always invoke sub_pres_vlr_fsm_start() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id2303a795dfd381f76e94ff8ff2f495926ca8ba0 Gerrit-Change-Number: 12233 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 11:36:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:37:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 11:37:28 +0000 Subject: Change in osmo-msc[master]: LU: do not always invoke sub_pres_vlr_fsm_start() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12233 ) Change subject: LU: do not always invoke sub_pres_vlr_fsm_start() ...................................................................... LU: do not always invoke sub_pres_vlr_fsm_start() sub_pres_vlr_fsm_start() starts the FSM, invokes the START event, and then this FSM invariably always directly terminates when vsub->ms_not_reachable_flag == false. So if it is false, there is not much use in instantiating a whole FSM instance that just terminates again, we might as well directly issue the parent-term-event and save some logging space. The same condition is already in place in the vlr_proc_acc_fsm.c in _proc_arq_vlr_node2_post_vlr() for CM Service Request and Paging Response. Now also skip this for LU. Change-Id: Id2303a795dfd381f76e94ff8ff2f495926ca8ba0 --- M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 12 files changed, 6 insertions(+), 497 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 02e49e0..74a6939 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -413,7 +413,12 @@ osmo_fsm_inst_state_chg(fi, LU_COMPL_VLR_S_WAIT_SUB_PRES, LU_TIMEOUT_LONG, 0); - sub_pres_vlr_fsm_start(&lcvp->sub_pres_vlr_fsm, fi, vsub, LU_COMPL_VLR_E_SUB_PRES_COMPL); + /* If ms_not_reachable_flag == false, the sub_pres_vlr_fsm will anyway terminate straight away and dispatch + * LU_COMPL_VLR_E_SUB_PRES_COMPL to this fi, so we might as well skip that dance here and save some logging. */ + if (vsub->ms_not_reachable_flag) + sub_pres_vlr_fsm_start(&lcvp->sub_pres_vlr_fsm, fi, vsub, LU_COMPL_VLR_E_SUB_PRES_COMPL); + else + osmo_fsm_inst_dispatch(fi, LU_COMPL_VLR_E_SUB_PRES_COMPL, NULL); } static void lu_compl_vlr_new_tmsi(struct osmo_fsm_inst *fi) diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index 4941550..ca035bf 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -108,14 +108,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -539,14 +531,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -984,14 +968,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -1495,14 +1471,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -2033,14 +2001,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -2370,14 +2330,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index a3ff277..f2a46f5 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -121,14 +121,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -509,14 +501,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -896,14 +880,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -1249,14 +1225,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -1599,14 +1567,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 1014bb2..8121e8e 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -125,14 +125,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -576,14 +568,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -996,14 +980,6 @@ DVLR lu_compl_vlr_fsm(LU:50462976){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:50462976) DVLR lu_compl_vlr_fsm(LU:50462976){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:50462976){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:50462976) -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:50462976) -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:50462976){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:50462976){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:50462976){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -1236,14 +1212,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI DMSC msc_tx 3 bytes to MSISDN:46071 via RAN_GERAN_A @@ -1473,14 +1441,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI_TMSI DMSC msc_tx 3 bytes to MSISDN:46071 via RAN_GERAN_A @@ -1723,14 +1683,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:42342 DREF VLR subscr MSISDN:42342 usage increases to: 3 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 5bc57e0..58dc7ec 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -129,14 +129,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -633,14 +625,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -1172,14 +1156,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI DMSC msc_tx 3 bytes to MSISDN:46071 via RAN_GERAN_A @@ -1434,14 +1410,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -1643,14 +1611,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI_TMSI DMSC msc_tx 3 bytes to MSISDN:46071 via RAN_GERAN_A @@ -1905,14 +1865,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:42342 DREF VLR subscr MSISDN:42342 usage increases to: 3 @@ -2385,14 +2337,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:42342 DREF VLR subscr MSISDN:42342 usage increases to: 3 @@ -2885,14 +2829,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:42342 DREF VLR subscr MSISDN:42342 usage increases to: 3 diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index ba4db3e..efc3a8d 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -268,14 +268,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -423,14 +415,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_DONE @@ -581,14 +565,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -818,14 +794,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -1163,14 +1131,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for IMSI:901700000004620 DREF VLR subscr IMSI:901700000004620 usage increases to: 3 diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index bf3a0ed..78218ac 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -215,14 +215,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -420,14 +412,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 3f024e0..189c680 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -77,14 +77,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -400,14 +392,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -723,14 +707,6 @@ DVLR lu_compl_vlr_fsm(LU:50462976){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:50462976) DVLR lu_compl_vlr_fsm(LU:50462976){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:50462976){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:50462976) -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:50462976) -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:50462976){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:50462976){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:50462976){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:50462976){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -915,14 +891,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI DMSC msc_tx 3 bytes to MSISDN:46071 via RAN_GERAN_A @@ -1104,14 +1072,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI_TMSI DMSC msc_tx 3 bytes to MSISDN:46071 via RAN_GERAN_A @@ -1337,14 +1297,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -1512,14 +1464,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI DMSC msc_tx 3 bytes to MSISDN:46071 via RAN_GERAN_A @@ -1719,14 +1663,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -1887,14 +1823,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -2097,14 +2025,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI_TMSI DMSC msc_tx 3 bytes to MSISDN:46071 via RAN_GERAN_A @@ -2303,14 +2223,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 90c6f06..03f99e1 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -108,14 +108,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -238,14 +230,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -375,14 +359,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -505,14 +481,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -624,14 +592,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -821,14 +781,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -1021,14 +973,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -1209,14 +1153,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -1436,14 +1372,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -1683,14 +1611,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 711633b..90905c8 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -169,14 +169,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -290,14 +282,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_DONE @@ -472,14 +456,6 @@ DVLR lu_compl_vlr_fsm(LU:591536962){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:591536962) DVLR lu_compl_vlr_fsm(LU:591536962){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:591536962){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:591536962){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:591536962){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:591536962) -DVLR sub_pres_vlr_fsm(LU:591536962){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:591536962){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:591536962){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:591536962){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:591536962) -DVLR sub_pres_vlr_fsm(LU:591536962){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:591536962){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:591536962){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 15b2888..e0f57aa 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -65,14 +65,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 @@ -269,14 +261,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for MSISDN:46071 DREF VLR subscr MSISDN:46071 usage increases to: 3 diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index f5b7d02..3e8fe2e 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -108,14 +108,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -585,14 +577,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -1107,14 +1091,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF @@ -1338,14 +1314,6 @@ DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000010650) DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Allocated -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000010650) -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Freeing instance -DVLR sub_pres_vlr_fsm(LU:901700000010650){SUB_PRES_VLR_S_DONE}: Deallocated DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: lu_compl_vlr_new_tmsi() DVLR lu_compl_vlr_fsm(LU:901700000010650){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_TMSI_CNF -- To view, visit https://gerrit.osmocom.org/12233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id2303a795dfd381f76e94ff8ff2f495926ca8ba0 Gerrit-Change-Number: 12233 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:38:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 11:38:26 +0000 Subject: Change in osmo-msc[master]: tweak comment to indicate sub_pres_vlr fsm as dead code In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12234 ) Change subject: tweak comment to indicate sub_pres_vlr fsm as dead code ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12234/2/src/libvlr/vlr_lu_fsm.c File src/libvlr/vlr_lu_fsm.c: https://gerrit.osmocom.org/#/c/12234/2/src/libvlr/vlr_lu_fsm.c at 274 PS2, Line 274: /* THIS IS CURRENTLY DEAD CODE, SINCE WE NEVER SET vsub->ms_not_reachable_flag = true. Probably also good to state the same in the callers. -- To view, visit https://gerrit.osmocom.org/12234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I198d442e9ed288f37c7d4e5ec87b82dc53114e99 Gerrit-Change-Number: 12234 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 11:38:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:39:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 11:39:26 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12236 ) Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12236/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12236/1//COMMIT_MSG at 12 PS1, Line 12: have to be the same as for WAIT_SUB_PRES, i.e. also WAIT_IMEI_IMSI and > Don't you mean WAIT_IEMI_TMSI (TMSI, not IMSI)? gah, that's what happens if you once decide to type instead of ctrl-p -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 11:39:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:40:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 11:40:39 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12236 ) Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12236/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12236/1//COMMIT_MSG at 12 PS1, Line 12: have to be the same as for WAIT_SUB_PRES, i.e. also WAIT_IMEI_IMSI and > Don't you mean WAIT_IEMI_TMSI (TMSI, not IMSI)? Don't you mean WAIT_IMEI_TMSI (IMEI, not IEMI)? :-P -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 11:40:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:41:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 11:41:03 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12236 ) Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 11:41:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:43:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 11:43:41 +0000 Subject: Change in osmo-msc[master]: comment: vlr: put the 'balancing' comment closer to the put() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12240 Change subject: comment: vlr: put the 'balancing' comment closer to the put() ...................................................................... comment: vlr: put the 'balancing' comment closer to the put() Change-Id: Ic42768b22d63d182455c8d860961c44159973d0c --- M src/libvlr/vlr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/40/12240/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 3369914..db9125f 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -1141,6 +1141,7 @@ bool vlr_subscr_expire(struct vlr_subscr *vsub) { if (vsub->lu_complete) { + /* balancing the get from vlr_lu_compl_fsm_success() */ vsub->lu_complete = false; vlr_subscr_put(vsub); @@ -1159,7 +1160,6 @@ vsub->imsi_detached_flag = true; vsub->expire_lu = VLR_SUBSCRIBER_NO_EXPIRATION; - /* balancing the get from vlr_lu_compl_fsm_success() */ vlr_subscr_expire(vsub); return 0; -- To view, visit https://gerrit.osmocom.org/12240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic42768b22d63d182455c8d860961c44159973d0c Gerrit-Change-Number: 12240 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:43:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 11:43:40 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12236 to look at the new patch set (#2). Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI There is no state transition from INIT to WAIT_IMEI, only to WAIT_SUB_PRES. If there were code to skip WAIT_SUB_PRES, the allowed state transitions would have to be the same as for WAIT_SUB_PRES, i.e. also WAIT_IMEI_TMSI and WAIT_TMSI_CNF. For now just opt for the status quo. Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/36/12236/2 -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:44:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 11:44:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: fix pattern warning In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12237 ) Change subject: MGCP: fix pattern warning ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99948e4b82b5b4bd5b8f7c1a4c60a97fcab3c0eb Gerrit-Change-Number: 12237 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 11 Dec 2018 11:44:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:45:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 11:45:05 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add build-discarder In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12141 ) Change subject: jobs/ttcn3-testsuites.yml: add build-discarder ...................................................................... Patch Set 1: Code-Review+2 ok then -- To view, visit https://gerrit.osmocom.org/12141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib7f01751ca5f6fb3e29a436982e2891d9cab0488 Gerrit-Change-Number: 12141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 11:45:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:45:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 11:45:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: remove commented variants In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12238 ) Change subject: MGCP: remove commented variants ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f11a93634fc50243a7210edcd501bd4b90d6dcd Gerrit-Change-Number: 12238 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 11 Dec 2018 11:45:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:46:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 11:46:46 +0000 Subject: Change in osmo-sgsn[master]: Use explicit parameter for sgsn_auth_init() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12221 ) Change subject: Use explicit parameter for sgsn_auth_init() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1 Gerrit-Change-Number: 12221 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 11:46:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:47:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 11:47:33 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins*: build and publish manuals In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12213 ) Change subject: contrib/jenkins*: build and publish manuals ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd Gerrit-Change-Number: 12213 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 11 Dec 2018 11:47:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:48:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 11:48:14 +0000 Subject: Change in libasn1c[master]: jenkins.sh: disable parallel build In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12194 ) Change subject: jenkins.sh: disable parallel build ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib853a93bffc4cd78d4f08624fb1e56772ce68ce5 Gerrit-Change-Number: 12194 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 11:48:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:48:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 11:48:22 +0000 Subject: Change in libasn1c[master]: jenkins.sh: disable parallel build In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12194 ) Change subject: jenkins.sh: disable parallel build ...................................................................... jenkins.sh: disable parallel build Avoid a race condition that causes the build to fail on Jenkins with: asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ Change-Id: Ib853a93bffc4cd78d4f08624fb1e56772ce68ce5 --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 7d68736..dbdfda6 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -14,7 +14,10 @@ autoreconf --install --force ./configure --enable-werror -$MAKE $PARALLEL_MAKE + +# Parallel make is disabled due to a race condition. On Jenkins, it often +# aborts the build with: "asn1p_y.y:357:13: error: 'param' undeclared" +$MAKE -j1 $MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/12194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib853a93bffc4cd78d4f08624fb1e56772ce68ce5 Gerrit-Change-Number: 12194 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:49:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 11:49:07 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12227 ) Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... Patch Set 5: Code-Review-1 -1 since last version still don't apply my comments regarding movement of sanitize out of sgsn_acl_* callees. -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 11:49:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:51:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 11:51:57 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12226 ) Change subject: Add tests for IMSI ACLs ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c File tests/sgsn/sgsn_test.c: https://gerrit.osmocom.org/#/c/12226/2/tests/sgsn/sgsn_test.c at 1343 PS2, Line 1343: size_t old = sgsn_acl_count(cfg), new; > > while having another variable after calling the function separate by a comma [?] I'd like you to clean the line, I think it's pretty obvious. Either: " size_t old_count, new_count; int rc; old_count = sgsn_acl_count(cfg); " or " int rc; size_t old_count; size_t new_count = sgsn_acl_count(cfg); " -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 11:51:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:53:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 11:53:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen-makefile.sh: add link to related Debian bug in comment In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12239 ) Change subject: regen-makefile.sh: add link to related Debian bug in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3c4ed0ae5c1145f162b2745f4a46705b51874b5b Gerrit-Change-Number: 12239 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 11:53:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:54:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 11:54:33 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11991 ) Change subject: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE ...................................................................... Patch Set 4: Code-Review-1 yeah, rather add an updated libosmocore api as in earlier comment -- To view, visit https://gerrit.osmocom.org/11991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I89727354385b40e18732e8fd1d6c93f4463ade37 Gerrit-Change-Number: 11991 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 11:54:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:54:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 11:54:34 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12236 ) Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 11:54:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:55:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 11:55:30 +0000 Subject: Change in osmo-msc[master]: comment: vlr: put the 'balancing' comment closer to the put() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12240 ) Change subject: comment: vlr: put the 'balancing' comment closer to the put() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic42768b22d63d182455c8d860961c44159973d0c Gerrit-Change-Number: 12240 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 11:55:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:55:49 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 11 Dec 2018 11:55:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: remove commented variants In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12238 ) Change subject: MGCP: remove commented variants ...................................................................... Patch Set 1: Code-Review+1 > Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f11a93634fc50243a7210edcd501bd4b90d6dcd Gerrit-Change-Number: 12238 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 11 Dec 2018 11:55:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:55:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 11:55:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11924 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11924/4/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11924/4/msc/MSC_Tests.ttcn at 2158 PS4, Line 2158: sm_rp_da := valueof(ts_GSUP_SM_RP_DA_MSISDN(g_pars.msisdn)), I still had reservations about OA,DA encoding in that libosmocore patch... -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Tue, 11 Dec 2018 11:55:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:56:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 11:56:54 +0000 Subject: Change in osmo-sgsn[master]: Use explicit parameter for sgsn_auth_init() In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12221 ) Change subject: Use explicit parameter for sgsn_auth_init() ...................................................................... Use explicit parameter for sgsn_auth_init() This is necessary to properly test ACLs in follow-up patches. Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1 --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_auth.c M src/gprs/sgsn_main.c M tests/sgsn/sgsn_test.c 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 0b721a3..b6afe69 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -459,7 +459,7 @@ struct sgsn_instance; extern const struct value_string *sgsn_auth_state_names; -void sgsn_auth_init(void); +void sgsn_auth_init(struct sgsn_instance *sgsn); struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, const struct sgsn_config *cfg); int sgsn_acl_add(const char *imsi, struct sgsn_config *cfg); int sgsn_acl_del(const char *imsi, struct sgsn_config *cfg); diff --git a/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c index 50f2126..b8d8035 100644 --- a/src/gprs/sgsn_auth.c +++ b/src/gprs/sgsn_auth.c @@ -38,7 +38,7 @@ const struct value_string *sgsn_auth_state_names = auth_state_names; -void sgsn_auth_init(void) +void sgsn_auth_init(struct sgsn_instance *sgsn) { INIT_LLIST_HEAD(&sgsn->cfg.imsi_acl); } diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index 1c76d6f..798e507 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -432,7 +432,7 @@ bssgp_vty_init(); gprs_llc_vty_init(); gprs_sndcp_vty_init(); - sgsn_auth_init(); + sgsn_auth_init(sgsn); sgsn_cdr_init(sgsn); /* FIXME: register signal handler for SS_L_NS */ diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index 111515e..6145206 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -1641,7 +1641,7 @@ msgb_ctx = msgb_talloc_ctx_init(osmo_sgsn_ctx, 0); sgsn_rate_ctr_init(); - sgsn_auth_init(); + sgsn_auth_init(sgsn); gprs_subscr_init(sgsn); test_llme(); -- To view, visit https://gerrit.osmocom.org/12221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibeba371234680f33ad35afbfffce9dca185228c1 Gerrit-Change-Number: 12221 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 11:58:52 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 11 Dec 2018 11:58:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: fix pattern warning In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12237 ) Change subject: MGCP: fix pattern warning ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+1 on the first look this seems to be ok, but please give the test cases a full testrun before we merge this. -- To view, visit https://gerrit.osmocom.org/12237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99948e4b82b5b4bd5b8f7c1a4c60a97fcab3c0eb Gerrit-Change-Number: 12237 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 11 Dec 2018 11:58:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:00:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:00:24 +0000 Subject: Change in pysim[master]: utils: add EF [H|O]PLMNwAcT decoding. In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12123 ) Change subject: utils: add EF [H|O]PLMNwAcT decoding. ...................................................................... Patch Set 1: (1 comment) in the test output on jenkins, I see PLMNwAcT: ffffffffff # unused ffffffffff # unused ffffffffff # unused ffffffffff # unused maybe if multiple lines are involved, rather go for PLMNwAcT: ffffffffff # unused ffffffffff # unused ffffffffff # unused or PLMNwAcT: ffffffffff # unused ffffffffff # unused ffffffffff # unused ? https://gerrit.osmocom.org/#/c/12123/1/pySim/utils_test.py File pySim/utils_test.py: https://gerrit.osmocom.org/#/c/12123/1/pySim/utils_test.py at 4 PS1, Line 4: import utils (whitespace) -- To view, visit https://gerrit.osmocom.org/12123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b8ca6ffd98f665690b84239d9a228e2c72c6ff9 Gerrit-Change-Number: 12123 Gerrit-PatchSet: 1 Gerrit-Owner: lazlo Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:00:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:02:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:02:27 +0000 Subject: Change in pysim[master]: utils: Remove call to format_xplmn_w_act() in pySim-read.py for now (... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12124 ) Change subject: utils: Remove call to format_xplmn_w_act() in pySim-read.py for now (not to break card tests). ...................................................................... Patch Set 1: Code-Review+1 the first patch can only be merged if it passes the unit tests. so you need to squash them... where does the format_xplmn_* call remain to be used after this? -- To view, visit https://gerrit.osmocom.org/12124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39d3c1fb217ef91d311e6607c0d50722576c4576 Gerrit-Change-Number: 12124 Gerrit-PatchSet: 1 Gerrit-Owner: lazlo Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:02:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:03:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:03:34 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 17: (1 comment) just found an old draft comment, let me post this, whatever it was... https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c at 586 PS4, Line 586: { > Why prefer the variant with lesser readability? It's ok, no pressing need to change it, but I refuse to accept that '{ 0 }' is better than '{}' in any way. please read my longish explanation at this comment: https://gerrit.osmocom.org/#/c/osmo-msc/+/12039/3/src/libmsc/gsm_04_08.c at 1666 -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 17 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 12:03:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:05:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:05:39 +0000 Subject: Change in osmo-msc[master]: combine several small .h in msc_common.h In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12033 ) Change subject: combine several small .h in msc_common.h ...................................................................... Patch Set 7: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/12033/4/include/osmocom/msc/msc_common.h File include/osmocom/msc/msc_common.h: https://gerrit.osmocom.org/#/c/12033/4/include/osmocom/msc/msc_common.h at 7 PS4, Line 7: #define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" : #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT > mhyeeaaa though it's the MSC's job to tell the VLR how to configure its GSUP. [?] it is used in msc_vty.c to print out the default in the doc, and in msc_main.c to set the default. So my conclusion is that msc_common.h is still the right place for this. -- To view, visit https://gerrit.osmocom.org/12033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 Gerrit-Change-Number: 12033 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Dec 2018 12:05:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:05:50 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 12:05:50 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12227 ) Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... Patch Set 5: > Patch Set 5: Code-Review-1 > > -1 since last version still don't apply my comments regarding movement of sanitize out of sgsn_acl_* callees. You haven't stated why you think it's better (unless I've missed it somehow). So the answer is still the same (and still in commit message): having this check in vty makes it hard to unit-test, having it as a static function next to sgsn_acl_* makes it unit-testable. I don't see any advantage in keeping code which is not directly related to vty inside sgsn_vty.c. Having sanitize function right next to where its result is used is way more intuitive and easier to maintain. Plus the advantage of unit testing. -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 12:05:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:06:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:06:08 +0000 Subject: Change in osmo-bts[master]: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11904 ) Change subject: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK ...................................................................... Patch Set 1: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/11904/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11904/1//COMMIT_MSG at 15 PS1, Line 15: TCH/F). one thing I don't understand yet in the overall failure cause: osmo-bsc must be sending a PDCH DE/ACT while the ts is still active, right? Oh, that was the osmo-bts-trx patch where we now send an ACK only *after* it really went officially inactive? So it's not an osmo-bsc bug? -- To view, visit https://gerrit.osmocom.org/11904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I91c65da6b6b7094f32187d3b083153a87c3219fd Gerrit-Change-Number: 11904 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:06:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:07:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:07:54 +0000 Subject: Change in osmo-bsc[master]: LCLS: fix codec mismatch detection In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10905 ) Change subject: LCLS: fix codec mismatch detection ...................................................................... Patch Set 4: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/10905/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10905/1//COMMIT_MSG at 13 PS1, Line 13: 00 > why are we abandoning struct members without [?] I edited the commit log to explain -- I forgot to remove them properly during refactoring. -- To view, visit https://gerrit.osmocom.org/10905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb Gerrit-Change-Number: 10905 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:07:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:08:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:08:12 +0000 Subject: Change in libosmocore[master]: Add CC_CAUSE value_string array In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10732 ) Change subject: Add CC_CAUSE value_string array ...................................................................... Patch Set 2: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/10732/1/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/10732/1/src/gsm/gsm48.c at 950 PS1, Line 950: { GSM48_CC_CAUSE_UNASSIGNED_NR, "UNASSIGNED_NR" }, > very much so, yes. I was about to mkae that comment myself. [?] (I like it when FSM states and events have the same value string name as the constants in the code; if the names in log and code differ, it can get super hard to figure out what an FSM is doing / grep the events and states. That's why I added OSMO_VALUE_STRING(). For pretty much anything else, I agree to rather invent custom strings.) -- To view, visit https://gerrit.osmocom.org/10732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I296f208581ce2550805f9d96e20f7319e1199023 Gerrit-Change-Number: 10732 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:08:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:08:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:08:33 +0000 Subject: Change in osmo-bsc[master]: abisip-find: add getopts and option to prevent endless loop In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/5239 ) Change subject: abisip-find: add getopts and option to prevent endless loop ...................................................................... Patch Set 2: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/5239/2/src/ipaccess/abisip-find.c File src/ipaccess/abisip-find.c: https://gerrit.osmocom.org/#/c/5239/2/src/ipaccess/abisip-find.c at 199 PS2, Line 199: printf(" -i --ifname. Specify outgoing interface\n"); -1: let's not change the semantics for the network interface, i.e. still handle the interface name as a positional argument without a dash-option. There is no need to break the way it previously worked, is there? (an example of this that comes to mind is osmo-hlr-db-tool which has e.g. 'create' as such positional argument, so you could look up positional arg handling in that code.) -- To view, visit https://gerrit.osmocom.org/5239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I819b9616282dd6efd36c9557c7d6a50b6b00cdc2 Gerrit-Change-Number: 5239 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:08:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:08:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:08:46 +0000 Subject: Change in osmo-mgw[master]: mgcp client: vty: tweak doc strings In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/4598 ) Change subject: mgcp client: vty: tweak doc strings ...................................................................... Patch Set 4: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/4598/1/src/libosmo-mgcp-client/mgcp_client_vty.c File src/libosmo-mgcp-client/mgcp_client_vty.c: https://gerrit.osmocom.org/#/c/4598/1/src/libosmo-mgcp-client/mgcp_client_vty.c at 76 PS1, Line 76: OSMO_ASSERT(global_mgcp_client_ctx); > both MGCP and RTP are UDP, so TCP is wrong, IMHO argh, I'll just drop the TCP then -- To view, visit https://gerrit.osmocom.org/4598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1a408f9e651c5fb3424a84ceaaa603e20ad595c Gerrit-Change-Number: 4598 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:08:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:09:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:09:33 +0000 Subject: Change in osmo-msc[master]: move libiu to osmo-iuh/libosmo-ranap In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/3489 ) Change subject: move libiu to osmo-iuh/libosmo-ranap ...................................................................... Patch Set 7: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/3489/6/src/gprs/sgsn_main.c File src/gprs/sgsn_main.c: https://gerrit.osmocom.org/#/c/3489/6/src/gprs/sgsn_main.c at 357 PS6, Line 357: osmo_ss7_init(); I'm puzzled, the without-iu build should have failed on this line. -- To view, visit https://gerrit.osmocom.org/3489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib8c4fcdb4766c5e575618b95ce16dce51063206b Gerrit-Change-Number: 3489 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:09:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:10:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:10:07 +0000 Subject: Change in libosmocore[master]: osmo-sim-test.c: Remove unused functions In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/2957 ) Change subject: osmo-sim-test.c: Remove unused functions ...................................................................... Patch Set 5: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/2957/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/2957/3//COMMIT_MSG at 7 PS3, Line 7: osmo-sim-test.c: Remove unused functions strictly, "function", and wouldn't hurt to mention the name -- To view, visit https://gerrit.osmocom.org/2957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3060cfee8ece86c4c89a65f93c9f5424df0c410b Gerrit-Change-Number: 2957 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Dec 2018 12:10:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:10:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:10:23 +0000 Subject: Change in osmo-gsm-tester[master]: ofono_client: Fix race condition when checking for required features In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/2780 ) Change subject: ofono_client: Fix race condition when checking for required features ...................................................................... Patch Set 3: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/2780/3/src/osmo_gsm_tester/ofono_client.py File src/osmo_gsm_tester/ofono_client.py: https://gerrit.osmocom.org/#/c/2780/3/src/osmo_gsm_tester/ofono_client.py at 234 PS3, Line 234: def property_list_contains(self, name, val, iface=I_MODEM): it is not clear that 'val' is a list/tuple of values ... I see no benefit in generalizing this into a separate function, will we ever re-use it elsewhere? -- To view, visit https://gerrit.osmocom.org/2780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibbfbbd2be6ecd3cebae83becf1cc34e15dc8e579 Gerrit-Change-Number: 2780 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:10:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:10:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:10:34 +0000 Subject: Change in osmo-gsm-tester[master]: ofono_client: Implement network registration during connect() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/2484 ) Change subject: ofono_client: Implement network registration during connect() ...................................................................... Patch Set 1: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/2484/1/src/osmo_gsm_tester/ofono_client.py File src/osmo_gsm_tester/ofono_client.py: https://gerrit.osmocom.org/#/c/2484/1/src/osmo_gsm_tester/ofono_client.py at 225 PS1, Line 225: def connect(self, mcc=None, mnc=None): it would be nice here to have a choice: if I pass explicit MCC+MNC, then we ask the NetworkRegistration interface to do things. If not, just put the modem online and let it figure things out on its own. That way we could also merge the patch and have the current mo_mt_sms.py still use the automatic/implicit registration. Input validation: We need to make sure either both MCC and MNC are passed or neither. -- To view, visit https://gerrit.osmocom.org/2484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3092edc3dd76131da9aeeef6ad5082d1a9009342 Gerrit-Change-Number: 2484 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:10:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:10:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:10:50 +0000 Subject: Change in libosmocore[master]: Replace bitvec_set_uint() with bitvec_set_u64() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/4337 ) Change subject: Replace bitvec_set_uint() with bitvec_set_u64() ...................................................................... Patch Set 4: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/4337/1/include/osmocom/core/bitvec.h File include/osmocom/core/bitvec.h: https://gerrit.osmocom.org/#/c/4337/1/include/osmocom/core/bitvec.h at 74 PS1, Line 74: int bitvec_write_field(struct bitvec *bv, unsigned int *write_index, uint64_t val, unsigned int len); there already is a uint64_t writing function all the while? Is the point adding the lh in the first place? If yes please say so in the commit log! -- To view, visit https://gerrit.osmocom.org/4337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1b670dacb55fb3063271d045f9faa10fccba10a6 Gerrit-Change-Number: 4337 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Minh-Quang Nguyen Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:10:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:11:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:11:40 +0000 Subject: Change in osmo-hlr[master]: main: add VTY and '-c config-file' option In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/1707 ) Change subject: main: add VTY and '-c config-file' option ...................................................................... Patch Set 6: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/1707/2/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/#/c/1707/2/src/hlr_vty.c at 29 PS2, Line 29: int hlr_vty_is_config_node(struct vty *vty, int node) > Just skip it for the time being? And why the ENABLE_NODE? I have never understood the purpose of the ENABLE_NODE before, I thought it was something we just want to have in a VTY (for reasons that evade me). The HLR VTY is empty besides the logging commands, so indeed this function isn't any useful, more of a template for the future. This code is basically copied-and-stripped from openbsc, I wasn't paying too close attention... Right, now I notice that we can just omit this function. -- To view, visit https://gerrit.osmocom.org/1707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedb884345a597371a337b0c67eb6013b7d5d1ce1 Gerrit-Change-Number: 1707 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:11:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:12:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:12:03 +0000 Subject: Change in openbsc[master]: CTRL: remove boilerplate In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/1576 ) Change subject: CTRL: remove boilerplate ...................................................................... Patch Set 5: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/1576/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/1576/2//COMMIT_MSG at 9 PS2, Line 9: Use CTRL_CMD_DEFINE_RO(), CTRL_CMD_DEFINE_WO() and would be nice to have this line as the summary line above (without "where" of course) -- To view, visit https://gerrit.osmocom.org/1576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5bcea0b4f4b8f535bef2b423f2013b8b4a218b5b Gerrit-Change-Number: 1576 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:12:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:12:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:12:31 +0000 Subject: Change in osmo-gsm-manuals[master]: add 'make check' target In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/1089 ) Change subject: add 'make check' target ...................................................................... Patch Set 6: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/1089/2/build/Makefile.asciidoc.inc File build/Makefile.asciidoc.inc: https://gerrit.osmocom.org/#/c/1089/2/build/Makefile.asciidoc.inc at 40 PS2, Line 40: touch $@ > @grep -v WARNING $@ might already be enough.. and you used "" for touch.. [?] grep -v would not print the WARNINGS, but I *want* the warnings in the output, hence the weird exit dance. I used touch so that the .check target is created even if the WARNING grep didn't produce any output. Ah you mean the quoting... hmm, remove these quotes or add them everywhere else? :) (These comments could go in-code.) -- To view, visit https://gerrit.osmocom.org/1089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibccc83a3415930a528f2e8e4e4dda3b81c6d0b64 Gerrit-Change-Number: 1089 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:12:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:12:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:12:44 +0000 Subject: Change in osmo-bts[master]: dyn PDCH: implement main dyn PDCH logic in common/ In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/309 ) Change subject: dyn PDCH: implement main dyn PDCH logic in common/ ...................................................................... Patch Set 3: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/309/1/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/#/c/309/1/src/common/rsl.c at 1812 PS1, Line 1812: gsm_lchant_name(ts->lchan[0].type)); this should be gsm_lchant_name(), still figuring out how to submit the fix to gerrit... -- To view, visit https://gerrit.osmocom.org/309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id2f5f77121a65d6c14eac127b3d4fb50e97a77ab Gerrit-Change-Number: 309 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:12:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:12:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:12:55 +0000 Subject: Change in libosmo-sccp[master]: clarify fixme comment, x7 In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/228 ) Change subject: clarify fixme comment, x7 ...................................................................... Patch Set 3: (1 comment) (posting forgotten Draft comments, may be hoplessly outdated now. Easiest to get rid of them is to just "Reply", so bear with me, thx) https://gerrit.osmocom.org/#/c/228/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/228/1//COMMIT_MSG at 7 PS1, Line 7: > why is it obsolete? are we now generating an error message towards the remote side? I assumed the "LOGP(DSUA, LOGL_ERROR," was the error message :) -- To view, visit https://gerrit.osmocom.org/228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6de8fb202c7beb025232e9b97605e9f46778506a Gerrit-Change-Number: 228 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:12:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:17:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 12:17:42 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c at 586 PS4, Line 586: struct gsm29205_gcr g = { .net_len = 3, .node = 0xDEAD }, p = { 0 }; > It's ok, no pressing need to change it, but I refuse to accept that '{ 0 }' is better than '{}' in a [?] It's "better" using {0} for two reasons, but after reading in lots of places about the topic, there's no clear winner for one or another and I'd say depending on the case one, the other or both are good/better. 1- I remember having to apply a fix in one place in osmocom code (there should be a patch somewhere in the repos) s/{}/{0}/ because the compiler was failing with some warning/error. 2- While reading about the topic due to this discussion, I read that some C standard required "[put here whatever compiler-world lexical foobar you want]" to b non-empty, but actually gcc supported empty ones through extension, and I think actually a later standard also supported empty ones. So it's really not that important except for practical cases as in 1. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 12:17:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:20:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:20:51 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 17: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12020/17/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/17/tests/gsm0808/gsm0808_test.c at 1864 PS17, Line 1864: osmo_init_logging2(talloc_named_const(NULL, 0, "gsm0808 test"), NULL); is there any logging being added? if we really need this, I prefer void *ctx = talloc_named_const... msgb_talloc_ctx_init(ctx, 0); osmo_init_logging2(ctx,...); and possibly trace the logging in expected stderr output; related logging setup explanation: https://gerrit.osmocom.org/c/libosmocore/+/10185/5/tests/gsm0408/gsm0408_test.c#941 -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 17 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 12:20:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:22:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 12:22:14 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12227 ) Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... Patch Set 5: > > Patch Set 5: Code-Review-1 > > > > -1 since last version still don't apply my comments regarding > movement of sanitize out of sgsn_acl_* callees. > > You haven't stated why you think it's better (unless I've missed it > somehow). So the answer is still the same (and still in commit > message): having this check in vty makes it hard to unit-test, > having it as a static function next to sgsn_acl_* makes it > unit-testable. > > I don't see any advantage in keeping code which is not directly > related to vty inside sgsn_vty.c. Having sanitize function right > next to where its result is used is way more intuitive and easier > to maintain. Plus the advantage of unit testing. I did, maybe it was not clear enough: "I think sanitizing the imsi should be done by caller of sgsn_acl_* based on where the information come from (from the wire or from known sanitized source)." If you know your data is sane there's no need to re-sanitize it. You should expect the caller of a data struct to provide sane data instead of internally sanitizing it and storing different data from what was provided. It's responsibility of the caller (vty code for instance) to make sure parse of human input is correctly parsed and sanitized. You can do checks inside the data structure if you want (I wouldn't), but I'd avoid changing content of the data being handled in there. -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 12:22:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:22:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:22:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: fix pattern warning In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12237 ) Change subject: MGCP: fix pattern warning ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/12237/1/library/MGCP_Types.ttcn File library/MGCP_Types.ttcn: https://gerrit.osmocom.org/#/c/12237/1/library/MGCP_Types.ttcn at 57 PS1, Line 57: variant "END('\n', '([\n])|(\n)')" IIUC that can just be '\n' now in that regex part, without the ()|() stuff? https://gerrit.osmocom.org/#/c/12237/1/library/MGCP_Types.ttcn at 94 PS1, Line 94: //variant "END('\r\n', '(\n)|(\r\n)')" (also drop this?) -- To view, visit https://gerrit.osmocom.org/12237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99948e4b82b5b4bd5b8f7c1a4c60a97fcab3c0eb Gerrit-Change-Number: 12237 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 11 Dec 2018 12:22:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:23:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:23:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: remove commented variants In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12238 ) Change subject: MGCP: remove commented variants ...................................................................... Patch Set 1: Code-Review+2 ah ok. -- To view, visit https://gerrit.osmocom.org/12238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f11a93634fc50243a7210edcd501bd4b90d6dcd Gerrit-Change-Number: 12238 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 11 Dec 2018 12:23:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:25:06 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 11 Dec 2018 12:25:06 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add build-discarder In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12141 ) Change subject: jobs/ttcn3-testsuites.yml: add build-discarder ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib7f01751ca5f6fb3e29a436982e2891d9cab0488 Gerrit-Change-Number: 12141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 11 Dec 2018 12:25:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:25:09 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 11 Dec 2018 12:25:09 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add build-discarder In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12141 ) Change subject: jobs/ttcn3-testsuites.yml: add build-discarder ...................................................................... jobs/ttcn3-testsuites.yml: add build-discarder Add the same build discarder as we have in master-builds.yml. This should help with the disk space problems. Change-Id: Ib7f01751ca5f6fb3e29a436982e2891d9cab0488 --- M jobs/ttcn3-testsuites.yml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index a5c5fe4..ba0ce2a 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -109,5 +109,10 @@ use-build-blocker: true blocking-jobs: - "^{job-name}.*" + - build-discarder: + days-to-keep: 30 + num-to-keep: 120 + artifact-days-to-keep: -1 + artifact-num-to-keep: -1 # vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/12141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib7f01751ca5f6fb3e29a436982e2891d9cab0488 Gerrit-Change-Number: 12141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:25:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 12:25:18 +0000 Subject: Change in osmo-bts[master]: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11904 ) Change subject: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11904/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11904/1//COMMIT_MSG at 15 PS1, Line 15: TCH/F). > one thing I don't understand yet in the overall failure cause: osmo-bsc must be sending a PDCH DE/AC [?] The osmo-bts-trx patch you mention has nothing to do with this issue, it's a separate issue I spotted while checking this one. With that I mean that osmo-bts-trx change didn't really change the behavior expressed here. -- To view, visit https://gerrit.osmocom.org/11904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I91c65da6b6b7094f32187d3b083153a87c3219fd Gerrit-Change-Number: 11904 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:25:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:28:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 11 Dec 2018 12:28:18 +0000 Subject: Change in osmo-gsm-tester[master]: contrib/jenkins*: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12213 ) Change subject: contrib/jenkins*: build and publish manuals ...................................................................... contrib/jenkins*: build and publish manuals Add contrib/jenkins-build-manuals.sh, which clones or updates osmo-gsm-manuals and builds the manuals. When the environment variable PUBLISH=1 is set, it also uploads them. Call jenkins-build-manuals.sh from jenkins-run.sh, without PUBLISH=1, so the manuals get build-tested in the osmo-gsm-tester_gerrit job. A new job master-osmo-gsm-tester will be added in the future, which will run PUBLISH=1 jenkins-build-manuals.sh. The jenkins-build-manuals.sh script does not use the osmo-ci.git scripts for installing dependencies and cleaning up the workspace. These scripts are not available on the node, which runs the osmo-gsm-tester_gerrit job, and it is not trivial to add just them (without building the osmo-ci Docker image etc.). The only dependency is osmo-gsm-manuals, and it does not need to be compiled, so it seemed to be the most maintainable solution to implement the clone/update and clean up in a few lines of shell code instead. Related: OS#3385 Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd --- A contrib/jenkins-build-manuals.sh M contrib/jenkins-make-check-and-run.sh 2 files changed, 41 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/contrib/jenkins-build-manuals.sh b/contrib/jenkins-build-manuals.sh new file mode 100755 index 0000000..48f7780 --- /dev/null +++ b/contrib/jenkins-build-manuals.sh @@ -0,0 +1,40 @@ +#!/bin/sh -ex +# environment variables: +# * PUBLISH: upload manuals after building if set to "1" + +base="$PWD" +export OSMO_GSM_MANUALS_DIR="$base/osmo-gsm-manuals" + +# Sanity check +if ! [ -d "$base/doc/manuals" ]; then + echo "ERROR: this script needs to be executed from the top dir of osmo-gsm-tester.git." + exit 1 +fi + +# Clone/update osmo-gsm-manuals and wipe local modifications +if [ -d "$OSMO_GSM_MANUALS_DIR" ]; then + git -C "$OSMO_GSM_MANUALS_DIR" pull +else + git clone "https://git.osmocom.org/osmo-gsm-manuals" "$OSMO_GSM_MANUALS_DIR" +fi +git -C "$OSMO_GSM_MANUALS_DIR" checkout -f HEAD + +# Copy manuals source to empty temp dir (so we can easily clean up afterwards) +temp="$base/_manuals_temp" +if [ -d "$temp" ]; then + rm -rf "$temp" +fi +cp -r "$base/doc/manuals" "$temp" + +# Build the manuals +cd "$temp" +make +make check + +# Publish +if [ "$PUBLISH" = "1" ]; then + make publish +fi + +# Clean up +rm -r "$temp" diff --git a/contrib/jenkins-make-check-and-run.sh b/contrib/jenkins-make-check-and-run.sh index 3017fd4..2a9bc82 100755 --- a/contrib/jenkins-make-check-and-run.sh +++ b/contrib/jenkins-make-check-and-run.sh @@ -8,6 +8,7 @@ cd osmo-gsm-tester make deps make check +./contrib/jenkins-build-manuals.sh cd "$base" PATH="$base/osmo-gsm-tester/src:$PATH" \ -- To view, visit https://gerrit.osmocom.org/12213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4ebfe12a164f807b63bc897aff44db83fc0705bd Gerrit-Change-Number: 12213 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:28:36 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 12:28:36 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12177 to look at the new patch set (#7). Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... make gsup ipa name configurable in osmo-msc.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the MSC. This is a prerequisite for inter-MSC handover. Related: OS#3355 Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/test_nodes.vty 20 files changed, 159 insertions(+), 128 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/12177/7 -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:30:51 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 12:30:51 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12177 ) Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... Patch Set 7: (2 comments) https://gerrit.osmocom.org/#/c/12177/6/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/12177/6/src/libvlr/vlr.c at 1217 PS6, Line 1217: const char *gsup_server_addr_str, uint16_t gsup_server_port) > (still got the space indent here from the earlier patch set) Fixed in next patch set. https://gerrit.osmocom.org/#/c/12177/6/tests/msc_vlr/msc_vlr_tests.c File tests/msc_vlr/msc_vlr_tests.c: https://gerrit.osmocom.org/#/c/12177/6/tests/msc_vlr/msc_vlr_tests.c at 556 PS6, Line 556: struct osmo_oap_client_config *oap_config) > (for some reason gerrit shows indenting changes above?) [?] Fixed in next patch set. -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Dec 2018 12:30:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:32:53 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 12:32:53 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12177 to look at the new patch set (#8). Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... make gsup ipa name configurable in osmo-msc.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the MSC. This is a prerequisite for inter-MSC handover. Related: OS#3355 Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/test_nodes.vty 20 files changed, 160 insertions(+), 129 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/12177/8 -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 8 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:37:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:37:15 +0000 Subject: Change in osmo-sgsn[master]: Add tests for IMSI ACLs In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12226 ) Change subject: Add tests for IMSI ACLs ...................................................................... Patch Set 5: (2 comments) I'm kind of puzzled how the ACL is even relevant anymore after we're using osmo-hlr? https://gerrit.osmocom.org/#/c/12226/5/tests/sgsn/sgsn_test.c File tests/sgsn/sgsn_test.c: https://gerrit.osmocom.org/#/c/12226/5/tests/sgsn/sgsn_test.c at 1348 PS5, Line 1348: size_t new_count, old_count = sgsn_acl_count(cfg); prefer each variable on its own line. (kind of unnecessary to go yet another review cycle after Pau has spelled it out in detail.) https://gerrit.osmocom.org/#/c/12226/5/tests/sgsn/sgsn_test.c at 1379 PS5, Line 1379: size_t new_count, old_count = sgsn_acl_count(cfg); same -- To view, visit https://gerrit.osmocom.org/12226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia782f12b49bed6428bc9b9f513237e4e6aefdec9 Gerrit-Change-Number: 12226 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 12:37:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:50:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:50:06 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12227 ) Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... Patch Set 5: Code-Review-1 (3 comments) as in last patch, enlighten us why we bother with ACLs? https://gerrit.osmocom.org/#/c/12227/5/src/gprs/sgsn_auth.c File src/gprs/sgsn_auth.c: https://gerrit.osmocom.org/#/c/12227/5/src/gprs/sgsn_auth.c at 49 PS5, Line 49: * \returns true if IMSI would require truncation, false otherwise what do you mean, truncation -- if it is too long, then it is invalid. Return false if it is invalid, true if it is valid. Pau did mention the weird return value before. https://gerrit.osmocom.org/#/c/12227/5/src/gprs/sgsn_auth.c at 60 PS5, Line 60: osmo_strlcpy(dst + GSM23003_IMSI_MAX_DIGITS - len, imsi, dst_len - (GSM23003_IMSI_MAX_DIGITS - len)); this won't work if dst_len is too small, because the osmo_strlcpy() siz arg is a size_t, which is unsigned. You need to check dst_len bounds avoiding negative number space. https://gerrit.osmocom.org/#/c/12227/5/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12227/5/src/gprs/sgsn_vty.c at a651 PS5, Line 651: (ok, this was technically also wrong, but ensured the size because the buf was declared just above it.) -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 12:50:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:51:13 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 12:51:13 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 5: (3 comments) https://gerrit.osmocom.org/#/c/10185/5/src/gsm/gsm48_arfcn_range_encode.c File src/gsm/gsm48_arfcn_range_encode.c: https://gerrit.osmocom.org/#/c/10185/5/src/gsm/gsm48_arfcn_range_encode.c at 213 PS5, Line 213: k, wk_len, octet_offs, bit_offs, level, lvl_left); > ah damn. I think in a libosmocore utility function like this we shouldn't log though? not sure... Since these looks like ad-hoc debug printfs, I'll just remove them. https://gerrit.osmocom.org/#/c/10185/5/tests/gsm0408/gsm0408_test.c File tests/gsm0408/gsm0408_test.c: https://gerrit.osmocom.org/#/c/10185/5/tests/gsm0408/gsm0408_test.c at 618 PS5, Line 618: int arfcns_num, int silent) > (weird indent .. [?] Yes, copied along. I'll fix it. https://gerrit.osmocom.org/#/c/10185/5/tests/gsm0408/gsm0408_test.c at 941 PS5, Line 941: log_init(&log_info, NULL); > Usually in regression tests, to get reproducable output I have to call: [?] Looks like no logging is needed. I'll remove this stuff. -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Tue, 11 Dec 2018 12:51:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:51:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:51:27 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12177 ) Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 8 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Dec 2018 12:51:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:51:45 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 12:51:45 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10185 to look at the new patch set (#6). Change subject: port arfcn range encode support from osmo-bsc ...................................................................... port arfcn range encode support from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports one of the prerequisites for doing so: osmo-bsc code for range-encoding ARFCNs, including tests. An osmo_gsm48_ prefix has been prepended to public symbols in order to avoid clashes with existing symbols in osmo-bsc code. Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Related: OS#3075 --- M include/Makefile.am A include/osmocom/gsm/gsm48_arfcn_range_encode.h M src/gsm/Makefile.am A src/gsm/gsm48_arfcn_range_encode.c M src/gsm/libosmogsm.map M tests/gsm0408/gsm0408_test.c A tests/gsm0408/gsm0408_test.err M tests/gsm0408/gsm0408_test.ok 8 files changed, 774 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/10185/6 -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:53:55 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 12:53:55 +0000 Subject: Change in libosmocore[master]: port rest octets encoding code from osmo-bsc In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10189 ) Change subject: port rest octets encoding code from osmo-bsc ...................................................................... Patch Set 3: > Patch Set 3: > > has anything changed about the licensing? no, right? No change. I have just rebased the patches to resolve merge conflicts. -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 12:53:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:57:04 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 12:57:04 +0000 Subject: Change in osmo-bsc[master]: trigger acc ramping based on trx rf-locked state In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/7732 ) Change subject: trigger acc ramping based on trx rf-locked state ...................................................................... Patch Set 4: (4 comments) https://gerrit.osmocom.org/#/c/7732/1/src/libbsc/acc_ramp.c File src/libbsc/acc_ramp.c: https://gerrit.osmocom.org/#/c/7732/1/src/libbsc/acc_ramp.c at 162 PS1, Line 162: > You are deferring an expected nm_statechg_signal_data pointer before knowing if that's the correct s [?] Nice catch! Fixed in next patch set. https://gerrit.osmocom.org/#/c/7732/1/src/libbsc/acc_ramp.c at 166 PS1, Line 166: acc_ramp_trigger(acc_ramp); > Is this really needed? we are only attaching the cb to the SS_NM subsystem right? [?] Unsure. This was copied from bts_ipa_nm_sig_cb() in bts_ipaccess_nanobts.c. I didn't verify whether it's really required, and I'm happy to drop it (it certainly looks weird). https://gerrit.osmocom.org/#/c/7732/1/src/libbsc/acc_ramp.c at 194 PS1, Line 194: acc_ramp->bts = bts; > What about NM_STATE_SHUTDOWN and NM_STATE_NULL? Would be nice at least adding an explicit case for N [?] I'll make it abort ramping on SHUTDOWN as well. Not sure what to do about NULL -- for now I'd treat it as a no-op. An ASSERT on default would be a very bad idea because the administrative state value isn't checked by the lower layers but simply read verbatim from the TLV provided in the received packet. So an assert would introduce an easy way to kill the process remotely. I would rather log a warning instead (see next patch set). https://gerrit.osmocom.org/#/c/7732/1/src/libbsc/bsc_vty.c File src/libbsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/7732/1/src/libbsc/bsc_vty.c at 3280 PS1, Line 3280: > You can take the chance to improve the "BTS reconnects" part by adding reference to RSL link. Yes this comment is a bit sparse. Improved in next patch set. -- To view, visit https://gerrit.osmocom.org/7732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4124f1da3dadec003de45c1da8435506ee8f0a34 Gerrit-Change-Number: 7732 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 12:57:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 12:58:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 12:58:14 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 6: Code-Review-1 (3 comments) sorry, missed before: either not add the .err file, or if you want to add it (which would again be a separate patch though), then you also need to adjust libosmocore/tests/Makefile.am EXTRA_DIST to add it, and also adjust tests/testsuite.at so that the .err file gets validated. https://gerrit.osmocom.org/#/c/10185/6/tests/gsm0408/gsm0408_test.c File tests/gsm0408/gsm0408_test.c: https://gerrit.osmocom.org/#/c/10185/6/tests/gsm0408/gsm0408_test.c at 33 PS6, Line 33: #include not needed https://gerrit.osmocom.org/#/c/10185/6/tests/gsm0408/gsm0408_test.c at 116 PS6, Line 116: printf(" is: %s\n", osmo_hexdump(msg->data, msg->len)); maybe a bit eager find-replace? I think this stderr output should also go to stdout, yes, but technically that's a separate patch. (This should never fire anyway as long as the test succeeds, that's why we never saw it.) https://gerrit.osmocom.org/#/c/10185/6/tests/gsm0408/gsm0408_test.c at 914 PS6, Line 914: }; drop this too -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Tue, 11 Dec 2018 12:58:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:05:05 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 13:05:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Remove -Wall for autogenerated code Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12241 Change subject: Remove -Wall for autogenerated code ...................................................................... Remove -Wall for autogenerated code There seems to be no option for ttcn3_makefilegen to disable generated code warnings so the only way to clear output from useless warnings about indentation and such is to manually strip -Wall using sed. Change-Id: I7ef141f7f3370a1bf909845ce8a4eb650b33fa81 --- M regen-makefile.sh 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/12241/1 diff --git a/regen-makefile.sh b/regen-makefile.sh index b8be4ea..eb9ecdc 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -31,6 +31,9 @@ # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879816 for details sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile +#remove -Wall from CXXFLAGS: we're not interested in generic warnings for autogenerated code cluttering the logs +sed -i -e 's/-Wall//' Makefile + if [ "x$CPPFLAGS_TTCN3" != "x" ]; then sed -i -e 's/CPPFLAGS_TTCN3 =/CPPFLAGS_TTCN3 = '"$CPPFLAGS_TTCN3"'/' Makefile fi -- To view, visit https://gerrit.osmocom.org/12241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7ef141f7f3370a1bf909845ce8a4eb650b33fa81 Gerrit-Change-Number: 12241 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:08:01 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 13:08:01 +0000 Subject: Change in osmo-msc[master]: make gsup ipa name configurable in osmo-msc.cfg In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/12177 ) Change subject: make gsup ipa name configurable in osmo-msc.cfg ...................................................................... make gsup ipa name configurable in osmo-msc.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the MSC. This is a prerequisite for inter-MSC handover. Related: OS#3355 Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/test_nodes.vty 20 files changed, 160 insertions(+), 129 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 63af3e7..d2511cb 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -212,6 +212,12 @@ /* MSISDN to which to route MO emergency calls */ char *route_to_msisdn; } emergency; + + /* This is transmitted as IPA Serial Number tag, which is used for GSUP routing (e.g. in OsmoHLR). + * For inter-MSC handover, the remote MSC's neighbor configuration requires to match this name. + * If no name is set, the IPA Serial Number will be the same as the Unit Name, + * and will be of the form 'MSC-00-00-00-00-00-00' */ + char *msc_ipa_name; }; struct osmo_esme; diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index c0e4864..68e0759 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -312,7 +313,7 @@ int vlr_subscr_rx_imsi_detach(struct vlr_subscr *vsub); struct vlr_instance *vlr_alloc(void *ctx, const struct vlr_ops *ops); -int vlr_start(const char *gsup_unit_name, struct vlr_instance *vlr, +int vlr_start(struct ipaccess_unit *ipa_dev, struct vlr_instance *vlr, const char *gsup_server_addr_str, uint16_t gsup_server_port); /* internal use only */ diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 95c3183..7fe2c50 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1828,9 +1828,15 @@ /* Launch the VLR, i.e. its GSUP connection */ int msc_vlr_start(struct gsm_network *net) { + struct ipaccess_unit *ipa_dev; + OSMO_ASSERT(net->vlr); - return vlr_start("MSC", net->vlr, net->gsup_server_addr_str, - net->gsup_server_port); + + ipa_dev = talloc_zero(net->vlr, struct ipaccess_unit); + ipa_dev->unit_name = "MSC"; + ipa_dev->serno = net->msc_ipa_name; /* NULL unless configured via VTY */ + + return vlr_start(ipa_dev, net->vlr, net->gsup_server_addr_str, net->gsup_server_port); } struct msgb *gsm48_create_mm_serv_rej(enum gsm48_reject_value value) diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index e1d1b40..06e1139 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -458,6 +458,18 @@ return CMD_SUCCESS; } +DEFUN(cfg_msc_ipa_name, + cfg_msc_ipa_name_cmd, + "ipa-name NAME", + "Set the IPA name of this MSC\n" + "A unique name for this MSC. For example: PLMN + redundancy server number: MSC-901-70-0. " + "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. " + "The default is 'MSC-00-00-00-00-00-00'.\n") +{ + gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]); + return CMD_SUCCESS; +} + static int config_write_msc(struct vty *vty) { vty_out(vty, "msc%s", VTY_NEWLINE); @@ -491,6 +503,9 @@ gsmnet->emergency.route_to_msisdn, VTY_NEWLINE); } + if (gsmnet->msc_ipa_name) + vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name, VTY_NEWLINE); + mgcp_client_config_write(vty, " "); #ifdef BUILD_IU ranap_iu_vty_config_write(vty, " "); @@ -1483,6 +1498,7 @@ install_element(MSC_NODE, &cfg_msc_cs7_instance_iu_cmd); install_element(MSC_NODE, &cfg_msc_paging_response_timer_cmd); install_element(MSC_NODE, &cfg_msc_emergency_msisdn_cmd); + install_element(MSC_NODE, &cfg_msc_ipa_name_cmd); mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf); #ifdef BUILD_IU diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 3369914..975b240 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -1212,15 +1213,15 @@ return vlr; } -int vlr_start(const char *gsup_unit_name, struct vlr_instance *vlr, +int vlr_start(struct ipaccess_unit *ipa_dev, struct vlr_instance *vlr, const char *gsup_server_addr_str, uint16_t gsup_server_port) { OSMO_ASSERT(vlr); - vlr->gsup_client = osmo_gsup_client_create(vlr, gsup_unit_name, - gsup_server_addr_str, - gsup_server_port, - &vlr_gsupc_read_cb, NULL); + vlr->gsup_client = osmo_gsup_client_create2(vlr, ipa_dev, + gsup_server_addr_str, + gsup_server_port, + &vlr_gsupc_read_cb, NULL); if (!vlr->gsup_client) return -ENOMEM; vlr->gsup_client->data = vlr; diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index 1d1956a..bdb8f44 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -19,7 +19,7 @@ $(NULL) AM_LDFLAGS = \ - -Wl,--wrap=osmo_gsup_client_create \ + -Wl,--wrap=osmo_gsup_client_create2 \ -Wl,--wrap=osmo_gsup_client_send \ -Wl,--wrap=a_iface_tx_dtap \ -Wl,--wrap=a_iface_tx_clear_cmd \ diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index ca035bf..8948421 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_auth_use_twice_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -410,7 +410,7 @@ ===== test_auth_use_twice_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_auth_use_twice_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -859,7 +859,7 @@ ===== test_auth_use_twice_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_auth_use_infinitely_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1350,7 +1350,7 @@ ===== test_auth_use_infinitely_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_auth_use_infinitely_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1892,7 +1892,7 @@ ===== test_auth_use_infinitely_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_auth_reuse_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2209,7 +2209,7 @@ ===== test_no_auth_reuse_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_auth_reuse_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2551,8 +2551,8 @@ ===== test_no_auth_reuse_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index f2a46f5..481a2db 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_call_mo - Total time passed: 0.000000 s @@ -379,7 +379,7 @@ ===== test_call_mo: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_call_mt - Total time passed: 0.000000 s @@ -758,7 +758,7 @@ ===== test_call_mt: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_call_mt2 - Total time passed: 0.000000 s @@ -1103,7 +1103,7 @@ ===== test_call_mt2: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_call_mo_to_unknown - Total time passed: 0.000000 s @@ -1445,7 +1445,7 @@ ===== test_call_mo_to_unknown: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_call_mo_to_unknown_timeout - Total time passed: 0.000000 s @@ -1784,8 +1784,8 @@ ===== test_call_mo_to_unknown_timeout: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 8121e8e..b40544e 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_gsm_authen - Location Update request causes a GSUP Send Auth Info request to HLR @@ -442,7 +442,7 @@ ===== test_gsm_authen: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_gsm_authen_tmsi - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1086,7 +1086,7 @@ ===== test_gsm_authen_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_gsm_authen_imei - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1315,7 +1315,7 @@ ===== test_gsm_authen_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_gsm_authen_tmsi_imei - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1576,7 +1576,7 @@ ===== test_gsm_authen_tmsi_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_gsm_milenage_authen - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2000,7 +2000,7 @@ ===== test_gsm_milenage_authen: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_wrong_sres_length - Total time passed: 0.000000 s @@ -2118,8 +2118,8 @@ ===== test_wrong_sres_length: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 58dc7ec..6e35b07 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ciph - Location Update request causes a GSUP Send Auth Info request to HLR @@ -494,7 +494,7 @@ ===== test_ciph: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ciph_tmsi - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1026,7 +1026,7 @@ ===== test_ciph_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ciph_imei - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1259,7 +1259,7 @@ ===== test_ciph_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ciph_imeisv - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1481,7 +1481,7 @@ ===== test_ciph_imeisv: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ciph_tmsi_imei - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1746,7 +1746,7 @@ ===== test_ciph_tmsi_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_gsm_ciph_in_umts_env - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2210,7 +2210,7 @@ ===== test_gsm_ciph_in_umts_env: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_a5_3_supported - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2702,7 +2702,7 @@ ===== test_a5_3_supported: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_cm_service_needs_classmark_update - Location Update request causes a GSUP Send Auth Info request to HLR @@ -3185,8 +3185,8 @@ ===== test_cm_service_needs_classmark_update: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index efc3a8d..1b85a2d 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_rej_auth_info_unknown_imsi - Location Update request causes a GSUP Send Auth Info request to HLR @@ -79,7 +79,7 @@ ===== test_hlr_rej_auth_info_unknown_imsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_rej_auth_info_net_fail - Location Update request causes a GSUP Send Auth Info request to HLR @@ -159,7 +159,7 @@ ===== test_hlr_rej_auth_info_net_fail: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_rej_auth_info_net_fail_reuse_tuples --- @@ -456,7 +456,7 @@ ===== test_hlr_rej_auth_info_net_fail_reuse_tuples: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples --- @@ -685,7 +685,7 @@ ===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples --- @@ -915,7 +915,7 @@ ===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_acc_but_no_auth_tuples - Location Update request causes a GSUP Send Auth Info request to HLR @@ -994,7 +994,7 @@ ===== test_hlr_acc_but_no_auth_tuples: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_rej_lu - Location Update request causes a GSUP LU request to HLR @@ -1076,7 +1076,7 @@ ===== test_hlr_rej_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_no_insert_data - Location Update request causes a GSUP LU request to HLR @@ -1173,8 +1173,8 @@ ===== test_hlr_no_insert_data: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index 60bb8cb..2fa0719 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_timeout_lu_auth_info - Total time passed: 0.000000 s @@ -87,7 +87,7 @@ ===== test_hlr_timeout_lu_auth_info: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_hlr_timeout_lu_upd_loc_result - Total time passed: 0.000000 s @@ -194,8 +194,8 @@ ===== test_hlr_timeout_lu_upd_loc_result: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index 78218ac..c91f6a2 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ms_timeout_lu_auth_resp - Total time passed: 0.000000 s @@ -107,7 +107,7 @@ ===== test_ms_timeout_lu_auth_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ms_timeout_cm_auth_resp - Total time passed: 0.000000 s @@ -345,7 +345,7 @@ ===== test_ms_timeout_cm_auth_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ms_timeout_paging - Total time passed: 0.000000 s @@ -545,7 +545,7 @@ ===== test_ms_timeout_paging: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_classmark_update_timeout - Total time passed: 0.000000 s @@ -675,8 +675,8 @@ ===== test_classmark_update_timeout: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 189c680..ba82fc9 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen - Location Update request causes a GSUP LU request to HLR @@ -314,7 +314,7 @@ ===== test_no_authen: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_tmsi - Location Update request causes a GSUP LU request to HLR @@ -813,7 +813,7 @@ ===== test_no_authen_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_imei - Location Update request causes a GSUP LU request to HLR @@ -994,7 +994,7 @@ ===== test_no_authen_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_tmsi_imei - Location Update request causes a GSUP LU request to HLR @@ -1201,7 +1201,7 @@ ===== test_no_authen_tmsi_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_imeisv - Location Update request causes an IMEISV ID request back to the MS @@ -1368,7 +1368,7 @@ ===== test_no_authen_imeisv: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_imeisv_imei - Location Update request causes an IMEISV ID request back to the MS @@ -1567,7 +1567,7 @@ ===== test_no_authen_imeisv_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_imeisv_tmsi - Location Update request causes an IMEISV ID request back to the MS @@ -1929,7 +1929,7 @@ ===== test_no_authen_imeisv_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_imeisv_tmsi_imei - Location Update request causes an IMEISV ID request back to the MS @@ -2155,7 +2155,7 @@ ===== test_no_authen_imeisv_tmsi_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_no_authen_subscr_expire - Total time passed: 0.000000 s @@ -2273,8 +2273,8 @@ ===== test_no_authen_subscr_expire: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 03f99e1..85dd254 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_2nd_conn - Location Update Request on one connection @@ -150,7 +150,7 @@ ===== test_reject_2nd_conn: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_lu_during_lu - Location Update Request @@ -272,7 +272,7 @@ ===== test_reject_lu_during_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_cm_during_lu - Location Update Request @@ -401,7 +401,7 @@ ===== test_reject_cm_during_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_paging_resp_during_lu - Location Update Request @@ -523,7 +523,7 @@ ===== test_reject_paging_resp_during_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_lu_during_cm --- @@ -712,7 +712,7 @@ ===== test_reject_lu_during_cm: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_cm_during_cm --- @@ -904,7 +904,7 @@ ===== test_reject_cm_during_cm: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_paging_resp_during_cm --- @@ -1084,7 +1084,7 @@ ===== test_reject_paging_resp_during_cm: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_lu_during_paging_resp --- @@ -1303,7 +1303,7 @@ ===== test_reject_lu_during_paging_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_accept_cm_during_paging_resp --- @@ -1542,7 +1542,7 @@ ===== test_accept_cm_during_paging_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_reject_paging_resp_during_paging_resp --- @@ -1759,8 +1759,8 @@ ===== test_reject_paging_resp_during_paging_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 90905c8..1f0f509 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_early_stage - NULL conn @@ -48,7 +48,7 @@ ===== test_early_stage: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_cm_service_without_lu - CM Service Request without a prior Location Updating @@ -91,7 +91,7 @@ ===== test_cm_service_without_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_two_lu - Location Update request causes a GSUP LU request to HLR @@ -352,7 +352,7 @@ ===== test_two_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_lu_unknown_tmsi - Location Update request with unknown TMSI sends ID Request for IMSI @@ -498,8 +498,8 @@ ===== test_lu_unknown_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index e0f57aa..fe869ad 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ss_ussd_mo_geran - Location Update request causes a GSUP LU request to HLR @@ -195,7 +195,7 @@ ===== test_ss_ussd_mo_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_ss_ussd_no_geran - Location Update request causes a GSUP LU request to HLR @@ -420,8 +420,8 @@ ===== test_ss_ussd_no_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 3e8fe2e..d3c54bc 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -1,5 +1,5 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -456,7 +456,7 @@ ===== test_umts_authen_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -951,7 +951,7 @@ ===== test_umts_authen_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_resync_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1162,7 +1162,7 @@ ===== test_umts_authen_resync_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_resync_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1385,7 +1385,7 @@ ===== test_umts_authen_resync_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_too_short_res_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1483,7 +1483,7 @@ ===== test_umts_authen_too_short_res_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_too_short_res_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1581,7 +1581,7 @@ ===== test_umts_authen_too_short_res_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_too_long_res_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1679,7 +1679,7 @@ ===== test_umts_authen_too_long_res_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_too_long_res_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1777,7 +1777,7 @@ ===== test_umts_authen_too_long_res_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_only_sres_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1875,7 +1875,7 @@ ===== test_umts_authen_only_sres_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 ===== test_umts_authen_only_sres_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1973,8 +1973,8 @@ ===== test_umts_authen_only_sres_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 12 +talloc_total_blocks(tall_bsc_ctx) == 13 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 29ffdbf..8ae559e 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -546,15 +546,14 @@ return 0; } -/* override, requires '-Wl,--wrap=gsup_client_create' */ struct osmo_gsup_client * -__real_osmo_gsup_client_create(const char *ip_addr, unsigned int tcp_port, - osmo_gsup_client_read_cb_t read_cb, - struct osmo_oap_client_config *oap_config); +__real_osmo_gsup_client_create2(struct ipaccess_unit *ipa_dev, const char *ip_addr, + unsigned int tcp_port, osmo_gsup_client_read_cb_t read_cb, + struct osmo_oap_client_config *oap_config); struct osmo_gsup_client * -__wrap_osmo_gsup_client_create(const char *ip_addr, unsigned int tcp_port, - osmo_gsup_client_read_cb_t read_cb, - struct osmo_oap_client_config *oap_config) +__wrap_osmo_gsup_client_create2(struct ipaccess_unit *ipa_dev, const char *ip_addr, + unsigned int tcp_port, osmo_gsup_client_read_cb_t read_cb, + struct osmo_oap_client_config *oap_config) { struct osmo_gsup_client *gsupc; gsupc = talloc_zero(msc_vlr_tests_ctx, struct osmo_gsup_client); @@ -882,24 +881,25 @@ /* Verifying that the msgb context is empty */ talloc_report_full(msgb_ctx, stderr); /* Expecting these to stick around in msc_vlr_tests_ctx: - * talloc_total_blocks(tall_bsc_ctx) == 12 - * full talloc report on 'msc_vlr_tests_ctx' (total 3636 bytes in 12 blocks) - * struct osmo_gsup_client contains 248 bytes in 1 blocks (ref 0) 0x563a489c05f0 - * struct gsm_network contains 2031 bytes in 4 blocks (ref 0) 0x563a489bfbb0 - * struct vlr_instance contains 168 bytes in 1 blocks (ref 0) 0x563a489c04e0 - * no_gsup_server contains 15 bytes in 1 blocks (ref 0) 0x563a489c0460 - * ../../../src/libosmocore/src/rate_ctr.c:228 contains 1552 bytes in 1 blocks (ref 0) 0x563a489bfd40 - * logging contains 1357 bytes in 5 blocks (ref 0) 0x563a489bf440 - * struct log_target contains 228 bytes in 2 blocks (ref 0) 0x563a489bf9f0 - * struct log_category contains 68 bytes in 1 blocks (ref 0) 0x563a489bfb00 - * struct log_info contains 1128 bytes in 2 blocks (ref 0) 0x563a489bf4b0 - * struct log_info_cat contains 1088 bytes in 1 blocks (ref 0) 0x563a489bf540 - * msgb contains 0 bytes in 1 blocks (ref 0) 0x563a489bf3d0 - * (That's 12 counting the root ctx) + * talloc_total_blocks(tall_bsc_ctx) == 13 + * full talloc report on 'msc_vlr_tests_ctx' (total 4638 bytes in 13 blocks) + * struct osmo_gsup_client contains 256 bytes in 1 blocks (ref 0) 0x61300000dd20 + * struct gsm_network contains 2983 bytes in 5 blocks (ref 0) 0x61400000fea0 + * struct vlr_instance contains 320 bytes in 2 blocks (ref 0) 0x61300000dee0 + * struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e0000244c0 + * no_gsup_server contains 15 bytes in 1 blocks (ref 0) 0x60b00000af40 + * rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 + * logging contains 1399 bytes in 5 blocks (ref 0) 0x60b00000aff0 + * struct log_target contains 238 bytes in 2 blocks (ref 0) 0x61200000bf20 + * struct log_category contains 70 bytes in 1 blocks (ref 0) 0x60f00000efb0 + * struct log_info contains 1160 bytes in 2 blocks (ref 0) 0x60d00000cfd0 + * struct log_info_cat contains 1120 bytes in 1 blocks (ref 0) 0x61a00001f2e0 + * msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 + * (That's 13 counting the root ctx) */ fprintf(stderr, "talloc_total_blocks(tall_bsc_ctx) == %zu\n", talloc_total_blocks(msc_vlr_tests_ctx)); - if (talloc_total_blocks(msc_vlr_tests_ctx) != 12) + if (talloc_total_blocks(msc_vlr_tests_ctx) != 13) talloc_report_full(msc_vlr_tests_ctx, stderr); fprintf(stderr, "\n"); } diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index c4ab387..dcbf580 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -40,6 +40,7 @@ cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN + ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D -- To view, visit https://gerrit.osmocom.org/12177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Gerrit-Change-Number: 12177 Gerrit-PatchSet: 9 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:08:02 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 13:08:02 +0000 Subject: Change in osmo-msc[master]: provide software version information to gsup peer In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/12178 ) Change subject: provide software version information to gsup peer ...................................................................... provide software version information to gsup peer Provide software version information to the GSUP peer. The version now shows up in logs like this: Software_Version='osmo-msc-1.2.0.120-1263b' Change-Id: I2eba32569349facdbb1fda201067c62cc804ccf4 Depends: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006 Related: OS#3355 --- M src/libmsc/gsm_04_08.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 7fe2c50..dc0476b 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1835,6 +1835,7 @@ ipa_dev = talloc_zero(net->vlr, struct ipaccess_unit); ipa_dev->unit_name = "MSC"; ipa_dev->serno = net->msc_ipa_name; /* NULL unless configured via VTY */ + ipa_dev->swversion = PACKAGE_NAME "-" PACKAGE_VERSION; return vlr_start(ipa_dev, net->vlr, net->gsup_server_addr_str, net->gsup_server_port); } -- To view, visit https://gerrit.osmocom.org/12178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2eba32569349facdbb1fda201067c62cc804ccf4 Gerrit-Change-Number: 12178 Gerrit-PatchSet: 10 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:17:06 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 13:17:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: remove commented variants In-Reply-To: References: Message-ID: Hello dexter, Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12238 to look at the new patch set (#2). Change subject: MGCP: remove commented variants ...................................................................... MGCP: remove commented variants It's unclear why those variants were commented - looks like artifact from initial development. Let's drop them to avoid confusion. Change-Id: I3f11a93634fc50243a7210edcd501bd4b90d6dcd --- M library/MGCP_Types.ttcn 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/12238/2 -- To view, visit https://gerrit.osmocom.org/12238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3f11a93634fc50243a7210edcd501bd4b90d6dcd Gerrit-Change-Number: 12238 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:17:06 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 13:17:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: fix pattern warning In-Reply-To: References: Message-ID: Hello dexter, Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12237 to look at the new patch set (#2). Change subject: MGCP: fix pattern warning ...................................................................... MGCP: fix pattern warning Remove implied \r to fix following warnings: "Duplicate character `\r' in the character set. Please note the \n includes the \r implicitly. Use \q{0,0,0,10} if you would like to match the LF only." Change-Id: I99948e4b82b5b4bd5b8f7c1a4c60a97fcab3c0eb --- M library/MGCP_Types.ttcn 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/12237/2 -- To view, visit https://gerrit.osmocom.org/12237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I99948e4b82b5b4bd5b8f7c1a4c60a97fcab3c0eb Gerrit-Change-Number: 12237 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:17:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 13:17:21 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 6: (3 comments) https://gerrit.osmocom.org/#/c/10185/6/tests/gsm0408/gsm0408_test.c File tests/gsm0408/gsm0408_test.c: https://gerrit.osmocom.org/#/c/10185/6/tests/gsm0408/gsm0408_test.c at 33 PS6, Line 33: #include > not needed Right, dropped. https://gerrit.osmocom.org/#/c/10185/6/tests/gsm0408/gsm0408_test.c at 116 PS6, Line 116: printf(" is: %s\n", osmo_hexdump(msg->data, msg->len)); > maybe a bit eager find-replace? I think this stderr output should also go to stdout, yes, but techni [?] Oh, I understood that you wanted all fprintf() in this file to be printf() for some reason. Reverted in next patch set. https://gerrit.osmocom.org/#/c/10185/6/tests/gsm0408/gsm0408_test.c at 914 PS6, Line 914: }; > drop this too Done. -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Tue, 11 Dec 2018 13:17:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:17:38 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 13:17:38 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10185 to look at the new patch set (#7). Change subject: port arfcn range encode support from osmo-bsc ...................................................................... port arfcn range encode support from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports one of the prerequisites for doing so: osmo-bsc code for range-encoding ARFCNs, including tests. An osmo_gsm48_ prefix has been prepended to public symbols in order to avoid clashes with existing symbols in osmo-bsc code. Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Related: OS#3075 --- M include/Makefile.am A include/osmocom/gsm/gsm48_arfcn_range_encode.h M src/gsm/Makefile.am A src/gsm/gsm48_arfcn_range_encode.c M src/gsm/libosmogsm.map M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 7 files changed, 761 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/10185/7 -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:20:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 13:20:24 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Tue, 11 Dec 2018 13:20:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:27:22 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 13:27:22 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 7: Please don't merge this yet. There has been no written statement by Jolly regarding the licence change yet. -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Tue, 11 Dec 2018 13:27:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:29:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 13:29:49 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Neels Hofmeyr has removed dexter from this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Removed reviewer dexter. -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: deleteReviewer Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:30:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 13:30:34 +0000 Subject: Change in osmo-trx[master]: configure.ac: check boost only if USRP1 support is enabled In-Reply-To: References: Message-ID: Neels Hofmeyr has removed dexter from this change. ( https://gerrit.osmocom.org/12088 ) Change subject: configure.ac: check boost only if USRP1 support is enabled ...................................................................... Removed reviewer dexter. -- To view, visit https://gerrit.osmocom.org/12088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: deleteReviewer Gerrit-Change-Id: I4c3fa3ff58fd552d0cb4c4cf2033615d84c07c96 Gerrit-Change-Number: 12088 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:31:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 13:31:57 +0000 Subject: Change in osmo-trx[master]: configure.ac: check boost only if USRP1 support is enabled In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12088 ) Change subject: configure.ac: check boost only if USRP1 support is enabled ...................................................................... Patch Set 1: (sorry for the noise, trying to figure out a UI failure report) -- To view, visit https://gerrit.osmocom.org/12088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4c3fa3ff58fd552d0cb4c4cf2033615d84c07c96 Gerrit-Change-Number: 12088 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-CC: Neels Hofmeyr Gerrit-CC: dexter Gerrit-Comment-Date: Tue, 11 Dec 2018 13:31:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:33:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 13:33:38 +0000 Subject: Change in osmo-trx[master]: configure.ac: check boost only if USRP1 support is enabled In-Reply-To: References: Message-ID: Neels Hofmeyr has removed dexter from this change. ( https://gerrit.osmocom.org/12088 ) Change subject: configure.ac: check boost only if USRP1 support is enabled ...................................................................... Removed reviewer dexter. -- To view, visit https://gerrit.osmocom.org/12088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: deleteReviewer Gerrit-Change-Id: I4c3fa3ff58fd552d0cb4c4cf2033615d84c07c96 Gerrit-Change-Number: 12088 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-CC: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:33:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 13:33:42 +0000 Subject: Change in osmo-trx[master]: configure.ac: check boost only if USRP1 support is enabled In-Reply-To: References: Message-ID: Neels Hofmeyr has removed dexter from this change. ( https://gerrit.osmocom.org/12088 ) Change subject: configure.ac: check boost only if USRP1 support is enabled ...................................................................... Removed reviewer dexter. -- To view, visit https://gerrit.osmocom.org/12088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: deleteReviewer Gerrit-Change-Id: I4c3fa3ff58fd552d0cb4c4cf2033615d84c07c96 Gerrit-Change-Number: 12088 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:35:59 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 13:35:59 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 7: Marked as WIP until we get a written statement by Jolly about the licence change. -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Tue, 11 Dec 2018 13:35:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 13:37:09 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 13:37:09 +0000 Subject: Change in libosmocore[master]: port rest octets encoding code from osmo-bsc In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10189 ) Change subject: port rest octets encoding code from osmo-bsc ...................................................................... Patch Set 5: Marking as WIP until we get a written statement by Jolly about the licence change. -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 13:37:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 14:01:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 14:01:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 11 Dec 2018 14:01:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 14:03:26 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 14:03:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 11 Dec 2018 14:03:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 14:48:28 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 14:48:28 +0000 Subject: Change in osmo-sgsn[master]: remove pointless declaration of struct gsm_network Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12242 Change subject: remove pointless declaration of struct gsm_network ...................................................................... remove pointless declaration of struct gsm_network Stop passing a NULL pointer of type struct gsm_network * to ctrl_interface_setup_dynip(). A void pointer serves just fine for this purpose, and also avoids the misconception that the osmo-sgsn codebase was actually using struct gsm_network when, in fact, this struct is not used anywhere in this code base. Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Related: OS#3356 --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_ctrl.c 2 files changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/42/12242/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index b6afe69..1740e1a 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -404,9 +404,7 @@ /* * ctrl interface related work */ -struct gsm_network; -struct ctrl_handle *sgsn_controlif_setup(struct gsm_network *, - const char *bind_addr, uint16_t port); +struct ctrl_handle *sgsn_controlif_setup(void *data, const char *bind_addr, uint16_t port); int sgsn_ctrl_cmds_install(void); /* diff --git a/src/gprs/sgsn_ctrl.c b/src/gprs/sgsn_ctrl.c index dc5ae79..22fbe7a 100644 --- a/src/gprs/sgsn_ctrl.c +++ b/src/gprs/sgsn_ctrl.c @@ -61,8 +61,7 @@ return rc; } -struct ctrl_handle *sgsn_controlif_setup(struct gsm_network *net, - const char *bind_addr, uint16_t port) +struct ctrl_handle *sgsn_controlif_setup(void *data, const char *bind_addr, uint16_t port) { - return ctrl_interface_setup_dynip(net, bind_addr, port, NULL); + return ctrl_interface_setup_dynip(data, bind_addr, port, NULL); } -- To view, visit https://gerrit.osmocom.org/12242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Gerrit-Change-Number: 12242 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 15:22:24 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 11 Dec 2018 15:22:24 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12243 Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... make gsup ipa name configurable in osmo-sgsn.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the SGSN on the GSUP link towards the HLR. This is required for GSUP routing in multi-SGSN networks. Related: OS#3356 Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_subscriber.c M src/gprs/sgsn_vty.c 3 files changed, 30 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/12243/1 diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 3a34ff9..c80355d 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -124,6 +124,12 @@ enum ranap_nsap_addr_enc rab_assign_addr_enc; } iu; #endif + + /* This is transmitted as IPA Serial Number tag, which is used for GSUP routing (e.g. in OsmoHLR). + * This name must be set in a multi-SGSN network, and it must be unique to each SGSN. + * If no name is set, the IPA Serial Number will be the same as the Unit Name, + * and will be of the form 'SGSN-00-00-00-00-00-00' */ + char *sgsn_ipa_name; }; struct sgsn_instance { diff --git a/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c index 4ab45c2..484c7ef 100644 --- a/src/gprs/gprs_subscriber.c +++ b/src/gprs/gprs_subscriber.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -63,15 +64,20 @@ int gprs_subscr_init(struct sgsn_instance *sgi) { const char *addr_str; + struct ipaccess_unit *ipa_dev; if (!sgi->cfg.gsup_server_addr.sin_addr.s_addr) return 0; addr_str = inet_ntoa(sgi->cfg.gsup_server_addr.sin_addr); - sgi->gsup_client = osmo_gsup_client_create( + ipa_dev = talloc_zero(sgi, struct ipaccess_unit); + ipa_dev->unit_name = "SGSN"; + ipa_dev->serno = sgi->cfg.sgsn_ipa_name; /* NULL unless configured via VTY */ + + sgi->gsup_client = osmo_gsup_client_create2( sgi, - "SGSN", + ipa_dev, addr_str, sgi->cfg.gsup_server_port, &gsup_read_cb, &sgi->cfg.oap); diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 601b3c5..ebf77ba 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -177,6 +177,9 @@ vty_out(vty, " gtp local-ip %s%s", inet_ntoa(g_cfg->gtp_listenaddr.sin_addr), VTY_NEWLINE); + if (g_cfg->sgsn_ipa_name) + vty_out(vty, " ipa-name %s%s", g_cfg->sgsn_ipa_name, VTY_NEWLINE); + llist_for_each_entry(gctx, &sgsn_ggsn_ctxts, list) { if (gctx->id == UINT32_MAX) continue; @@ -338,6 +341,18 @@ return CMD_SUCCESS; } +DEFUN(cfg_sgsn_ipa_name, + cfg_sgsn_ipa_name_cmd, + "ipa-name NAME", + "Set the IPA name of this SGSN\n" + "A unique name for this SGSN. For example: PLMN + redundancy server number: SGSN-901-70-0. " + "This name is used for GSUP routing and must be set if more than one SGSN is connected to the network. " + "The default is 'SGSN-00-00-00-00-00-00'.\n") +{ + g_cfg->sgsn_ipa_name = talloc_strdup(tall_vty_ctx, argv[0]); + return CMD_SUCCESS; +} + #if 0 DEFUN(cfg_ggsn_remote_port, cfg_ggsn_remote_port_cmd, "ggsn <0-255> remote-port <0-65535>", @@ -1358,6 +1373,7 @@ install_node(&sgsn_node, config_write_sgsn); install_element(SGSN_NODE, &cfg_sgsn_bind_addr_cmd); install_element(SGSN_NODE, &cfg_ggsn_remote_ip_cmd); + install_element(SGSN_NODE, &cfg_sgsn_ipa_name_cmd); //install_element(SGSN_NODE, &cfg_ggsn_remote_port_cmd); install_element(SGSN_NODE, &cfg_ggsn_gtp_version_cmd); install_element(SGSN_NODE, &cfg_ggsn_echo_interval_cmd); -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 15:32:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 15:32:59 +0000 Subject: Change in osmo-sgsn[master]: remove pointless declaration of struct gsm_network In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12242 ) Change subject: remove pointless declaration of struct gsm_network ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12242/1/src/gprs/sgsn_ctrl.c File src/gprs/sgsn_ctrl.c: https://gerrit.osmocom.org/#/c/12242/1/src/gprs/sgsn_ctrl.c at 64 PS1, Line 64: struct ctrl_handle *sgsn_controlif_setup(void *data, const char *bind_addr, uint16_t port) I think it's even more confusing this way. If parameter is unused than simply drop the parameter. -- To view, visit https://gerrit.osmocom.org/12242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Gerrit-Change-Number: 12242 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 15:32:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 15:36:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 15:36:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen-makefile.sh: add link to related Debian bug in comment In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12239 ) Change subject: regen-makefile.sh: add link to related Debian bug in comment ...................................................................... regen-makefile.sh: add link to related Debian bug in comment This makes it easier to track when this workaround can be disabled once Debian/upstream (hopefully) resolve the issue. Change-Id: I3c4ed0ae5c1145f162b2745f4a46705b51874b5b --- M regen-makefile.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/regen-makefile.sh b/regen-makefile.sh index b8be4ea..a9f8562 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -6,6 +6,8 @@ # the binaries to different paths without patching the make file # generator, leading in inconsistent non-working Makefiles. # +# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884303 for details. +# # The regexes below patch the generated Makefile to work on Debian 9 and # unstable, so far tested with TITAN 6.1.0, 6.2.0 and 6.3.0 # -- To view, visit https://gerrit.osmocom.org/12239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3c4ed0ae5c1145f162b2745f4a46705b51874b5b Gerrit-Change-Number: 12239 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 15:44:24 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 11 Dec 2018 15:44:24 +0000 Subject: Change in osmo-trx[master]: tests: rename convolve_test -> ConvolveTest Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12244 Change subject: tests: rename convolve_test -> ConvolveTest ...................................................................... tests: rename convolve_test -> ConvolveTest Make the test's name consistent with all other tests in this repository. This makes adding new tests to tests/Transceiver52M/Makefile.am less awkward (follow-up commit), because it is clear now which casing should be used. Change-Id: I4ca533ca8c5e19b6dbe7b0aba672ee14cf5c3bd1 --- M .gitignore R tests/Transceiver52M/ConvolveTest.c R tests/Transceiver52M/ConvolveTest.ok M tests/Transceiver52M/Makefile.am M tests/testsuite.at 5 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/44/12244/1 diff --git a/.gitignore b/.gitignore index ad4c4e3..92fc723 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ tests/CommonLibs/URLEncodeTest tests/CommonLibs/VectorTest tests/CommonLibs/PRBSTest -tests/Transceiver52M/convolve_test +tests/Transceiver52M/ConvolveTest # automake/autoconf *.in diff --git a/tests/Transceiver52M/convolve_test.c b/tests/Transceiver52M/ConvolveTest.c similarity index 100% rename from tests/Transceiver52M/convolve_test.c rename to tests/Transceiver52M/ConvolveTest.c diff --git a/tests/Transceiver52M/convolve_test.ok b/tests/Transceiver52M/ConvolveTest.ok similarity index 100% rename from tests/Transceiver52M/convolve_test.ok rename to tests/Transceiver52M/ConvolveTest.ok diff --git a/tests/Transceiver52M/Makefile.am b/tests/Transceiver52M/Makefile.am index 06db5b0..a9d3992 100644 --- a/tests/Transceiver52M/Makefile.am +++ b/tests/Transceiver52M/Makefile.am @@ -2,17 +2,17 @@ AM_CFLAGS = -Wall -I$(top_srcdir)/Transceiver52M -I$(top_srcdir)/Transceiver52M/arch/common $(STD_DEFINES_AND_INCLUDES) -g -EXTRA_DIST = convolve_test.ok +EXTRA_DIST = ConvolveTest.ok noinst_PROGRAMS = \ - convolve_test + ConvolveTest -convolve_test_SOURCES = convolve_test.c -convolve_test_CFLAGS = $(AM_CFLAGS) -convolve_test_LDADD = $(COMMON_LA) $(ARCH_LA) +ConvolveTest_SOURCES = ConvolveTest.c +ConvolveTest_CFLAGS = $(AM_CFLAGS) +ConvolveTest_LDADD = $(COMMON_LA) $(ARCH_LA) if HAVE_SSE3 -convolve_test_CFLAGS += $(SIMD_FLAGS) +ConvolveTest_CFLAGS += $(SIMD_FLAGS) endif if HAVE_SSE4_1 -convolve_test_CFLAGS += $(SIMD_FLAGS) +ConvolveTest_CFLAGS += $(SIMD_FLAGS) endif diff --git a/tests/testsuite.at b/tests/testsuite.at index f84225e..1968481 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -44,10 +44,10 @@ AT_CHECK([$abs_top_builddir/tests/CommonLibs/VectorTest], [], [expout], []) AT_CLEANUP -AT_SETUP([convolve_test]) -AT_KEYWORDS([convolve_test]) +AT_SETUP([ConvolveTest]) +AT_KEYWORDS([ConvolveTest]) # Different results for i686, x86_64 and ARM. see OS#2826, OS#2828, and https://lists.osmocom.org/pipermail/openbsc/2018-January/011655.html AT_SKIP_IF(true) -cat $abs_srcdir/Transceiver52M/convolve_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/Transceiver52M/convolve_test], [], [expout], []) +cat $abs_srcdir/Transceiver52M/ConvolveTest.ok > expout +AT_CHECK([$abs_top_builddir/tests/Transceiver52M/ConvolveTest], [], [expout], []) AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/12244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4ca533ca8c5e19b6dbe7b0aba672ee14cf5c3bd1 Gerrit-Change-Number: 12244 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 15:44:24 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 11 Dec 2018 15:44:24 +0000 Subject: Change in osmo-trx[master]: LMSDevice: make use of dev-args in osmo-trx.cfg Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12245 Change subject: LMSDevice: make use of dev-args in osmo-trx.cfg ...................................................................... LMSDevice: make use of dev-args in osmo-trx.cfg Allow selecting a specific LimeSDR device by setting dev-args in the config file. Split up the given dev-args address by comma and select the device where all substrings can be found. I could not test this with real hardware, but I have added a test case to make sure this works as expected. Related: OS#3654 Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 --- M .gitignore M Transceiver52M/device/lms/LMSDevice.cpp A tests/Transceiver52M/LMSDeviceTest.cpp M tests/Transceiver52M/Makefile.am M tests/testsuite.at 5 files changed, 103 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/45/12245/1 diff --git a/.gitignore b/.gitignore index 92fc723..68ca4b1 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ tests/CommonLibs/VectorTest tests/CommonLibs/PRBSTest tests/Transceiver52M/ConvolveTest +tests/Transceiver52M/LMSDeviceTest # automake/autoconf *.in diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 5e21894..a727d30 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -22,6 +22,7 @@ #include "Threads.h" #include "LMSDevice.h" +#include #include #include @@ -95,6 +96,35 @@ << " Step=" << range->step; } +/*! Find the device string that matches all filters from \a args. + * \param[in] info_list device addresses found by LMS_GetDeviceList() + * \param[in] count length of info_list + * \param[in] args dev-args value from osmo-trx.cfg, containing comma separated key=value pairs + * \return index of first matching item or -1 (no match) */ +int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args) +{ + unsigned int i, j; + vector filters; + + boost::split(filters, args, boost::is_any_of(",")); + + /* iterate over device addresses */ + for (i=0; i < count; i++) { + /* check if all filters match */ + bool match = true; + for (j=0; j < filters.size(); j++) { + if (!strstr(info_list[i], filters[j].c_str())) { + match = false; + break; + } + } + + if (match) + return i; + } + return -1; +} + int LMSDevice::open(const std::string &args, int ref, bool swap_channels) { //lms_info_str_t dev_str; @@ -103,7 +133,7 @@ float_type sr_host, sr_rf, lpfbw_rx, lpfbw_tx; uint16_t dac_val; unsigned int i, n; - int rc; + int rc, dev_id; LOGC(DDEV, INFO) << "Opening LMS device.."; @@ -123,7 +153,17 @@ for (i = 0; i < n; i++) LOGC(DDEV, INFO) << "Device [" << i << "]: " << info_list[i]; - rc = LMS_Open(&m_lms_dev, info_list[0], NULL); + dev_id = info_list_find(info_list, n, args); + + if (dev_id != -1) + LOGC(DDEV, INFO) << "Using device: " << info_list[dev_id]; + else { + LOGC(DDEV, ERROR) << "No LMS device found with address '" << args << "'"; + delete [] info_list; + return -1; + } + + rc = LMS_Open(&m_lms_dev, info_list[dev_id], NULL); if (rc != 0) { LOGC(DDEV, ERROR) << "LMS_GetDeviceList() failed)"; delete [] info_list; diff --git a/tests/Transceiver52M/LMSDeviceTest.cpp b/tests/Transceiver52M/LMSDeviceTest.cpp new file mode 100644 index 0000000..bca12df --- /dev/null +++ b/tests/Transceiver52M/LMSDeviceTest.cpp @@ -0,0 +1,45 @@ +#include +#include +#include +#include +#include + +#include + +extern "C" +{ + size_t osmo_strlcpy(char *dst, const char *src, size_t siz); +} + +int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args); + +using namespace std; + +int main(void) +{ + unsigned int count; + lms_info_str_t* info_list; + std::string args; + + /* two fake entries for info_list */ + count = 2; + info_list = new lms_info_str_t[count]; + osmo_strlcpy(info_list[0], "LimeSDR Mini, addr=24607:1337, serial=FAKESERIAL0001", sizeof(lms_info_str_t)); + osmo_strlcpy(info_list[1], "LimeSDR Mini, addr=24607:1338, serial=FAKESERIAL0002", sizeof(lms_info_str_t)); + + /* find second entry by args filter */ + args = "serial=FAKESERIAL0002,LimeSDR Mini"; + assert(info_list_find(info_list, count, args) == 1); + + /* empty args -> first entry */ + args = ""; + assert(info_list_find(info_list, count, args) == 0); + + /* not matching args -> -1 */ + args = "serial=NOTMATCHING"; + assert(info_list_find(info_list, count, args) == -1); + + /* clean up */ + delete [] info_list; + return 0; +} diff --git a/tests/Transceiver52M/Makefile.am b/tests/Transceiver52M/Makefile.am index a9d3992..2668dc4 100644 --- a/tests/Transceiver52M/Makefile.am +++ b/tests/Transceiver52M/Makefile.am @@ -16,3 +16,12 @@ if HAVE_SSE4_1 ConvolveTest_CFLAGS += $(SIMD_FLAGS) endif + +if DEVICE_LMS +noinst_PROGRAMS += LMSDeviceTest +LMSDeviceTest_SOURCES = LMSDeviceTest.cpp +LMSDeviceTest_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LMS_LIBS) +LMSDeviceTest_LDADD = \ + $(top_builddir)/Transceiver52M/device/lms/.libs/LMSDevice.o \ + $(COMMON_LA) +endif diff --git a/tests/testsuite.at b/tests/testsuite.at index 1968481..d8cdd70 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -51,3 +51,9 @@ cat $abs_srcdir/Transceiver52M/ConvolveTest.ok > expout AT_CHECK([$abs_top_builddir/tests/Transceiver52M/ConvolveTest], [], [expout], []) AT_CLEANUP + +AT_SETUP([LMSDeviceTest]) +AT_KEYWORDS([LMSDeviceTest]) +AT_SKIP_IF([! test -e $abs_top_builddir/tests/Transceiver52M/LMSDeviceTest]) +AT_CHECK([$abs_top_builddir/tests/Transceiver52M/LMSDeviceTest], [], [], []) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/12245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 Gerrit-Change-Number: 12245 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 15:48:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 11 Dec 2018 15:48:39 +0000 Subject: Change in osmo-trx[master]: LMSDevice: make use of dev-args in osmo-trx.cfg In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12245 ) Change subject: LMSDevice: make use of dev-args in osmo-trx.cfg ...................................................................... LMSDevice: make use of dev-args in osmo-trx.cfg Allow selecting a specific LimeSDR device by setting dev-args in the config file. Split up the given dev-args address by comma and select the device where all substrings can be found. I could not test this with real hardware, but I have added a test case to make sure this works as expected. Related: OS#3654 Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 --- M .gitignore M Transceiver52M/device/lms/LMSDevice.cpp A tests/Transceiver52M/LMSDeviceTest.cpp M tests/Transceiver52M/Makefile.am M tests/testsuite.at 5 files changed, 101 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/45/12245/2 -- To view, visit https://gerrit.osmocom.org/12245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 Gerrit-Change-Number: 12245 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 16:01:32 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 16:01:32 +0000 Subject: Change in osmo-trx[master]: tests: rename convolve_test -> ConvolveTest In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12244 ) Change subject: tests: rename convolve_test -> ConvolveTest ...................................................................... Patch Set 1: Code-Review-1 hmm, the others are *.cpp files and this is a *.c file, so the naming schemes sort of match before this patch? -- To view, visit https://gerrit.osmocom.org/12244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ca533ca8c5e19b6dbe7b0aba672ee14cf5c3bd1 Gerrit-Change-Number: 12244 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 11 Dec 2018 16:01:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 16:20:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 16:20:33 +0000 Subject: Change in osmo-pcu[master]: cosmetic: use const pointer for bts_data Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12246 Change subject: cosmetic: use const pointer for bts_data ...................................................................... cosmetic: use const pointer for bts_data It's used several time for logging so let's call it once to make code easier to follow. Change-Id: Icfd9e5603a5d8701f487f17e9c0335d458e9e80b --- M src/tbf_dl.cpp M src/tbf_ul.cpp 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/12246/1 diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index dd24963..01331a6 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -1357,9 +1357,10 @@ void gprs_rlcmac_dl_tbf::set_window_size() { - uint16_t ws = egprs_window_size(bts->bts_data(), dl_slots()); + const struct gprs_rlcmac_bts *b = bts->bts_data(); + uint16_t ws = egprs_window_size(b, dl_slots()); LOGPTBFDL(this, LOGL_INFO, "setting EGPRS DL window size to %u, base(%u) slots(%u) ws_pdch(%u)\n", - ws, bts->bts_data()->ws_base, pcu_bitcount(dl_slots()), bts->bts_data()->ws_pdch); + ws, b->ws_base, pcu_bitcount(dl_slots()), b->ws_pdch); m_window.set_ws(ws); } diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index 02f4ddb..f877484 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -593,8 +593,9 @@ void gprs_rlcmac_ul_tbf::set_window_size() { - uint16_t ws = egprs_window_size(bts->bts_data(), ul_slots()); + const struct gprs_rlcmac_bts *b = bts->bts_data(); + uint16_t ws = egprs_window_size(b, ul_slots()); LOGPTBFUL(this, LOGL_INFO, "setting EGPRS UL window size to %u, base(%u) slots(%u) ws_pdch(%u)\n", - ws, bts->bts_data()->ws_base, pcu_bitcount(ul_slots()), bts->bts_data()->ws_pdch); + ws, b->ws_base, pcu_bitcount(ul_slots()), b->ws_pdch); m_window.set_ws(ws); } -- To view, visit https://gerrit.osmocom.org/12246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icfd9e5603a5d8701f487f17e9c0335d458e9e80b Gerrit-Change-Number: 12246 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 16:20:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 11 Dec 2018 16:20:33 +0000 Subject: Change in osmo-pcu[master]: cosmetic: move bit counter outside of egprs_window_size() Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12247 Change subject: cosmetic: move bit counter outside of egprs_window_size() ...................................................................... cosmetic: move bit counter outside of egprs_window_size() As a preparation to moving window size calculation to C code, let's move bit counter call outside. It makes more sense that way as well because egprs_window_size() now deals with actual number of allocated slots instead of raw bitmap. Change-Id: I5b59919e7b4c9fd2c91958659bafe470ed8fcff7 --- M src/tbf.cpp M src/tbf_dl.cpp M src/tbf_ul.cpp 3 files changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/47/12247/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 6792d08..832aa60 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -500,8 +500,6 @@ uint16_t egprs_window_size(const struct gprs_rlcmac_bts *bts_data, uint8_t slots) { - uint8_t num_pdch = pcu_bitcount(slots); - return OSMO_MIN((num_pdch != 1) ? (128 * num_pdch) : 192, OSMO_MAX(64, (bts_data->ws_base + num_pdch * bts_data->ws_pdch) / 32 * 32)); } diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 01331a6..a3fef2c 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -1358,7 +1358,7 @@ void gprs_rlcmac_dl_tbf::set_window_size() { const struct gprs_rlcmac_bts *b = bts->bts_data(); - uint16_t ws = egprs_window_size(b, dl_slots()); + uint16_t ws = egprs_window_size(b, pcu_bitcount(dl_slots())); LOGPTBFDL(this, LOGL_INFO, "setting EGPRS DL window size to %u, base(%u) slots(%u) ws_pdch(%u)\n", ws, b->ws_base, pcu_bitcount(dl_slots()), b->ws_pdch); m_window.set_ws(ws); diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index f877484..9233f2c 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -594,7 +594,7 @@ void gprs_rlcmac_ul_tbf::set_window_size() { const struct gprs_rlcmac_bts *b = bts->bts_data(); - uint16_t ws = egprs_window_size(b, ul_slots()); + uint16_t ws = egprs_window_size(b, pcu_bitcount(ul_slots())); LOGPTBFUL(this, LOGL_INFO, "setting EGPRS UL window size to %u, base(%u) slots(%u) ws_pdch(%u)\n", ws, b->ws_base, pcu_bitcount(ul_slots()), b->ws_pdch); m_window.set_ws(ws); -- To view, visit https://gerrit.osmocom.org/12247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5b59919e7b4c9fd2c91958659bafe470ed8fcff7 Gerrit-Change-Number: 12247 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 16:49:39 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 11 Dec 2018 16:49:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: Add SGs testcases In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#16) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: Add SGs testcases ...................................................................... WIP: MSC_Tests: Add SGs testcases This extens MSC_Tests.ttcn with an initial set of SGs interface test cases for RESET, LU, DETACH, PAGING, SMS and CSFB procedures In particular the following testcases are added: - TC_sgsap_reset: isolated reset procedure test - TC_sgsap_lu: isolated location update with TMSI realloc - TC_sgsap_lu_imsi_reject: location update, reject case - TC_sgsap_lu_and_nothing: location update with failed TMSI realloc - TC_sgsap_expl_imsi_det_eps: detach from EPS serveces - TC_sgsap_expl_imsi_det_noneps: detach from non-EPS services - TC_sgsap_paging_rej: isolated paging, reject case - TC_sgsap_paging_subscr_rej: isolated paging, subscr rejects call - TC_sgsap_paging_ue_unr: isolated paging, ue is unreachable - TC_sgsap_paging_and_nothing: page, but don't respond - TC_sgsap_mt_sms: mobile terminated SMS through SGs Interface - TC_sgsap_mo_sms: mobile originated SMS through SGs Interface - TC_sgsap_mt_sms_and_nothing: trigger SMS, but don't respond to paging - TC_sgsap_mt_sms_and_reject: trigger SMS, but reject paging - TC_sgsap_unexp_ud: Send unexpected unitdata (SGs Association: NULL) - TC_sgsap_unsol_ud: Send unsolicited unitdata (subscriber not in VLR) - TC_sgsap_lu_and_mt_call: Initiate MT call via SGs, then do CSFB Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Depends: docker-playground Icf2c36d253ce13a61fb98b4afd1739e1c321bb4b Related: OS#3645 --- M library/SGsAP_Emulation.ttcn M library/SGsAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/expected-results.xml M msc/gen_links.sh M msc/regen_makefile.sh 7 files changed, 972 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11488/16 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 16 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 16:50:33 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 11 Dec 2018 16:50:33 +0000 Subject: Change in docker-playground[master]: osmo-msc: set bind ip for SGs-interface Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12248 Change subject: osmo-msc: set bind ip for SGs-interface ...................................................................... osmo-msc: set bind ip for SGs-interface By default the SGs interface binds on 127.0.0.1 but in order to make it reachable for the ttcn3 testsuite, we need to bind it to 0.0.0.0. Change-Id: Icf2c36d253ce13a61fb98b4afd1739e1c321bb4b Related: OS#3615 Depends: osmo-msc I73359925fc1ca72b33a1466e6ac41307f2f0b11d --- M ttcn3-msc-test/osmo-msc.cfg 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/48/12248/1 diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg index f0180d8..39a0354 100644 --- a/ttcn3-msc-test/osmo-msc.cfg +++ b/ttcn3-msc-test/osmo-msc.cfg @@ -85,3 +85,5 @@ hlr remote-ip 172.18.1.103 remote-port 4222 +sgs + local-ip 0.0.0.0 -- To view, visit https://gerrit.osmocom.org/12248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icf2c36d253ce13a61fb98b4afd1739e1c321bb4b Gerrit-Change-Number: 12248 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:16:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:16:03 +0000 Subject: Change in osmo-bsc[master]: paging: fix whitespace Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12249 Change subject: paging: fix whitespace ...................................................................... paging: fix whitespace Change-Id: I81c4a9f0dbd708df27a485ef764c9524a36d548a --- M src/osmo-bsc/paging.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/49/12249/1 diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 246114f..03f940c 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -267,7 +267,7 @@ return 1; } - return 0; + return 0; } /*! Call-back once T3113 (paging timeout) expires for given paging_request */ -- To view, visit https://gerrit.osmocom.org/12249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I81c4a9f0dbd708df27a485ef764c9524a36d548a Gerrit-Change-Number: 12249 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:16:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:16:04 +0000 Subject: Change in osmo-bsc[master]: VTY: Allow logging filter imsi statements for IMSIs we haven't seen yet Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12250 Change subject: VTY: Allow logging filter imsi statements for IMSIs we haven't seen yet ...................................................................... VTY: Allow logging filter imsi statements for IMSIs we haven't seen yet Limiting the logging filter only to IMSIs that we have as local subscriber doesn't make sense for osmo-bsc since all subscribers are initially unknown. Create a bsc subscriber and enable logging there. This struct will then be used and liked to the gsm_subscr_conn when receiving the Location update. Related: OS#3641 Change-Id: Ia20bdc15565417020205d7b2b06b04a01c03106c --- M src/osmo-bsc/osmo_bsc_vty.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/12250/1 diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index a32f580..6e3d1c1 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -886,15 +886,21 @@ struct log_target *tgt = osmo_log_vty2tgt(vty); const char *imsi = argv[0]; - bsc_subscr = bsc_subscr_find_by_imsi(bsc_gsmnet->bsc_subscribers, imsi); + if (!tgt) + return CMD_WARNING; + + bsc_subscr = bsc_subscr_find_or_create_by_imsi(bsc_gsmnet->bsc_subscribers, imsi); if (!bsc_subscr) { - vty_out(vty, "%%no subscriber with IMSI(%s)%s", + vty_out(vty, "%%failed to enable logging for subscriber with IMSI(%s)%s", imsi, VTY_NEWLINE); return CMD_WARNING; } log_set_filter_bsc_subscr(tgt, bsc_subscr); + /* log_set_filter has grabbed its own reference */ + bsc_subscr_put(bsc_subscr); + return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/12250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia20bdc15565417020205d7b2b06b04a01c03106c Gerrit-Change-Number: 12250 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:16:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:16:06 +0000 Subject: Change in osmo-bsc[master]: paging: Properly enclose logging imsi filter scope Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12251 Change subject: paging: Properly enclose logging imsi filter scope ...................................................................... paging: Properly enclose logging imsi filter scope Otherwise all logging is kept enabled after passing through those code paths. Change-Id: I06a977d97e6ffea02ec7402d48410c0e7cc6c155 --- M src/osmo-bsc/paging.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/51/12251/1 diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 03f940c..2c9d5cd 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -285,6 +285,8 @@ /* destroy it now. Do not access req afterwards */ paging_remove_request(&req->bts->paging, req); + + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); } #define GSM_FRAME_DURATION_us 4615 @@ -440,6 +442,7 @@ continue; _paging_request_stop(bts, bsub, NULL, NULL); } + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); } -- To view, visit https://gerrit.osmocom.org/12251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I06a977d97e6ffea02ec7402d48410c0e7cc6c155 Gerrit-Change-Number: 12251 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:16:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:16:06 +0000 Subject: Change in osmo-bsc[master]: bsc_main: filter_fn: Compare imsi values instead of subscr pointers Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12252 Change subject: bsc_main: filter_fn: Compare imsi values instead of subscr pointers ...................................................................... bsc_main: filter_fn: Compare imsi values instead of subscr pointers Since we actually want to match by IMSI as specified by filter in VTY. It will allow to match based on other information later. Change-Id: Ia73fd2f38e42396db8f6d2cc6b2c163aa8f67f3f --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/52/12252/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 67fccd3..08bb40d 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -767,10 +768,12 @@ static int filter_fn(const struct log_context *ctx, struct log_target *tar) { - const struct bsc_subscr *bsub = ctx->ctx[LOG_CTX_BSC_SUBSCR]; + const struct bsc_subscr *bsub_ctx = ctx->ctx[LOG_CTX_BSC_SUBSCR]; + const struct bsc_subscr *bsub_filter = tar->filter_data[LOG_FLT_BSC_SUBSCR]; if ((tar->filter_map & (1 << LOG_FLT_BSC_SUBSCR)) != 0 - && bsub && bsub == tar->filter_data[LOG_FLT_BSC_SUBSCR]) + && bsub_ctx && bsub_filter + && strncmp(bsub_ctx->imsi, bsub_filter->imsi, sizeof(bsub_ctx->imsi)) == 0) return 1; return 0; -- To view, visit https://gerrit.osmocom.org/12252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia73fd2f38e42396db8f6d2cc6b2c163aa8f67f3f Gerrit-Change-Number: 12252 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:16:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:16:06 +0000 Subject: Change in osmo-bsc[master]: bsc: Set subscr log context during complete_layer3 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12253 Change subject: bsc: Set subscr log context during complete_layer3 ...................................................................... bsc: Set subscr log context during complete_layer3 Change-Id: I162a474f711248a3f64a0438967fa6f8a9a3e686 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/12253/1 diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index a3e8b30..c3c5000 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -433,12 +433,14 @@ enum bsc_con ret; struct gsm0808_speech_codec_list scl; + log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub); + /* Check the filter */ rc = bsc_filter_initial(msc->network->bsc_data, msc, conn, msg, &imsi, &con_type, &lu_cause); if (rc < 0) { bsc_maybe_lu_reject(conn, con_type, lu_cause); - return false; + goto early_fail; } /* allocate resource for a new connection */ @@ -450,8 +452,7 @@ bsc_send_ussd_no_srv(conn, msg, msc->ussd_msc_lost_txt); else if (ret == BSC_CON_REJECT_RF_GRACE) bsc_send_ussd_no_srv(conn, msg, msc->ussd_grace_txt); - - return false; + goto early_fail; } /* TODO: also extract TMSI. We get an IMSI only when an initial L3 Complete comes in that @@ -460,15 +461,18 @@ if (imsi) { conn->filter_state.imsi = talloc_steal(conn, imsi); if (conn->bsub) { + log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub); /* Already a subscriber on L3 Complete? Should never happen... */ if (conn->bsub->imsi[0] && strcmp(conn->bsub->imsi, imsi)) LOGP(DMSC, LOGL_ERROR, "Subscriber's IMSI changes from %s to %s\n", conn->bsub->imsi, imsi); bsc_subscr_set_imsi(conn->bsub, imsi); - } else + } else { conn->bsub = bsc_subscr_find_or_create_by_imsi(msc->network->bsc_subscribers, imsi); + log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub); + } gscon_update_id(conn); } conn->filter_state.con_type = con_type; @@ -493,14 +497,16 @@ } else resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); - if (!resp) { + if (resp) + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, resp); + else LOGP(DMSC, LOGL_DEBUG, "Failed to create layer3 message.\n"); - return false; - } - osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, resp); - - return true; + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); + return !!resp; +early_fail: + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); + return false; } /* -- To view, visit https://gerrit.osmocom.org/12253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I162a474f711248a3f64a0438967fa6f8a9a3e686 Gerrit-Change-Number: 12253 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:16:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:16:06 +0000 Subject: Change in osmo-bsc[master]: bsc: rsl: Set subscr log context during meas report Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12254 Change subject: bsc: rsl: Set subscr log context during meas report ...................................................................... bsc: rsl: Set subscr log context during meas report Change-Id: Idc6af592e870d15491797ae6fcaffaac2b411766 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/12254/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 954fb0f..8ffb07e 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -917,11 +917,14 @@ { int i; const char *name = ""; + struct bsc_subscr *bsub = NULL; if (lchan && lchan->conn) { - if (lchan->conn->bsub) - name = bsc_subscr_name(lchan->conn->bsub); - else + bsub = lchan->conn->bsub; + if (bsub) { + log_set_context(LOG_CTX_BSC_SUBSCR, bsub); + name = bsc_subscr_name(bsub); + } else name = lchan->name; } @@ -960,6 +963,9 @@ DEBUGP(DMEAS, "IDX=%u ARFCN=%u BSIC=%u => %d dBm\n", mrc->neigh_idx, mrc->arfcn, mrc->bsic, rxlev2dbm(mrc->rxlev)); } + + if (bsub) + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); } static struct gsm_meas_rep *lchan_next_meas_rep(struct gsm_lchan *lchan) -- To view, visit https://gerrit.osmocom.org/12254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idc6af592e870d15491797ae6fcaffaac2b411766 Gerrit-Change-Number: 12254 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:16:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:16:07 +0000 Subject: Change in osmo-bsc[master]: bsc: dtap: Set subscr log context Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12255 Change subject: bsc: dtap: Set subscr log context ...................................................................... bsc: dtap: Set subscr log context Change-Id: I362a7d10f5ca9a95b594f7caafd7ed5b10fd059a --- M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/osmo_bsc_bssap.c 2 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/12255/1 diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index c3c5000..2c6a689 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -602,8 +602,10 @@ { int lu_cause; + log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub); + if (!msc_connected(conn)) - return; + goto done; LOGP(DMSC, LOGL_INFO, "Tx MSC DTAP LINK_ID=0x%02x\n", link_id); @@ -612,7 +614,7 @@ * to handle it. If it was handled we will return. */ if (handle_cc_setup(conn, msg) >= 1) - return; + goto done; /* Check the filter */ if (bsc_filter_data(conn, msg, &lu_cause) < 0) { @@ -620,7 +622,7 @@ conn->filter_state.con_type, lu_cause); bsc_clear_request(conn, 0); - return; + goto done; } bsc_scan_bts_msg(conn, msg); @@ -628,6 +630,9 @@ /* Store link_id in msg->cb */ OBSC_LINKID_CB(msg) = link_id; osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_MO_DTAP, msg); +done: + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); + return; } /*! BSC->MSC: RR conn has been cleared. */ diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 39425f6..b5ff152 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -980,6 +980,8 @@ int bsc_handle_dt(struct gsm_subscriber_connection *conn, struct msgb *msg, unsigned int len) { + log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub); + if (len < sizeof(struct bssmap_header)) { LOGP(DMSC, LOGL_ERROR, "The header is too short.\n"); } @@ -997,6 +999,7 @@ gsm0808_bssap_name(msg->l3h[0])); } + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); return -1; } -- To view, visit https://gerrit.osmocom.org/12255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I362a7d10f5ca9a95b594f7caafd7ed5b10fd059a Gerrit-Change-Number: 12255 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:16:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:16:08 +0000 Subject: Change in osmo-bsc[master]: bsc: bssap: Set subscr log context during paging Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12256 Change subject: bsc: bssap: Set subscr log context during paging ...................................................................... bsc: bssap: Set subscr log context during paging Change-Id: I3998a35ff6ea29440882514bbb30cafed66f03fa --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/56/12256/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index b5ff152..b5a1503 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -96,11 +96,15 @@ struct bsc_subscr *subscr; int ret; + subscr = bsc_subscr_find_or_create_by_imsi(msc->network->bsc_subscribers, + mi_string); + + if(subscr) + log_set_context(LOG_CTX_BSC_SUBSCR, subscr); + LOGP(DMSC, LOGL_INFO, "Paging request from MSC BTS: %d IMSI: '%s' TMSI: '0x%x/%u' LAC: 0x%x\n", bts->nr, mi_string, tmsi, tmsi, lac); - subscr = bsc_subscr_find_or_create_by_imsi(msc->network->bsc_subscribers, - mi_string); if (!subscr) { LOGP(DMSC, LOGL_ERROR, "Paging request failed: Could not allocate subscriber for %s\n", mi_string); return; @@ -116,6 +120,8 @@ /* the paging code has grabbed its own references */ bsc_subscr_put(subscr); + + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); } static void -- To view, visit https://gerrit.osmocom.org/12256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3998a35ff6ea29440882514bbb30cafed66f03fa Gerrit-Change-Number: 12256 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:19:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:19:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Remove -Wall for autogenerated code In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12241 ) Change subject: Remove -Wall for autogenerated code ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7ef141f7f3370a1bf909845ce8a4eb650b33fa81 Gerrit-Change-Number: 12241 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 17:19:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:20:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:20:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: remove commented variants In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12238 ) Change subject: MGCP: remove commented variants ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f11a93634fc50243a7210edcd501bd4b90d6dcd Gerrit-Change-Number: 12238 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 11 Dec 2018 17:20:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:20:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:20:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: fix pattern warning In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12237 ) Change subject: MGCP: fix pattern warning ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/12237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99948e4b82b5b4bd5b8f7c1a4c60a97fcab3c0eb Gerrit-Change-Number: 12237 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 11 Dec 2018 17:20:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:20:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:20:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: fix pattern warning In-Reply-To: References: Message-ID: Pau Espin Pedrol has removed a vote on this change. Change subject: MGCP: fix pattern warning ...................................................................... Removed Code-Review-1 by Pau Espin Pedrol -- To view, visit https://gerrit.osmocom.org/12237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I99948e4b82b5b4bd5b8f7c1a4c60a97fcab3c0eb Gerrit-Change-Number: 12237 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:20:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:20:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: fix pattern warning In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12237 ) Change subject: MGCP: fix pattern warning ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99948e4b82b5b4bd5b8f7c1a4c60a97fcab3c0eb Gerrit-Change-Number: 12237 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 11 Dec 2018 17:20:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:23:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:23:17 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12243/1/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/1/src/gprs/sgsn_vty.c at 351 PS1, Line 351: { How to go back to default? "no ipa-name" ? or "ipa-name default"? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 17:23:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:26:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 17:26:11 +0000 Subject: Change in osmo-msc[master]: fix regression: mgcp FSM: accept Assignment Complete early Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12257 Change subject: fix regression: mgcp FSM: accept Assignment Complete early ...................................................................... fix regression: mgcp FSM: accept Assignment Complete early In recent commit [1] I broke the flow of Assignment Complete arriving before in ST_MDCX_RAN state, because I changed a simple event omission into a failure. Revert that bit and explain. There was a previous comment that should have made me understand, now trying with a bit of rewording in the hope that it might become more clear. [1] commit 212c0c9bdaf1166e3bcbab85f3ab31dc17162f5b "move ASS-COMPL MGCP handling out of a_iface_bssap.c" Change-Id I8137215c443239bddf3e69b5715839a365b73b6c Change-Id: Ic0abdc51b82b0e924b2561582310a83528fd1880 --- M src/libmsc/msc_mgcp.c 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/12257/1 diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 7aeab4a..cce1175 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -1079,11 +1079,6 @@ fi = mgcp_ctx->fsm; - if (fi->state != ST_MDCX_RAN) { - LOGPFSML(fi, LOGL_ERROR, "Assignment Complete not allowed in this state\n"); - return -ENOTSUP; - } - /* use address / port supplied with the AoIP transport address element */ if (aoip_transport_addr->ss_family != AF_INET) { LOGPCONN(conn, LOGL_ERROR, "Assignment Complete: Unsupported addressing scheme (only IPV4 supported)\n"); @@ -1109,6 +1104,13 @@ LOGPCONN(conn, LOGL_DEBUG, "Assignment Complete: rtp %s:%u\n", addr, port); + /* If the Assignment Complete arrives early, before reaching ST_MDCX_RAN, no event is needed, because we're + * still waiting for other events first. We will later on detect that the Assignment has already concluded. */ + if (fi->state != ST_MDCX_RAN) { + LOGPCONN(conn, LOGL_DEBUG, "Not yet in ST_MDCX_RAN, no need to dispatch EV_ASSIGN event\n"); + return 0; + } + return osmo_fsm_inst_dispatch(fi, EV_ASSIGN, mgcp_ctx); } -- To view, visit https://gerrit.osmocom.org/12257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0abdc51b82b0e924b2561582310a83528fd1880 Gerrit-Change-Number: 12257 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:37:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:37:05 +0000 Subject: Change in osmo-trx[master]: LMSDevice: make use of dev-args in osmo-trx.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12245 ) Change subject: LMSDevice: make use of dev-args in osmo-trx.cfg ...................................................................... Patch Set 2: Code-Review-1 (6 comments) https://gerrit.osmocom.org/#/c/12245/2/Transceiver52M/device/lms/LMSDevice.cpp File Transceiver52M/device/lms/LMSDevice.cpp: https://gerrit.osmocom.org/#/c/12245/2/Transceiver52M/device/lms/LMSDevice.cpp at 25 PS2, Line 25: #include I'm actually in process of getting rid of boost in osmo-trx code, since we only use it in URSP1 (and can be easily dropped completelly). Can you use something else? See https://gerrit.osmocom.org/#/c/osmo-trx/+/12088/ and grep for "boost". https://gerrit.osmocom.org/#/c/12245/2/Transceiver52M/device/lms/LMSDevice.cpp at 103 PS2, Line 103: * \return index of first matching item or -1 (no match) */ s/item/device, I was first confused with item meaning the first key or value. "Index of first matching item in the list or -1 (no match". https://gerrit.osmocom.org/#/c/12245/2/Transceiver52M/device/lms/LMSDevice.cpp at 109 PS2, Line 109: boost::split(filters, args, boost::is_any_of(",")); As said, please use something else. I think there's some code you can reuse in ./Transceiver52M/osmo-trx.cpp, see comma_delimited_to_vector() in there. Feel free to improve it by passing a new param "separator" and then you can use it to first break by "," and later by "=" if required. https://gerrit.osmocom.org/#/c/12245/2/Transceiver52M/device/lms/LMSDevice.cpp at 159 PS2, Line 159: delete [] info_list; I know in other places is "delete []", but I think it's better having "delete[]" (as in https://en.cppreference.com/w/cpp/memory/new/operator_delete) https://gerrit.osmocom.org/#/c/12245/2/Transceiver52M/device/lms/LMSDevice.cpp at 163 PS2, Line 163: LOGC(DDEV, INFO) << "Using device: " << info_list[dev_id]; May be worth printing the index too. https://gerrit.osmocom.org/#/c/12245/2/tests/Transceiver52M/LMSDeviceTest.cpp File tests/Transceiver52M/LMSDeviceTest.cpp: https://gerrit.osmocom.org/#/c/12245/2/tests/Transceiver52M/LMSDeviceTest.cpp at 43 PS2, Line 43: delete [] info_list; same (delete[]) -- To view, visit https://gerrit.osmocom.org/12245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 Gerrit-Change-Number: 12245 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 17:37:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:38:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:38:30 +0000 Subject: Change in osmo-trx[master]: tests: rename convolve_test -> ConvolveTest In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12244 ) Change subject: tests: rename convolve_test -> ConvolveTest ...................................................................... Patch Set 1: Code-Review-1 > hmm, the others are *.cpp files and this is a *.c file, so the > naming schemes sort of match before this patch? Agree with Neels. I'd actually move all to foo_bar, but no need to spend time on that :) -- To view, visit https://gerrit.osmocom.org/12244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ca533ca8c5e19b6dbe7b0aba672ee14cf5c3bd1 Gerrit-Change-Number: 12244 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 17:38:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:43:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 17:43:52 +0000 Subject: Change in docker-playground[master]: osmo-msc: set bind ip for SGs-interface In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12248 ) Change subject: osmo-msc: set bind ip for SGs-interface ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf2c36d253ce13a61fb98b4afd1739e1c321bb4b Gerrit-Change-Number: 12248 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 17:43:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:56:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Dec 2018 17:56:11 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_bb.py: fix SETTA command handling Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12258 Change subject: trx_toolkit/ctrl_if_bb.py: fix SETTA command handling ...................................................................... trx_toolkit/ctrl_if_bb.py: fix SETTA command handling Since I8fd2a2ab7784b38bde5ebcfd0359b7e2cb53f5a7, SETTA command handling was broken, because the range limitation was removed together with argument parsing. Let's fix this. Change-Id: If582af3849359866de129504cc5b2dc6d64edbd5 --- M src/target/trx_toolkit/ctrl_if_bb.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/58/12258/1 diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index aaa12f1..785636b 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -134,7 +134,7 @@ log.debug("Recv SETTA cmd") # Save to the BurstForwarder instance - self.burst_fwd.ta = ta + self.burst_fwd.ta = int(request[1]) return 0 # Timing of Arrival simulation for Uplink -- To view, visit https://gerrit.osmocom.org/12258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If582af3849359866de129504cc5b2dc6d64edbd5 Gerrit-Change-Number: 12258 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:56:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Dec 2018 17:56:13 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12259 Change subject: trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments ...................................................................... trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments There is no need to (re)define the arguments of UDPLink's constructor. Let's use non-keyworded variable length argument list (*args). Change-Id: Ia312a5e15ce88d5f7e8d76c4ea8c93c59d91be5a --- M src/target/trx_toolkit/ctrl_if_bb.py M src/target/trx_toolkit/ctrl_if_bts.py 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/59/12259/1 diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index 785636b..fe7f3e8 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -34,8 +34,8 @@ tx_freq = None pm = None - def __init__(self, remote_addr, remote_port, bind_addr, bind_port): - CTRLInterface.__init__(self, remote_addr, remote_port, bind_addr, bind_port) + def __init__(self, *udp_link_args): + CTRLInterface.__init__(self, *udp_link_args) log.info("Init CTRL interface for BB (%s)" % self.desc_link()) def parse_cmd(self, request): diff --git a/src/target/trx_toolkit/ctrl_if_bts.py b/src/target/trx_toolkit/ctrl_if_bts.py index 2dde3e3..cb38b67 100644 --- a/src/target/trx_toolkit/ctrl_if_bts.py +++ b/src/target/trx_toolkit/ctrl_if_bts.py @@ -35,8 +35,8 @@ tx_freq = None pm = None - def __init__(self, remote_addr, remote_port, bind_addr, bind_port): - CTRLInterface.__init__(self, remote_addr, remote_port, bind_addr, bind_port) + def __init__(self, *udp_link_args): + CTRLInterface.__init__(self, *udp_link_args) log.info("Init CTRL interface for BTS (%s)" % self.desc_link()) def parse_cmd(self, request): -- To view, visit https://gerrit.osmocom.org/12259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia312a5e15ce88d5f7e8d76c4ea8c93c59d91be5a Gerrit-Change-Number: 12259 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:56:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Dec 2018 17:56:13 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if.py: read data from socket in handle_rx() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12260 Change subject: trx_toolkit/ctrl_if.py: read data from socket in handle_rx() ...................................................................... trx_toolkit/ctrl_if.py: read data from socket in handle_rx() It makes much more sense to read data from socket in handle_rx(), instead of expecting a buffer with received data from caller. Change-Id: I83479c60c54e36a2a7582714a6043090585957ae --- M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/fake_trx.py 2 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/12260/1 diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py index b533746..45bfa2b 100644 --- a/src/target/trx_toolkit/ctrl_if.py +++ b/src/target/trx_toolkit/ctrl_if.py @@ -27,7 +27,11 @@ from udp_link import UDPLink class CTRLInterface(UDPLink): - def handle_rx(self, data, remote): + def handle_rx(self): + # Read data from socket + data, remote = self.sock.recvfrom(128) + data = data.decode() + if not self.verify_req(data): log.error("Wrong data on CTRL interface") return diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index d73b566..95261df 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -112,13 +112,11 @@ # CTRL commands from BTS if self.bts_ctrl.sock in r_event: - data, addr = self.bts_ctrl.sock.recvfrom(128) - self.bts_ctrl.handle_rx(data.decode(), addr) + self.bts_ctrl.handle_rx() # CTRL commands from BB if self.bb_ctrl.sock in r_event: - data, addr = self.bb_ctrl.sock.recvfrom(128) - self.bb_ctrl.handle_rx(data.decode(), addr) + self.bb_ctrl.handle_rx() def shutdown(self): log.info("Shutting down...") -- To view, visit https://gerrit.osmocom.org/12260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I83479c60c54e36a2a7582714a6043090585957ae Gerrit-Change-Number: 12260 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:56:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Dec 2018 17:56:14 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: add message parsing methods Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12261 Change subject: trx_toolkit/data_if.py: add message parsing methods ...................................................................... trx_toolkit/data_if.py: add message parsing methods This change extends DATAInterface class with new methods: - recv_raw_data() - read raw data from socket; - recv_l12trx_msg() - read raw data and parse as L12TRX; - recv_trx2l1_msg() - read raw data and parse as TRX2L1; which would simplify the further usage of this class. Change-Id: I761c4e63864622d3882b8f9c80ea43b58f092cb1 --- M src/target/trx_toolkit/data_if.py 1 file changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/61/12261/1 diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index f4431a4..45114ed 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -26,6 +26,39 @@ from data_msg import * class DATAInterface(UDPLink): + def recv_raw_data(self): + data, _ = self.sock.recvfrom(512) + return data + + def recv_l12trx_msg(self): + # Read raw data from socket + data = self.recv_raw_data() + + # Attempt to parse as a L12TRX message + try: + msg = DATAMSG_L12TRX() + msg.parse_msg(bytearray(data)) + except: + log.error("Failed to parse a L12TRX message " + "from R:%s:%u" % (self.remote_addr, self.remote_port)) + return None + + return msg + + def recv_trx2l1_msg(self): + # Read raw data from socket + data = self.recv_raw_data() + + # Attempt to parse as a L12TRX message + try: + msg = DATAMSG_TRX2L1() + msg.parse_msg(bytearray(data)) + except: + log.error("Failed to parse a TRX2L1 message " + "from R:%s:%u" % (self.remote_addr, self.remote_port)) + return None + + return msg def send_msg(self, msg): # Validate a message -- To view, visit https://gerrit.osmocom.org/12261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I761c4e63864622d3882b8f9c80ea43b58f092cb1 Gerrit-Change-Number: 12261 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 17:56:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Dec 2018 17:56:14 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: add optional legacy message coding flag Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12262 Change subject: trx_toolkit/data_if.py: add optional legacy message coding flag ...................................................................... trx_toolkit/data_if.py: add optional legacy message coding flag Some transceivers (e.g. OsmoTRX) have inherited a rudiment from OpenBTS - two dummy bytes at the end of every TRX2L1 message. Despite they are absolutely useless, some L1 implementations, such as trxcon and OpenBTS, still do expect them when checking TRX2L1 message length. Let's add an optional (disabled by default) argument to send_msg(), that would enable adding those two dummy bytes. Change-Id: I6b9a8b611ea1e9badc4d9ddf13aa9e237028e39a --- M src/target/trx_toolkit/data_if.py 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/62/12262/1 diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index 45114ed..3366adc 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -60,7 +60,7 @@ return msg - def send_msg(self, msg): + def send_msg(self, msg, legacy = False): # Validate a message if not msg.validate(): raise ValueError("Message incomplete or incorrect") @@ -68,5 +68,10 @@ # Generate TRX message payload = msg.gen_msg() + # This is a rudiment from (legacy) OpenBTS transceiver, + # some L1 implementations still expect two dummy bytes. + if legacy: + payload += bytearray(2) + # Send message self.send(payload) -- To view, visit https://gerrit.osmocom.org/12262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6b9a8b611ea1e9badc4d9ddf13aa9e237028e39a Gerrit-Change-Number: 12262 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:13:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 18:13:19 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_bb.py: fix SETTA command handling In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12258 ) Change subject: trx_toolkit/ctrl_if_bb.py: fix SETTA command handling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If582af3849359866de129504cc5b2dc6d64edbd5 Gerrit-Change-Number: 12258 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 18:13:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:14:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 18:14:26 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12259 ) Change subject: trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12259/1/src/target/trx_toolkit/ctrl_if_bb.py File src/target/trx_toolkit/ctrl_if_bb.py: https://gerrit.osmocom.org/#/c/12259/1/src/target/trx_toolkit/ctrl_if_bb.py at 37 PS1, Line 37: def __init__(self, *udp_link_args): what about calling it superclass_args or ctrliface_args? -- To view, visit https://gerrit.osmocom.org/12259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia312a5e15ce88d5f7e8d76c4ea8c93c59d91be5a Gerrit-Change-Number: 12259 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 18:14:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:15:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 18:15:23 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if.py: read data from socket in handle_rx() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12260 ) Change subject: trx_toolkit/ctrl_if.py: read data from socket in handle_rx() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I83479c60c54e36a2a7582714a6043090585957ae Gerrit-Change-Number: 12260 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 18:15:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:15:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 18:15:27 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12259 ) Change subject: trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia312a5e15ce88d5f7e8d76c4ea8c93c59d91be5a Gerrit-Change-Number: 12259 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 18:15:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:17:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 18:17:11 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: add message parsing methods In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12261 ) Change subject: trx_toolkit/data_if.py: add message parsing methods ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I761c4e63864622d3882b8f9c80ea43b58f092cb1 Gerrit-Change-Number: 12261 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 18:17:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:18:09 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Dec 2018 18:18:09 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12259 ) Change subject: trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12259/1/src/target/trx_toolkit/ctrl_if_bb.py File src/target/trx_toolkit/ctrl_if_bb.py: https://gerrit.osmocom.org/#/c/12259/1/src/target/trx_toolkit/ctrl_if_bb.py at 37 PS1, Line 37: def __init__(self, *udp_link_args): > what about calling it superclass_args or ctrliface_args? CTRLInterface has no additional arguments, so actually we only deal with UDPLink arguments. This looks cleaner. -- To view, visit https://gerrit.osmocom.org/12259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia312a5e15ce88d5f7e8d76c4ea8c93c59d91be5a Gerrit-Change-Number: 12259 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Dec 2018 18:18:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:18:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 18:18:54 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: add optional legacy message coding flag In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12262 ) Change subject: trx_toolkit/data_if.py: add optional legacy message coding flag ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12262/1/src/target/trx_toolkit/data_if.py File src/target/trx_toolkit/data_if.py: https://gerrit.osmocom.org/#/c/12262/1/src/target/trx_toolkit/data_if.py at 69 PS1, Line 69: payload = msg.gen_msg() Wouldn't make more sense to pass this to gen_msg and already receive a payload generated as expected? If gen_msg() is reused by several implementations, maybe adding a msg.set_legacy() API. -- To view, visit https://gerrit.osmocom.org/12262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6b9a8b611ea1e9badc4d9ddf13aa9e237028e39a Gerrit-Change-Number: 12262 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 18:18:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:19:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 18:19:14 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12259 ) Change subject: trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia312a5e15ce88d5f7e8d76c4ea8c93c59d91be5a Gerrit-Change-Number: 12259 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 11 Dec 2018 18:19:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:20:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Dec 2018 18:20:12 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: add optional legacy message coding flag In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12262 ) Change subject: trx_toolkit/data_if.py: add optional legacy message coding flag ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12262/1/src/target/trx_toolkit/data_if.py File src/target/trx_toolkit/data_if.py: https://gerrit.osmocom.org/#/c/12262/1/src/target/trx_toolkit/data_if.py at 69 PS1, Line 69: payload = msg.gen_msg() > Wouldn't make more sense to pass this to gen_msg and already receive a payload generated as expected [?] Oh, great idea! Thanks! -- To view, visit https://gerrit.osmocom.org/12262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6b9a8b611ea1e9badc4d9ddf13aa9e237028e39a Gerrit-Change-Number: 12262 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 18:20:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:21:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Dec 2018 18:21:14 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_bb.py: fix SETTA command handling In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12258 ) Change subject: trx_toolkit/ctrl_if_bb.py: fix SETTA command handling ...................................................................... trx_toolkit/ctrl_if_bb.py: fix SETTA command handling Since I8fd2a2ab7784b38bde5ebcfd0359b7e2cb53f5a7, SETTA command handling was broken, because the range limitation was removed together with argument parsing. Let's fix this. Change-Id: If582af3849359866de129504cc5b2dc6d64edbd5 --- M src/target/trx_toolkit/ctrl_if_bb.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index aaa12f1..785636b 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -134,7 +134,7 @@ log.debug("Recv SETTA cmd") # Save to the BurstForwarder instance - self.burst_fwd.ta = ta + self.burst_fwd.ta = int(request[1]) return 0 # Timing of Arrival simulation for Uplink -- To view, visit https://gerrit.osmocom.org/12258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If582af3849359866de129504cc5b2dc6d64edbd5 Gerrit-Change-Number: 12258 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:21:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Dec 2018 18:21:14 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12259 ) Change subject: trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments ...................................................................... trx_toolkit/ctrl_if_*.py: transparently pass UDPLink arguments There is no need to (re)define the arguments of UDPLink's constructor. Let's use non-keyworded variable length argument list (*args). Change-Id: Ia312a5e15ce88d5f7e8d76c4ea8c93c59d91be5a --- M src/target/trx_toolkit/ctrl_if_bb.py M src/target/trx_toolkit/ctrl_if_bts.py 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index 785636b..fe7f3e8 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -34,8 +34,8 @@ tx_freq = None pm = None - def __init__(self, remote_addr, remote_port, bind_addr, bind_port): - CTRLInterface.__init__(self, remote_addr, remote_port, bind_addr, bind_port) + def __init__(self, *udp_link_args): + CTRLInterface.__init__(self, *udp_link_args) log.info("Init CTRL interface for BB (%s)" % self.desc_link()) def parse_cmd(self, request): diff --git a/src/target/trx_toolkit/ctrl_if_bts.py b/src/target/trx_toolkit/ctrl_if_bts.py index 2dde3e3..cb38b67 100644 --- a/src/target/trx_toolkit/ctrl_if_bts.py +++ b/src/target/trx_toolkit/ctrl_if_bts.py @@ -35,8 +35,8 @@ tx_freq = None pm = None - def __init__(self, remote_addr, remote_port, bind_addr, bind_port): - CTRLInterface.__init__(self, remote_addr, remote_port, bind_addr, bind_port) + def __init__(self, *udp_link_args): + CTRLInterface.__init__(self, *udp_link_args) log.info("Init CTRL interface for BTS (%s)" % self.desc_link()) def parse_cmd(self, request): -- To view, visit https://gerrit.osmocom.org/12259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia312a5e15ce88d5f7e8d76c4ea8c93c59d91be5a Gerrit-Change-Number: 12259 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:21:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Dec 2018 18:21:15 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if.py: read data from socket in handle_rx() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12260 ) Change subject: trx_toolkit/ctrl_if.py: read data from socket in handle_rx() ...................................................................... trx_toolkit/ctrl_if.py: read data from socket in handle_rx() It makes much more sense to read data from socket in handle_rx(), instead of expecting a buffer with received data from caller. Change-Id: I83479c60c54e36a2a7582714a6043090585957ae --- M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/fake_trx.py 2 files changed, 7 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py index b533746..45bfa2b 100644 --- a/src/target/trx_toolkit/ctrl_if.py +++ b/src/target/trx_toolkit/ctrl_if.py @@ -27,7 +27,11 @@ from udp_link import UDPLink class CTRLInterface(UDPLink): - def handle_rx(self, data, remote): + def handle_rx(self): + # Read data from socket + data, remote = self.sock.recvfrom(128) + data = data.decode() + if not self.verify_req(data): log.error("Wrong data on CTRL interface") return diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index d73b566..95261df 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -112,13 +112,11 @@ # CTRL commands from BTS if self.bts_ctrl.sock in r_event: - data, addr = self.bts_ctrl.sock.recvfrom(128) - self.bts_ctrl.handle_rx(data.decode(), addr) + self.bts_ctrl.handle_rx() # CTRL commands from BB if self.bb_ctrl.sock in r_event: - data, addr = self.bb_ctrl.sock.recvfrom(128) - self.bb_ctrl.handle_rx(data.decode(), addr) + self.bb_ctrl.handle_rx() def shutdown(self): log.info("Shutting down...") -- To view, visit https://gerrit.osmocom.org/12260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I83479c60c54e36a2a7582714a6043090585957ae Gerrit-Change-Number: 12260 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 18:21:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Dec 2018 18:21:15 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: add message parsing methods In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12261 ) Change subject: trx_toolkit/data_if.py: add message parsing methods ...................................................................... trx_toolkit/data_if.py: add message parsing methods This change extends DATAInterface class with new methods: - recv_raw_data() - read raw data from socket; - recv_l12trx_msg() - read raw data and parse as L12TRX; - recv_trx2l1_msg() - read raw data and parse as TRX2L1; which would simplify the further usage of this class. Change-Id: I761c4e63864622d3882b8f9c80ea43b58f092cb1 --- M src/target/trx_toolkit/data_if.py 1 file changed, 33 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index f4431a4..45114ed 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -26,6 +26,39 @@ from data_msg import * class DATAInterface(UDPLink): + def recv_raw_data(self): + data, _ = self.sock.recvfrom(512) + return data + + def recv_l12trx_msg(self): + # Read raw data from socket + data = self.recv_raw_data() + + # Attempt to parse as a L12TRX message + try: + msg = DATAMSG_L12TRX() + msg.parse_msg(bytearray(data)) + except: + log.error("Failed to parse a L12TRX message " + "from R:%s:%u" % (self.remote_addr, self.remote_port)) + return None + + return msg + + def recv_trx2l1_msg(self): + # Read raw data from socket + data = self.recv_raw_data() + + # Attempt to parse as a L12TRX message + try: + msg = DATAMSG_TRX2L1() + msg.parse_msg(bytearray(data)) + except: + log.error("Failed to parse a TRX2L1 message " + "from R:%s:%u" % (self.remote_addr, self.remote_port)) + return None + + return msg def send_msg(self, msg): # Validate a message -- To view, visit https://gerrit.osmocom.org/12261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I761c4e63864622d3882b8f9c80ea43b58f092cb1 Gerrit-Change-Number: 12261 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 19:36:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 19:36:12 +0000 Subject: Change in osmo-msc[master]: move ASS-COMPL MGCP handling out of a_iface_bssap.c In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12201 ) Change subject: move ASS-COMPL MGCP handling out of a_iface_bssap.c ...................................................................... Patch Set 3: (1 comment) This patch was reverted in 85cb2538f4cb4c6759824dae546564562ff3888e https://gerrit.osmocom.org/#/c/12201/3/include/osmocom/msc/msc_mgcp.h File include/osmocom/msc/msc_mgcp.h: https://gerrit.osmocom.org/#/c/12201/3/include/osmocom/msc/msc_mgcp.h at 27 PS3, Line 27: struct gsm0808_speech_codec; > Yes, seems like osmocom/msc/ran_conn.h and osmocom/gsm/protocol/gsm_08_08. [?] it's better to just declare opaque structs where you can, to not pull in all sorts of dependencies "by accident" -- To view, visit https://gerrit.osmocom.org/12201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8137215c443239bddf3e69b5715839a365b73b6c Gerrit-Change-Number: 12201 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 11 Dec 2018 19:36:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 19:36:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 19:36:38 +0000 Subject: Change in osmo-msc[master]: jenkins: always enable -Werror Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12263 Change subject: jenkins: always enable -Werror ...................................................................... jenkins: always enable -Werror Change-Id: If7cf70641114482b42b36489ec8562e5c069825b --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/63/12263/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index be8dadc..a2d0720 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -39,13 +39,10 @@ osmo-build-dep.sh osmo-mgw osmo-build-dep.sh osmo-hlr -enable_werror="" if [ "x$IU" = "x--enable-iu" ]; then osmo-build-dep.sh libasn1c #osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh osmo-build-dep.sh osmo-iuh -else - enable_werror="--enable-werror" fi # Additional configure options and depends @@ -65,12 +62,12 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize $enable_werror --enable-smpp $IU --enable-external-tests $CONFIG +./configure --enable-sanitize --enable-werror --enable-smpp $IU --enable-external-tests $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="$enable_werror --enable-smpp $IU --enable-external-tests $CONFIG" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-werror --enable-smpp $IU --enable-external-tests $CONFIG" \ $MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/12263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If7cf70641114482b42b36489ec8562e5c069825b Gerrit-Change-Number: 12263 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 19:38:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 11 Dec 2018 19:38:03 +0000 Subject: Change in osmo-msc[master]: fix regression: mgcp FSM: accept Assignment Complete early In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/12257 ) Change subject: fix regression: mgcp FSM: accept Assignment Complete early ...................................................................... Abandoned reverted original patch instead -- To view, visit https://gerrit.osmocom.org/12257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ic0abdc51b82b0e924b2561582310a83528fd1880 Gerrit-Change-Number: 12257 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 20:21:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Dec 2018 20:21:05 +0000 Subject: Change in docker-playground[master]: osmo-msc: set bind ip for SGs-interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12248 ) Change subject: osmo-msc: set bind ip for SGs-interface ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12248/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12248/1//COMMIT_MSG at 9 PS1, Line 9: By default the SGs interface binds on 127.0.0.1 I think that's not a good default and it should be changed in osmo-msc. -- To view, visit https://gerrit.osmocom.org/12248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf2c36d253ce13a61fb98b4afd1739e1c321bb4b Gerrit-Change-Number: 12248 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 11 Dec 2018 20:21:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 21:07:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Dec 2018 21:07:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: remove commented variants In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12238 ) Change subject: MGCP: remove commented variants ...................................................................... MGCP: remove commented variants It's unclear why those variants were commented - looks like artifact from initial development. Let's drop them to avoid confusion. Change-Id: I3f11a93634fc50243a7210edcd501bd4b90d6dcd --- M library/MGCP_Types.ttcn 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/MGCP_Types.ttcn b/library/MGCP_Types.ttcn index 6bb266e..8e11c7a 100644 --- a/library/MGCP_Types.ttcn +++ b/library/MGCP_Types.ttcn @@ -53,7 +53,6 @@ MgcpVersion ver } with { variant "SEPARATOR(' ', '[\t ]+')" - //variant "END('\r\n', '(\n)|(\r\n)')" variant "END('\r\n', '([\r\n])|(\r\n)')" } @@ -63,7 +62,6 @@ } with { variant "BEGIN('')" variant "SEPARATOR(': ', ':[\t ]+')" - //variant "END('\r\n', '(\n)|(\r\n)')" variant "END('\r\n', '([\r\n])|(\r\n)')" } @@ -91,7 +89,6 @@ charstring string optional } with { variant "SEPARATOR(' ', '[\t ]+')" - //variant "END('\r\n', '(\n)|(\r\n)')" variant "END('\r\n', '([\r\n])|(\r\n)')" } -- To view, visit https://gerrit.osmocom.org/12238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3f11a93634fc50243a7210edcd501bd4b90d6dcd Gerrit-Change-Number: 12238 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 21:09:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Dec 2018 21:09:33 +0000 Subject: Change in osmo-bsc[master]: bsc: Set subscr log context during complete_layer3 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12253 ) Change subject: bsc: Set subscr log context during complete_layer3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I162a474f711248a3f64a0438967fa6f8a9a3e686 Gerrit-Change-Number: 12253 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 11 Dec 2018 21:09:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 21:09:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Dec 2018 21:09:47 +0000 Subject: Change in osmo-bsc[master]: paging: fix whitespace In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12249 ) Change subject: paging: fix whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I81c4a9f0dbd708df27a485ef764c9524a36d548a Gerrit-Change-Number: 12249 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 11 Dec 2018 21:09:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 21:10:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Dec 2018 21:10:35 +0000 Subject: Change in osmo-bsc[master]: VTY: Allow logging filter imsi statements for IMSIs we haven't seen yet In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12250 ) Change subject: VTY: Allow logging filter imsi statements for IMSIs we haven't seen yet ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia20bdc15565417020205d7b2b06b04a01c03106c Gerrit-Change-Number: 12250 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 11 Dec 2018 21:10:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 21:10:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Dec 2018 21:10:59 +0000 Subject: Change in osmo-bsc[master]: paging: Properly enclose logging imsi filter scope In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12251 ) Change subject: paging: Properly enclose logging imsi filter scope ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I06a977d97e6ffea02ec7402d48410c0e7cc6c155 Gerrit-Change-Number: 12251 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 11 Dec 2018 21:10:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 21:11:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Dec 2018 21:11:35 +0000 Subject: Change in osmo-bsc[master]: bsc_main: filter_fn: Compare imsi values instead of subscr pointers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12252 ) Change subject: bsc_main: filter_fn: Compare imsi values instead of subscr pointers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia73fd2f38e42396db8f6d2cc6b2c163aa8f67f3f Gerrit-Change-Number: 12252 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 11 Dec 2018 21:11:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 21:11:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Dec 2018 21:11:53 +0000 Subject: Change in osmo-bsc[master]: bsc: rsl: Set subscr log context during meas report In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12254 ) Change subject: bsc: rsl: Set subscr log context during meas report ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc6af592e870d15491797ae6fcaffaac2b411766 Gerrit-Change-Number: 12254 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 11 Dec 2018 21:11:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 21:12:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Dec 2018 21:12:24 +0000 Subject: Change in osmo-bsc[master]: bsc: dtap: Set subscr log context In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12255 ) Change subject: bsc: dtap: Set subscr log context ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I362a7d10f5ca9a95b594f7caafd7ed5b10fd059a Gerrit-Change-Number: 12255 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 11 Dec 2018 21:12:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 21:13:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 11 Dec 2018 21:13:16 +0000 Subject: Change in osmo-bsc[master]: bsc: bssap: Set subscr log context during paging In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12256 ) Change subject: bsc: bssap: Set subscr log context during paging ...................................................................... Patch Set 1: (1 comment) cosmetic issue, otherwise fine with me. https://gerrit.osmocom.org/#/c/12256/1/src/osmo-bsc/osmo_bsc_bssap.c File src/osmo-bsc/osmo_bsc_bssap.c: https://gerrit.osmocom.org/#/c/12256/1/src/osmo-bsc/osmo_bsc_bssap.c at 102 PS1, Line 102: if(subscr) if only if() was a function and not a statement... -- To view, visit https://gerrit.osmocom.org/12256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3998a35ff6ea29440882514bbb30cafed66f03fa Gerrit-Change-Number: 12256 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 11 Dec 2018 21:13:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 21:47:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 11 Dec 2018 21:47:57 +0000 Subject: Change in osmocom-bb[master]: (WIP) trx_toolkit/fake_trx.py: refactor global class hierarchy Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12264 Change subject: (WIP) trx_toolkit/fake_trx.py: refactor global class hierarchy ...................................................................... (WIP) trx_toolkit/fake_trx.py: refactor global class hierarchy Change-Id: Ice44e2b22566b3652ef6d43896055963b13ab185 --- M src/target/trx_toolkit/burst_fwd.py A src/target/trx_toolkit/clck_router_trx.py D src/target/trx_toolkit/ctrl_if_bb.py D src/target/trx_toolkit/ctrl_if_bts.py A src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/fake_pm.py M src/target/trx_toolkit/fake_trx.py A src/target/trx_toolkit/transceiver.py 8 files changed, 614 insertions(+), 786 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/64/12264/1 diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 3cb6acd..3a83753 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # TRX Toolkit -# BTS <-> BB burst forwarding +# Burst forwarding between transceivers # # (C) 2017-2018 by Vadim Yanitskiy # @@ -23,321 +23,58 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import logging as log -import random from data_msg import * class BurstForwarder: - """ Performs burst forwarding and preprocessing between MS and BTS. + """ Performs burst forwarding between transceivers. - == Pass-filtering parameters + BurstForwarder dispatches bursts between the list of given + FakeTRX (Transceiver) instances depending on the following + parameters of each transceiver: - BurstForwarder may drop or pass an UL/DL burst depending - on the following parameters: - - - bts_freq / bb_freq - the current BTS / MS frequency - that was set using RXTUNE control command. By default, - both freq. values are set to None, so nothing is being - forwarded (i.e. bursts are getting dropped). - - FIXME: currently, we don't care about TXTUNE command - and transmit frequencies. It would be great to distinguish - between RX and TX frequencies for both BTS and MS. - - - ts_pass_list - the list of active (i.e. configured) - timeslot numbers for the MS. A timeslot can be activated - or deactivated using SETSLOT control command from the MS. - - FIXME: there is no such list for the BTS side. - - == Preprocessing and measurement simulation - - Since this is a virtual environment, we can simulate different - parameters of a virtual RF interface: - - - ToA (Timing of Arrival) - measured difference between expected - and actual time of burst arrival in units of 1/256 of GSM symbol - periods. A pair of both base and threshold values defines a range - of ToA value randomization: - - DL: from (toa256_dl_base - toa256_dl_threshold) - to (toa256_dl_base + toa256_dl_threshold), - UL: from (toa256_ul_base - toa256_ul_threshold) - to (toa256_ul_base + toa256_ul_threshold). - - - RSSI (Received Signal Strength Indication) - measured "power" of - the signal (per burst) in dBm. A pair of both base and threshold - values defines a range of RSSI value randomization: - - DL: from (rssi_dl_base - rssi_dl_threshold) - to (rssi_dl_base + rssi_dl_threshold), - UL: from (rssi_ul_base - rssi_ul_threshold) - to (rssi_ul_base + rssi_ul_threshold). - - Please note that the randomization of both RSSI and ToA - is optional, and can be enabled from the control interface. - - === Timing Advance handling - - The BTS is using ToA measurements for UL bursts in order to calculate - Timing Advance value, that is then indicated to a MS, which in its turn - shall apply this value to the transmitted signal in order to compensate - the delay. Basically, every burst is transmitted in advance defined by - the indicated Timing Advance value. The valid range is 0..63, where - each unit means one GSM symbol advance. The actual Timing Advance value - is set using SETTA control command from MS. By default, it's set to 0. - - === Path loss simulation - burst dropping - - In some cases, e.g. due to a weak signal or high interference, a burst - can be lost, i.e. not detected by the receiver. This can also be - simulated using FAKE_DROP command on both control interfaces: - - - burst_{dl|ul}_drop_amount - the amount of DL/UL bursts - to be dropped (i.e. not forwarded towards the MS/BTS), - - - burst_{dl|ul}_drop_period - drop every X DL/UL burst, e.g. - 1 - drop every consequent burst, 2 - drop every second burst, etc. + - execution state (running or idle), + - actual RX / TX frequencies, + - list of active timeslots. """ - def __init__(self, bts_link, bb_link): - self.bts_link = bts_link - self.bb_link = bb_link + def __init__(self, trx_list = []): + # List of Transceiver instances + self.trx_list = trx_list - # Init default parameters - self.reset_dl() - self.reset_ul() + def add_trx(self, trx): + if trx in self.trx_list: + log.error("TRX is already in the list") + return - # Initialize (or reset to) default parameters for Downlink - def reset_dl(self): - # Unset current DL freq. - self.bts_freq = None + self.trx_list.append(trx) - # Indicated RSSI / ToA values - self.toa256_dl_base = 0 - self.rssi_dl_base = -60 + def del_trx(self, trx): + if trx not in self.trx_list: + log.error("TRX is not in the list") + return - # RSSI / ToA randomization threshold - self.toa256_dl_threshold = 0 - self.rssi_dl_threshold = 0 + self.trx_list.remove(trx) - # Path loss simulation (burst dropping) - self.burst_dl_drop_amount = 0 - self.burst_dl_drop_period = 1 + def forward_msg(self, src_trx, rx_msg): + # Transform from L12TRX to TRX2L1 + tx_msg = rx_msg.gen_trx2l1() + if tx_msg is None: + log.error("Forwarding failed, could not transform " + "message (%s) => dropping..." % rx_msg.desc_hdr()) - # Initialize (or reset to) default parameters for Uplink - def reset_ul(self): - # Unset current DL freq. - self.bb_freq = None + # Iterate over all known transceivers + for trx in self.trx_list: + if trx == src_trx: + continue - # Indicated RSSI / ToA values - self.rssi_ul_base = -70 - self.toa256_ul_base = 0 + # Check transceiver state + if not trx.running: + continue + if trx.rx_freq != src_trx.tx_freq: + continue + if tx_msg.tn not in trx.ts_list: + continue - # RSSI / ToA randomization threshold - self.toa256_ul_threshold = 0 - self.rssi_ul_threshold = 0 - - # Path loss simulation (burst dropping) - self.burst_ul_drop_amount = 0 - self.burst_ul_drop_period = 1 - - # Init timeslot filter (drop everything by default) - self.ts_pass_list = [] - - # Reset Timing Advance value - self.ta = 0 - - # Converts TA value from symbols to - # units of 1/256 of GSM symbol periods - def calc_ta256(self): - return self.ta * 256 - - # Calculates a random ToA value for Downlink bursts - def calc_dl_toa256(self): - # Check if randomization is required - if self.toa256_dl_threshold is 0: - return self.toa256_dl_base - - # Calculate a range for randomization - toa256_min = self.toa256_dl_base - self.toa256_dl_threshold - toa256_max = self.toa256_dl_base + self.toa256_dl_threshold - - # Generate a random ToA value - toa256 = random.randint(toa256_min, toa256_max) - - return toa256 - - # Calculates a random ToA value for Uplink bursts - def calc_ul_toa256(self): - # Check if randomization is required - if self.toa256_ul_threshold is 0: - return self.toa256_ul_base - - # Calculate a range for randomization - toa256_min = self.toa256_ul_base - self.toa256_ul_threshold - toa256_max = self.toa256_ul_base + self.toa256_ul_threshold - - # Generate a random ToA value - toa256 = random.randint(toa256_min, toa256_max) - - return toa256 - - # Calculates a random RSSI value for Downlink bursts - def calc_dl_rssi(self): - # Check if randomization is required - if self.rssi_dl_threshold is 0: - return self.rssi_dl_base - - # Calculate a range for randomization - rssi_min = self.rssi_dl_base - self.rssi_dl_threshold - rssi_max = self.rssi_dl_base + self.rssi_dl_threshold - - # Generate a random RSSI value - return random.randint(rssi_min, rssi_max) - - # Calculates a random RSSI value for Uplink bursts - def calc_ul_rssi(self): - # Check if randomization is required - if self.rssi_ul_threshold is 0: - return self.rssi_ul_base - - # Calculate a range for randomization - rssi_min = self.rssi_ul_base - self.rssi_ul_threshold - rssi_max = self.rssi_ul_base + self.rssi_ul_threshold - - # Generate a random RSSI value - return random.randint(rssi_min, rssi_max) - - # DL path loss simulation - def path_loss_sim_dl(self, msg): - # Burst dropping - if self.burst_dl_drop_amount > 0: - if msg.fn % self.burst_dl_drop_period == 0: - log.info("Simulation: dropping DL burst (fn=%u %% %u == 0)" - % (msg.fn, self.burst_dl_drop_period)) - self.burst_dl_drop_amount -= 1 - return None - - return msg - - # UL path loss simulation - def path_loss_sim_ul(self, msg): - # Burst dropping - if self.burst_ul_drop_amount > 0: - if msg.fn % self.burst_ul_drop_period == 0: - log.info("Simulation: dropping UL burst (fn=%u %% %u == 0)" - % (msg.fn, self.burst_ul_drop_period)) - self.burst_ul_drop_amount -= 1 - return None - - return msg - - # DL burst preprocessing - def preprocess_dl_burst(self, msg): - # Calculate both RSSI and ToA values - msg.toa256 = self.calc_dl_toa256() - msg.rssi = self.calc_dl_rssi() - - # UL burst preprocessing - def preprocess_ul_burst(self, msg): - # Calculate both RSSI and ToA values, - # also apply Timing Advance - msg.toa256 = self.calc_ul_toa256() - msg.toa256 -= self.calc_ta256() - msg.rssi = self.calc_ul_rssi() - - # Converts a L12TRX message to TRX2L1 message - def transform_msg(self, msg_raw): - # Attempt to parse a message - try: - msg_l12trx = DATAMSG_L12TRX() - msg_l12trx.parse_msg(bytearray(msg_raw)) - except: - log.error("Dropping unhandled DL message...") - return None - - # Compose a new message for L1 - return msg_l12trx.gen_trx2l1() - - # Downlink handler: BTS -> BB - def bts2bb(self): - # Read data from socket - data, addr = self.bts_link.sock.recvfrom(512) - - # BB is not connected / tuned - if self.bb_freq is None: - return None - - # Freq. filter - if self.bb_freq != self.bts_freq: - return None - - # Process a message - msg = self.transform_msg(data) - if msg is None: - return None - - # Timeslot filter - if msg.tn not in self.ts_pass_list: - return None - - # Path loss simulation - msg = self.path_loss_sim_dl(msg) - if msg is None: - return None - - # Burst preprocessing - self.preprocess_dl_burst(msg) - - # Validate and generate the payload - payload = msg.gen_msg() - - # Append two unused bytes at the end - # in order to keep the compatibility - payload += bytearray(2) - - # Send burst to BB - self.bb_link.send(payload) - - # Uplink handler: BB -> BTS - def bb2bts(self): - # Read data from socket - data, addr = self.bb_link.sock.recvfrom(512) - - # BTS is not connected / tuned - if self.bts_freq is None: - return None - - # Freq. filter - if self.bb_freq != self.bts_freq: - return None - - # Process a message - msg = self.transform_msg(data) - if msg is None: - return None - - # Timeslot filter - if msg.tn not in self.ts_pass_list: - log.warning("TS %u is not configured, dropping UL burst..." % msg.tn) - return None - - # Path loss simulation - msg = self.path_loss_sim_ul(msg) - if msg is None: - return None - - # Burst preprocessing - self.preprocess_ul_burst(msg) - - # Validate and generate the payload - payload = msg.gen_msg() - - # Append two unused bytes at the end - # in order to keep the compatibility - payload += bytearray(2) - - # Send burst to BTS - self.bts_link.send(payload) + trx.send_data_msg(tx_msg) diff --git a/src/target/trx_toolkit/clck_router_trx.py b/src/target/trx_toolkit/clck_router_trx.py new file mode 100755 index 0000000..c85286b --- /dev/null +++ b/src/target/trx_toolkit/clck_router_trx.py @@ -0,0 +1,52 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# TRX Toolkit +# Clock distribution router for transceivers +# +# (C) 2018 by Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import logging as log + +from clck_gen import CLCKGen + +class CLCKRouterTRX(CLCKGen): + def __init__(self, trx_list, *clck_gen_argv): + CLCKGen.__init__(self, [], *clck_gen_argv) + self.trx_list = trx_list + + def poke(self, trx): + log.debug("CLCKRouterTRX poke!") + + if (trx.clck_if not in self.clck_links) and trx.running: + # Transceiver was started + log.debug("Transceiver was started") + self.clck_links.append(trx.clck_if) + elif (trx.clck_if in self.clck_links) and not trx.running: + # Transceiver was stopped + log.debug("Transceiver was stopped") + self.clck_links.remove(trx.clck_if) + + # Start / stop clock generator + if (len(self.clck_links) > 0) and self.timer is None: + log.debug("Starting clock generator") + self.start() + elif (len(self.clck_links) is 0) and self.timer is not None: + log.debug("Stopping clock generator") + self.stop() diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py deleted file mode 100644 index fe7f3e8..0000000 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ /dev/null @@ -1,227 +0,0 @@ -#!/usr/bin/env python2 -# -*- coding: utf-8 -*- - -# TRX Toolkit -# CTRL interface implementation (OsmocomBB specific) -# -# (C) 2016-2017 by Vadim Yanitskiy -# -# All Rights Reserved -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -import logging as log - -from ctrl_if import CTRLInterface - -class CTRLInterfaceBB(CTRLInterface): - # Internal state variables - trx_started = False - burst_fwd = None - rx_freq = None - tx_freq = None - pm = None - - def __init__(self, *udp_link_args): - CTRLInterface.__init__(self, *udp_link_args) - log.info("Init CTRL interface for BB (%s)" % self.desc_link()) - - def parse_cmd(self, request): - # Power control - if self.verify_cmd(request, "POWERON", 0): - log.debug("Recv POWERON CMD") - - # Ensure transceiver isn't working - if self.trx_started: - log.error("Transceiver already started") - return -1 - - # Ensure RX / TX freq. are set - if (self.rx_freq is None) or (self.tx_freq is None): - log.error("RX / TX freq. are not set") - return -1 - - log.info("Starting transceiver...") - self.trx_started = True - return 0 - - elif self.verify_cmd(request, "POWEROFF", 0): - log.debug("Recv POWEROFF cmd") - - log.info("Stopping transceiver...") - self.trx_started = False - return 0 - - # Tuning Control - elif self.verify_cmd(request, "RXTUNE", 1): - log.debug("Recv RXTUNE cmd") - - # TODO: check freq range - self.rx_freq = int(request[1]) * 1000 - self.burst_fwd.bb_freq = self.rx_freq - return 0 - - elif self.verify_cmd(request, "TXTUNE", 1): - log.debug("Recv TXTUNE cmd") - - # TODO: check freq range - self.tx_freq = int(request[1]) * 1000 - return 0 - - # Power measurement - elif self.verify_cmd(request, "MEASURE", 1): - log.debug("Recv MEASURE cmd") - - if self.pm is None: - return -1 - - # TODO: check freq range - meas_freq = int(request[1]) * 1000 - meas_dbm = str(self.pm.measure(meas_freq)) - - return (0, [meas_dbm]) - - elif self.verify_cmd(request, "SETSLOT", 2): - log.debug("Recv SETSLOT cmd") - - if self.burst_fwd is None: - return -1 - - # Obtain TS index - ts = int(request[1]) - if ts not in range(0, 8): - log.error("TS index should be in range: 0..7") - return -1 - - # Parse TS type - ts_type = int(request[2]) - - # TS activation / deactivation - # We don't care about ts_type - if ts_type == 0: - # Deactivate TS (remove from TS pass-filter list) - if ts in self.burst_fwd.ts_pass_list: - self.burst_fwd.ts_pass_list.remove(ts) - else: - log.warning("TS %u was not activated before" % ts) - # TODO: uncomment as soon as RESET is introduced - # return -1 - else: - # Activate TS (add to TS pass-filter list) - if ts not in self.burst_fwd.ts_pass_list: - self.burst_fwd.ts_pass_list.append(ts) - else: - log.warning("TS %u was already activated before" % ts) - # TODO: uncomment as soon as RESET is introduced - # return -1 - - return 0 - - # Timing Advance - elif self.verify_cmd(request, "SETTA", 1): - log.debug("Recv SETTA cmd") - - # Save to the BurstForwarder instance - self.burst_fwd.ta = int(request[1]) - return 0 - - # Timing of Arrival simulation for Uplink - # Absolute form: CMD FAKE_TOA - elif self.verify_cmd(request, "FAKE_TOA", 2): - log.debug("Recv FAKE_TOA cmd") - - # Parse and apply both base and threshold - self.burst_fwd.toa256_ul_base = int(request[1]) - self.burst_fwd.toa256_ul_threshold = int(request[2]) - - return 0 - - # Timing of Arrival simulation for Uplink - # Relative form: CMD FAKE_TOA <+-BASE_DELTA> - elif self.verify_cmd(request, "FAKE_TOA", 1): - log.debug("Recv FAKE_TOA cmd") - - # Parse and apply delta - self.burst_fwd.toa256_ul_base += int(request[1]) - - return 0 - - # RSSI simulation for Uplink - # Absolute form: CMD FAKE_RSSI - elif self.verify_cmd(request, "FAKE_RSSI", 2): - log.debug("Recv FAKE_RSSI cmd") - - # Parse and apply both base and threshold - self.burst_fwd.rssi_ul_base = int(request[1]) - self.burst_fwd.rssi_ul_threshold = int(request[2]) - - return 0 - - # RSSI simulation for Uplink - # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> - elif self.verify_cmd(request, "FAKE_RSSI", 1): - log.debug("Recv FAKE_RSSI cmd") - - # Parse and apply delta - self.burst_fwd.rssi_ul_base += int(request[1]) - - return 0 - - # Path loss simulation for UL: burst dropping - # Syntax: CMD FAKE_DROP - # Dropping pattern: fn % 1 == 0 - elif self.verify_cmd(request, "FAKE_DROP", 1): - log.debug("Recv FAKE_DROP cmd") - - # Parse / validate amount of bursts - num = int(request[1]) - if num < 0: - log.error("FAKE_DROP amount shall not be negative") - return -1 - - self.burst_fwd.burst_ul_drop_amount = num - self.burst_fwd.burst_ul_drop_period = 1 - - return 0 - - # Path loss simulation for UL: burst dropping - # Syntax: CMD FAKE_DROP - # Dropping pattern: fn % period == 0 - elif self.verify_cmd(request, "FAKE_DROP", 2): - log.debug("Recv FAKE_DROP cmd") - - # Parse / validate amount of bursts - num = int(request[1]) - if num < 0: - log.error("FAKE_DROP amount shall not be negative") - return -1 - - # Parse / validate period - period = int(request[2]) - if period <= 0: - log.error("FAKE_DROP period shall be greater than zero") - return -1 - - self.burst_fwd.burst_ul_drop_amount = num - self.burst_fwd.burst_ul_drop_period = period - - return 0 - - # Wrong / unknown command - else: - # We don't care about other commands, - # so let's merely ignore them ;) - log.debug("Ignore CMD %s" % request[0]) - return 0 diff --git a/src/target/trx_toolkit/ctrl_if_bts.py b/src/target/trx_toolkit/ctrl_if_bts.py deleted file mode 100644 index cb38b67..0000000 --- a/src/target/trx_toolkit/ctrl_if_bts.py +++ /dev/null @@ -1,189 +0,0 @@ -#!/usr/bin/env python2 -# -*- coding: utf-8 -*- - -# TRX Toolkit -# CTRL interface implementation (OsmoBTS specific) -# -# (C) 2016-2017 by Vadim Yanitskiy -# -# All Rights Reserved -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -import logging as log - -from ctrl_if import CTRLInterface - -class CTRLInterfaceBTS(CTRLInterface): - # Internal state variables - trx_started = False - burst_fwd = None - clck_gen = None - rx_freq = None - tx_freq = None - pm = None - - def __init__(self, *udp_link_args): - CTRLInterface.__init__(self, *udp_link_args) - log.info("Init CTRL interface for BTS (%s)" % self.desc_link()) - - def parse_cmd(self, request): - # Power control - if self.verify_cmd(request, "POWERON", 0): - log.debug("Recv POWERON CMD") - - # Ensure transceiver isn't working - if self.trx_started: - log.error("Transceiver already started") - return -1 - - # Ensure RX / TX freq. are set - if (self.rx_freq is None) or (self.tx_freq is None): - log.error("RX / TX freq. are not set") - return -1 - - log.info("Starting transceiver...") - self.trx_started = True - - # Power emulation - if self.pm is not None: - self.pm.add_bts_list([self.tx_freq]) - - # Start clock indications - if self.clck_gen is not None: - self.clck_gen.start() - - return 0 - - elif self.verify_cmd(request, "POWEROFF", 0): - log.debug("Recv POWEROFF cmd") - - log.info("Stopping transceiver...") - self.trx_started = False - - # Power emulation - if self.pm is not None: - self.pm.del_bts_list([self.tx_freq]) - - # Stop clock indications - if self.clck_gen is not None: - self.clck_gen.stop() - - return 0 - - # Tuning Control - elif self.verify_cmd(request, "RXTUNE", 1): - log.debug("Recv RXTUNE cmd") - - # TODO: check freq range - self.rx_freq = int(request[1]) * 1000 - return 0 - - elif self.verify_cmd(request, "TXTUNE", 1): - log.debug("Recv TXTUNE cmd") - - # TODO: check freq range - self.tx_freq = int(request[1]) * 1000 - self.burst_fwd.bts_freq = self.tx_freq - return 0 - - # Timing of Arrival simulation for Downlink - # Absolute form: CMD FAKE_TOA - elif self.verify_cmd(request, "FAKE_TOA", 2): - log.debug("Recv FAKE_TOA cmd") - - # Parse and apply both base and threshold - self.burst_fwd.toa256_dl_base = int(request[1]) - self.burst_fwd.toa256_dl_threshold = int(request[2]) - - return 0 - - # Timing of Arrival simulation for Downlink - # Relative form: CMD FAKE_TOA <+-BASE_DELTA> - elif self.verify_cmd(request, "FAKE_TOA", 1): - log.debug("Recv FAKE_TOA cmd") - - # Parse and apply delta - self.burst_fwd.toa256_dl_base += int(request[1]) - - return 0 - - # RSSI simulation for Downlink - # Absolute form: CMD FAKE_RSSI - elif self.verify_cmd(request, "FAKE_RSSI", 2): - log.debug("Recv FAKE_RSSI cmd") - - # Parse and apply both base and threshold - self.burst_fwd.rssi_dl_base = int(request[1]) - self.burst_fwd.rssi_dl_threshold = int(request[2]) - - return 0 - - # RSSI simulation for Downlink - # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> - elif self.verify_cmd(request, "FAKE_RSSI", 1): - log.debug("Recv FAKE_RSSI cmd") - - # Parse and apply delta - self.burst_fwd.rssi_dl_base += int(request[1]) - - return 0 - - # Path loss simulation for DL: burst dropping - # Syntax: CMD FAKE_DROP - # Dropping pattern: fn % 1 == 0 - elif self.verify_cmd(request, "FAKE_DROP", 1): - log.debug("Recv FAKE_DROP cmd") - - # Parse / validate amount of bursts - num = int(request[1]) - if num < 0: - log.error("FAKE_DROP amount shall not be negative") - return -1 - - self.burst_fwd.burst_dl_drop_amount = num - self.burst_fwd.burst_dl_drop_period = 1 - - return 0 - - # Path loss simulation for DL: burst dropping - # Syntax: CMD FAKE_DROP - # Dropping pattern: fn % period == 0 - elif self.verify_cmd(request, "FAKE_DROP", 2): - log.debug("Recv FAKE_DROP cmd") - - # Parse / validate amount of bursts - num = int(request[1]) - if num < 0: - log.error("FAKE_DROP amount shall not be negative") - return -1 - - # Parse / validate period - period = int(request[2]) - if period <= 0: - log.error("FAKE_DROP period shall be greater than zero") - return -1 - - self.burst_fwd.burst_dl_drop_amount = num - self.burst_fwd.burst_dl_drop_period = period - - return 0 - - # Wrong / unknown command - else: - # We don't care about other commands, - # so let's merely ignore them ;) - log.debug("Ignore CMD %s" % request[0]) - return 0 diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py new file mode 100644 index 0000000..1ab1990 --- /dev/null +++ b/src/target/trx_toolkit/ctrl_if_trx.py @@ -0,0 +1,133 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# TRX Toolkit +# CTRL interface implementation (common commands) +# +# (C) 2016-2018 by Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import logging as log + +from ctrl_if import CTRLInterface + +class CTRLInterfaceTRX(CTRLInterface): + """ + + """ + + def __init__(self, trx, *udp_link_args): + CTRLInterface.__init__(self, *udp_link_args) + log.info("Init CTRL interface (%s)" % self.desc_link()) + + # Link with Transceiver instance we belong to + self.trx = trx + + def parse_cmd(self, request): + # Custom command handlers (prioritized) + res = self.trx.ctrl_cmd_handler(request) + if res is not None: + return res + + # Power control + if self.verify_cmd(request, "POWERON", 0): + log.debug("Recv POWERON CMD") + + # Ensure transceiver isn't working + if self.trx.running: + log.error("Transceiver already started") + return -1 + + # Ensure RX / TX freq. are set + if (self.trx.rx_freq is None) or (self.trx.tx_freq is None): + log.error("RX / TX freq. are not set") + return -1 + + log.info("Starting transceiver...") + self.trx.running = True + + # Notify transceiver about that + self.trx.poweron_event_handler() + + return 0 + + elif self.verify_cmd(request, "POWEROFF", 0): + log.debug("Recv POWEROFF cmd") + + log.info("Stopping transceiver...") + self.trx.running = False + + # Notify transceiver about that + self.trx.poweroff_event_handler() + + return 0 + + # Tuning Control + elif self.verify_cmd(request, "RXTUNE", 1): + log.debug("Recv RXTUNE cmd") + + # TODO: check freq range + self.trx.rx_freq = int(request[1]) * 1000 + return 0 + + elif self.verify_cmd(request, "TXTUNE", 1): + log.debug("Recv TXTUNE cmd") + + # TODO: check freq range + self.trx.tx_freq = int(request[1]) * 1000 + return 0 + + elif self.verify_cmd(request, "SETSLOT", 2): + log.debug("Recv SETSLOT cmd") + + # Obtain TS index + ts = int(request[1]) + if ts not in range(0, 8): + log.error("TS index should be in range: 0..7") + return -1 + + # Parse TS type + ts_type = int(request[2]) + + # TS activation / deactivation + # We don't care about ts_type + if ts_type == 0: + # Deactivate TS (remove from the list of active timeslots) + if ts in self.trx.ts_list: + self.trx.ts_list.remove(ts) + else: + log.warning("TS %u was not activated before" % ts) + # TODO: uncomment as soon as RESET is introduced + # return -1 + else: + # Activate TS (add to the list of active timeslots) + if ts not in self.trx.ts_list: + self.trx.ts_list.append(ts) + else: + log.warning("TS %u was already activated before" % ts) + # TODO: uncomment as soon as RESET is introduced + # return -1 + + return 0 + + # Wrong / unknown command + else: + # We don't care about other commands, + # so let's merely ignore them ;) + log.debug("Ignore CMD %s" % request[0]) + return 0 diff --git a/src/target/trx_toolkit/fake_pm.py b/src/target/trx_toolkit/fake_pm.py index 840b4e4..b2b176f 100644 --- a/src/target/trx_toolkit/fake_pm.py +++ b/src/target/trx_toolkit/fake_pm.py @@ -2,9 +2,9 @@ # -*- coding: utf-8 -*- # TRX Toolkit -# Power measurement emulation for BB +# Power measurement emulation # -# (C) 2017 by Vadim Yanitskiy +# (C) 2017-2018 by Vadim Yanitskiy # # All Rights Reserved # @@ -25,29 +25,36 @@ from random import randint class FakePM: - # Freq. list for good power level - bts_list = [] + def __init__(self, trx_list, noise_min, noise_max, trx_min, trx_max): + # List of Transceiver instances + self.trx_list = trx_list - def __init__(self, noise_min, noise_max, bts_min, bts_max): # Save power level ranges self.noise_min = noise_min self.noise_max = noise_max - self.bts_min = bts_min - self.bts_max = bts_max + self.trx_min = trx_min + self.trx_max = trx_max - def measure(self, bts): - if bts in self.bts_list: - return randint(self.bts_min, self.bts_max) - else: - return randint(self.noise_min, self.noise_max) + @property + def rssi_noise(self): + return randint(self.noise_min, self.noise_max) - def update_bts_list(self, new_list): - self.bts_list = new_list + @property + def rssi_trx(self): + return randint(self.trx_min, self.trx_max) - def add_bts_list(self, add_list): - self.bts_list += add_list + def measure(self, freq): + # Iterate over all known transceivers + for trx in self.trx_list: + if not trx.running: + continue - def del_bts_list(self, del_list): - for item in del_list: - if item in self.bts_list: - self.bts_list.remove(item) + # FIXME: we should average the rate of bursts + # and indicated power / attenuation values for + # all known transceivers + + # Match given frequency + if trx.tx_freq == freq: + return self.rssi_trx + + return self.rssi_noise diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 95261df..3068f83 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -31,13 +31,250 @@ import sys from app_common import ApplicationBase -from ctrl_if_bts import CTRLInterfaceBTS -from ctrl_if_bb import CTRLInterfaceBB from burst_fwd import BurstForwarder +from transceiver import Transceiver from fake_pm import FakePM from udp_link import UDPLink -from clck_gen import CLCKGen +from clck_router_trx import CLCKRouterTRX + +class FakeTRX(Transceiver): + """ Fake transceiver with RF path (burst loss, RSSI, TA, ToA) simulation. + + == ToA / RSSI measurement simulation + + Since this is a virtual environment, we can simulate different + parameters of the virtual RF interface: + + - ToA (Timing of Arrival) - measured difference between expected + and actual time of burst arrival in units of 1/256 of GSM symbol + periods. A pair of both base and threshold values defines a range + of ToA value randomization: + + from (toa256_base - toa256_rand_threshold) + to (toa256_base + toa256_rand_threshold). + + - RSSI (Received Signal Strength Indication) - measured "power" of + the signal (per burst) in dBm. A pair of both base and threshold + values defines a range of RSSI value randomization: + + from (rssi_base - rssi_rand_threshold) + to (rssi_base + rssi_rand_threshold). + + Please note that the randomization of both RSSI and ToA + is optional, and can be enabled from the control interface. + + === Timing Advance handling + + The BTS is using ToA measurements for UL bursts in order to calculate + Timing Advance value, that is then indicated to a MS, which in its turn + shall apply this value to the transmitted signal in order to compensate + the delay. Basically, every burst is transmitted in advance defined by + the indicated Timing Advance value. The valid range is 0..63, where + each unit means one GSM symbol advance. The actual Timing Advance value + is set using SETTA control command from MS. By default, it's set to 0. + + === Path loss simulation - burst dropping + + In some cases, e.g. due to a weak signal or high interference, a burst + can be lost, i.e. not detected by the receiver. This can also be + simulated using FAKE_DROP command on the control interface: + + - burst_drop_amount - the amount of DL/UL bursts + to be dropped (i.e. not forwarded towards the MS/BTS), + + - burst_drop_period - drop a DL/UL burst if its (fn % period) == 0. + + TODO: add some notes about custom CTRL command handler + + """ + + def __init__(self, *transceiver_args): + Transceiver.__init__(self, *transceiver_args) + + # Actual ToA / RSSI / TA values + self.toa256_base = 0 + self.rssi_base = -60 + self.ta = 0 + + # ToA / RSSI randomization threshold + self.toa256_rand_threshold = 0 + self.rssi_rand_threshold = 0 + + # Path loss simulation (burst dropping) + self.burst_drop_amount = 0 + self.burst_drop_period = 1 + + @property + def toa256(self): + # Check if randomization is required + if self.toa256_rand_threshold is 0: + return self.toa256_base + + # Generate a random ToA value in required range + toa256_min = self.toa256_base - self.toa256_rand_threshold + toa256_max = self.toa256_base + self.toa256_rand_threshold + return random.randint(toa256_min, toa256_max) + + @property + def rssi(self): + # Check if randomization is required + if self.rssi_rand_threshold is 0: + return self.rssi_base + + # Generate a random RSSI value in required range + rssi_min = self.rssi_base - self.rssi_rand_threshold + rssi_max = self.rssi_base + self.rssi_rand_threshold + return random.randint(rssi_min, rssi_max) + + # Path loss simulation: burst dropping + # Returns: True - drop, False - keep + def sim_burst_drop(self, msg): + # Check if dropping is required + if self.burst_drop_amount is 0: + return False + + if msg.fn % self.burst_drop_period == 0: + log.info("Simulation: dropping burst (fn=%u %% %u == 0)" + % (msg.fn, self.burst_drop_period)) + self.burst_drop_amount -= 1 + return True + + return False + + def send_data_msg(self, msg): + # Complete message header + msg.toa256 = self.toa256 + msg.rssi = self.rssi + + # Apply optional Timing Advance + if self.ta is not 0: + msg.toa256 -= self.ta * 256 + + # TODO: make legacy mode configurable (via argv?) + self.data_if.send_msg(msg, legacy = True) + + # Triggered by POWERON command on CTRL + def poweron_event_handler(self): + log.debug("Recv POWERON event") + self.clck_router.poke(self) + + # Triggered by POWEROFF command on CTRL + def poweroff_event_handler(self): + log.debug("Recv POWEROFF event") + self.clck_router.poke(self) + + # FakeTRX specific CTRL command handler + def ctrl_cmd_handler(self, request): + # Timing of Arrival simulation + # Absolute form: CMD FAKE_TOA + if self.ctrl_if.verify_cmd(request, "FAKE_TOA", 2): + log.debug("Recv FAKE_TOA cmd") + + # Parse and apply both base and threshold + self.toa256_base = int(request[1]) + self.toa256_rand_threshold = int(request[2]) + return 0 + + # Timing of Arrival simulation + # Relative form: CMD FAKE_TOA <+-BASE_DELTA> + elif self.ctrl_if.verify_cmd(request, "FAKE_TOA", 1): + log.debug("Recv FAKE_TOA cmd") + + # Parse and apply delta + self.toa256_base += int(request[1]) + return 0 + + # RSSI simulation + # Absolute form: CMD FAKE_RSSI + elif self.ctrl_if.verify_cmd(request, "FAKE_RSSI", 2): + log.debug("Recv FAKE_RSSI cmd") + + # Parse and apply both base and threshold + self.rssi_base = int(request[1]) + self.rssi_rand_threshold = int(request[2]) + return 0 + + # RSSI simulation + # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> + elif self.ctrl_if.verify_cmd(request, "FAKE_RSSI", 1): + log.debug("Recv FAKE_RSSI cmd") + + # Parse and apply delta + self.rssi_base += int(request[1]) + return 0 + + # Path loss simulation: burst dropping + # Syntax: CMD FAKE_DROP + # Dropping pattern: fn % 1 == 0 + elif self.ctrl_if.verify_cmd(request, "FAKE_DROP", 1): + log.debug("Recv FAKE_DROP cmd") + + # Parse / validate amount of bursts + num = int(request[1]) + if num < 0: + log.error("FAKE_DROP amount shall not be negative") + return -1 + + self.burst_drop_amount = num + self.burst_drop_period = 1 + return 0 + + # Path loss simulation: burst dropping + # Syntax: CMD FAKE_DROP + # Dropping pattern: fn % period == 0 + elif self.ctrl_if.verify_cmd(request, "FAKE_DROP", 2): + log.debug("Recv FAKE_DROP cmd") + + # Parse / validate amount of bursts + num = int(request[1]) + if num < 0: + log.error("FAKE_DROP amount shall not be negative") + return -1 + + # Parse / validate period + period = int(request[2]) + if period <= 0: + log.error("FAKE_DROP period shall be greater than zero") + return -1 + + self.burst_drop_amount = num + self.burst_drop_period = period + return 0 + + # Unhandled command + return None + +class FakeTRX_BTS(FakeTRX): + pass + +class FakeTRX_BB(FakeTRX): + # BB specific CTRL command handler + def ctrl_cmd_handler(self, request): + res = FakeTRX.ctrl_cmd_handler(self, request) + if res is not None: + return res + + # Power measurement + if self.ctrl_if.verify_cmd(request, "MEASURE", 1): + log.debug("Recv MEASURE cmd") + + # TODO: check freq range + meas_freq = int(request[1]) * 1000 + meas_dbm = self.pm.measure(meas_freq) + + return (0, [str(meas_dbm)]) + + # Timing Advance + elif self.ctrl_if.verify_cmd(request, "SETTA", 1): + log.debug("Recv SETTA cmd") + + # Store indicated value + self.trx.ta = int(request[1]) + return 0 + + # Unhandled command + return None class Application(ApplicationBase): def __init__(self): @@ -51,78 +288,65 @@ self.app_init_logging(self.argv) def run(self): - # Init TRX CTRL interface for BTS - self.bts_ctrl = CTRLInterfaceBTS( - self.argv.bts_addr, self.argv.bts_base_port + 101, - self.argv.trx_bind_addr, self.argv.bts_base_port + 1) + # Init TRX instance for BTS + self.bts_trx = FakeTRX_BTS(self.argv.trx_bind_addr, + self.argv.bts_addr, self.argv.bts_base_port) - # Init TRX CTRL interface for BB - self.bb_ctrl = CTRLInterfaceBB( - self.argv.bb_addr, self.argv.bb_base_port + 101, - self.argv.trx_bind_addr, self.argv.bb_base_port + 1) + # Init TRX instance for BB + self.bb_trx = FakeTRX_BB(self.argv.trx_bind_addr, + self.argv.bb_addr, self.argv.bb_base_port) + + # Burst forwarding between transceivers + self.burst_fwd = BurstForwarder() + self.burst_fwd.add_trx(self.bts_trx) + self.burst_fwd.add_trx(self.bb_trx) # Power measurement emulation # Noise: -120 .. -105 # BTS: -75 .. -50 - self.pm = FakePM(-120, -105, -75, -50) + self.pm = FakePM(self.burst_fwd.trx_list, -120, -105, -75, -50) + self.bb_trx.pm = self.pm - # Share a FakePM instance between both BTS and BB - self.bts_ctrl.pm = self.pm - self.bb_ctrl.pm = self.pm - - # Init DATA links - self.bts_data = UDPLink( - self.argv.bts_addr, self.argv.bts_base_port + 102, - self.argv.trx_bind_addr, self.argv.bts_base_port + 2) - self.bb_data = UDPLink( - self.argv.bb_addr, self.argv.bb_base_port + 102, - self.argv.trx_bind_addr, self.argv.bb_base_port + 2) - - # BTS <-> BB burst forwarding - self.burst_fwd = BurstForwarder(self.bts_data, self.bb_data) - - # Share a BurstForwarder instance between BTS and BB - self.bts_ctrl.burst_fwd = self.burst_fwd - self.bb_ctrl.burst_fwd = self.burst_fwd - - # Provide clock to BTS - self.bts_clck = UDPLink( - self.argv.bts_addr, self.argv.bts_base_port + 100, - self.argv.trx_bind_addr, self.argv.bts_base_port) - self.clck_gen = CLCKGen([self.bts_clck]) - self.bts_ctrl.clck_gen = self.clck_gen + # Init clock router + self.clck_router = CLCKRouterTRX(self.burst_fwd.trx_list) + self.bts_trx.clck_router = self.clck_router + self.bb_trx.clck_router = self.clck_router log.info("Init complete") # Enter main loop while True: - socks = [self.bts_ctrl.sock, self.bb_ctrl.sock, - self.bts_data.sock, self.bb_data.sock] + socks = [self.bts_trx.ctrl_if.sock, self.bb_trx.ctrl_if.sock, + self.bts_trx.data_if.sock, self.bb_trx.data_if.sock] # Wait until we get any data on any socket r_event, w_event, x_event = select.select(socks, [], []) # Downlink: BTS -> BB - if self.bts_data.sock in r_event: - self.burst_fwd.bts2bb() + if self.bts_trx.data_if.sock in r_event: + msg = self.bts_trx.recv_data_msg() + if msg is not None: + self.burst_fwd.forward_msg(self.bts_trx, msg) # Uplink: BB -> BTS - if self.bb_data.sock in r_event: - self.burst_fwd.bb2bts() + if self.bb_trx.data_if.sock in r_event: + msg = self.bb_trx.recv_data_msg() + if msg is not None: + self.burst_fwd.forward_msg(self.bb_trx, msg) # CTRL commands from BTS - if self.bts_ctrl.sock in r_event: - self.bts_ctrl.handle_rx() + if self.bts_trx.ctrl_if.sock in r_event: + self.bts_trx.ctrl_if.handle_rx() # CTRL commands from BB - if self.bb_ctrl.sock in r_event: - self.bb_ctrl.handle_rx() + if self.bb_trx.ctrl_if.sock in r_event: + self.bb_trx.ctrl_if.handle_rx() def shutdown(self): log.info("Shutting down...") # Stop clock generator - self.clck_gen.stop() + self.clck_router.stop() def parse_argv(self): parser = argparse.ArgumentParser(prog = "fake_trx", diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py new file mode 100644 index 0000000..f83d88c --- /dev/null +++ b/src/target/trx_toolkit/transceiver.py @@ -0,0 +1,91 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# TRX Toolkit +# Transceiver implementation +# +# (C) 2018 by Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import logging as log + +from ctrl_if_trx import CTRLInterfaceTRX +from data_if import DATAInterface +from udp_link import UDPLink +from data_msg import * + +class Transceiver: + """ Base transceiver class implementation. + + Represents a single transceiver, that can be used as for the BTS side, + as for the MS side. Usually, a single transceiver has DATA, CTRL and + CLCK interfaces, but since clock interface is not used by the MS side + at the moment, it is not being initialized. + + """ + + def __init__(self, bind_addr, remote_addr, base_port): + # Init DATA interface + self.data_if = DATAInterface( + remote_addr, base_port + 102, + bind_addr, base_port + 2) + + # Init CTRL interface + self.ctrl_if = CTRLInterfaceTRX(self, + remote_addr, base_port + 101, + bind_addr, base_port + 1) + + # Init CLCK interface + self.clck_if = UDPLink( + remote_addr, base_port + 100, + bind_addr, base_port) + + # Connection info + self.remote_addr = remote_addr + self.bind_addr = bind_addr + self.base_port = base_port + + # Internal state + self.running = False + + # Actual RX / TX frequencies + self.rx_freq = None + self.tx_freq = None + + # List of active (configured) timeslots + self.ts_list = [] + + def recv_data_msg(self): + # Read and parse data from socket + msg = self.data_if.recv_l12trx_msg() + if not msg: + return None + + # Make sure that transceiver is configured and running + if not self.running: + log.warning("RX DATA message (%s), but transceiver " + "is not running => dropping..." % msg.desc_hdr()) + return None + + # Make sure that indicated timeslot is configured + if msg.tn not in self.ts_list: + log.warning("RX DATA message (%s), but timeslot " + "is not configured => dropping..." % msg.desc_hdr()) + return None + + return msg -- To view, visit https://gerrit.osmocom.org/12264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ice44e2b22566b3652ef6d43896055963b13ab185 Gerrit-Change-Number: 12264 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 11 23:59:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 11 Dec 2018 23:59:19 +0000 Subject: Change in osmo-bsc[master]: bsc: bssap: Set subscr log context during paging In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12256 to look at the new patch set (#2). Change subject: bsc: bssap: Set subscr log context during paging ...................................................................... bsc: bssap: Set subscr log context during paging Change-Id: I3998a35ff6ea29440882514bbb30cafed66f03fa --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/56/12256/2 -- To view, visit https://gerrit.osmocom.org/12256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3998a35ff6ea29440882514bbb30cafed66f03fa Gerrit-Change-Number: 12256 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 00:00:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 00:00:47 +0000 Subject: Change in osmo-bsc[master]: bsc: bssap: Set subscr log context during paging In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12256 ) Change subject: bsc: bssap: Set subscr log context during paging ...................................................................... Patch Set 2: Code-Review+2 Adding +2 myself since I fixed the cosmetic issue. -- To view, visit https://gerrit.osmocom.org/12256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3998a35ff6ea29440882514bbb30cafed66f03fa Gerrit-Change-Number: 12256 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 12 Dec 2018 00:00:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 00:08:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 00:08:05 +0000 Subject: Change in osmo-bsc[master]: paging: fix whitespace In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12249 ) Change subject: paging: fix whitespace ...................................................................... paging: fix whitespace Change-Id: I81c4a9f0dbd708df27a485ef764c9524a36d548a --- M src/osmo-bsc/paging.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 246114f..03f940c 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -267,7 +267,7 @@ return 1; } - return 0; + return 0; } /*! Call-back once T3113 (paging timeout) expires for given paging_request */ -- To view, visit https://gerrit.osmocom.org/12249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I81c4a9f0dbd708df27a485ef764c9524a36d548a Gerrit-Change-Number: 12249 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 00:08:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 00:08:07 +0000 Subject: Change in osmo-bsc[master]: VTY: Allow logging filter imsi statements for IMSIs we haven't seen yet In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12250 ) Change subject: VTY: Allow logging filter imsi statements for IMSIs we haven't seen yet ...................................................................... VTY: Allow logging filter imsi statements for IMSIs we haven't seen yet Limiting the logging filter only to IMSIs that we have as local subscriber doesn't make sense for osmo-bsc since all subscribers are initially unknown. Create a bsc subscriber and enable logging there. This struct will then be used and liked to the gsm_subscr_conn when receiving the Location update. Related: OS#3641 Change-Id: Ia20bdc15565417020205d7b2b06b04a01c03106c --- M src/osmo-bsc/osmo_bsc_vty.c 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index a32f580..6e3d1c1 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -886,15 +886,21 @@ struct log_target *tgt = osmo_log_vty2tgt(vty); const char *imsi = argv[0]; - bsc_subscr = bsc_subscr_find_by_imsi(bsc_gsmnet->bsc_subscribers, imsi); + if (!tgt) + return CMD_WARNING; + + bsc_subscr = bsc_subscr_find_or_create_by_imsi(bsc_gsmnet->bsc_subscribers, imsi); if (!bsc_subscr) { - vty_out(vty, "%%no subscriber with IMSI(%s)%s", + vty_out(vty, "%%failed to enable logging for subscriber with IMSI(%s)%s", imsi, VTY_NEWLINE); return CMD_WARNING; } log_set_filter_bsc_subscr(tgt, bsc_subscr); + /* log_set_filter has grabbed its own reference */ + bsc_subscr_put(bsc_subscr); + return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/12250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia20bdc15565417020205d7b2b06b04a01c03106c Gerrit-Change-Number: 12250 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 00:08:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 00:08:08 +0000 Subject: Change in osmo-bsc[master]: paging: Properly enclose logging imsi filter scope In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12251 ) Change subject: paging: Properly enclose logging imsi filter scope ...................................................................... paging: Properly enclose logging imsi filter scope Otherwise all logging is kept enabled after passing through those code paths. Change-Id: I06a977d97e6ffea02ec7402d48410c0e7cc6c155 --- M src/osmo-bsc/paging.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 03f940c..2c9d5cd 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -285,6 +285,8 @@ /* destroy it now. Do not access req afterwards */ paging_remove_request(&req->bts->paging, req); + + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); } #define GSM_FRAME_DURATION_us 4615 @@ -440,6 +442,7 @@ continue; _paging_request_stop(bts, bsub, NULL, NULL); } + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); } -- To view, visit https://gerrit.osmocom.org/12251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I06a977d97e6ffea02ec7402d48410c0e7cc6c155 Gerrit-Change-Number: 12251 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 00:08:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 00:08:09 +0000 Subject: Change in osmo-bsc[master]: bsc_main: filter_fn: Compare imsi values instead of subscr pointers In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12252 ) Change subject: bsc_main: filter_fn: Compare imsi values instead of subscr pointers ...................................................................... bsc_main: filter_fn: Compare imsi values instead of subscr pointers Since we actually want to match by IMSI as specified by filter in VTY. It will allow to match based on other information later. Change-Id: Ia73fd2f38e42396db8f6d2cc6b2c163aa8f67f3f --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 67fccd3..08bb40d 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -767,10 +768,12 @@ static int filter_fn(const struct log_context *ctx, struct log_target *tar) { - const struct bsc_subscr *bsub = ctx->ctx[LOG_CTX_BSC_SUBSCR]; + const struct bsc_subscr *bsub_ctx = ctx->ctx[LOG_CTX_BSC_SUBSCR]; + const struct bsc_subscr *bsub_filter = tar->filter_data[LOG_FLT_BSC_SUBSCR]; if ((tar->filter_map & (1 << LOG_FLT_BSC_SUBSCR)) != 0 - && bsub && bsub == tar->filter_data[LOG_FLT_BSC_SUBSCR]) + && bsub_ctx && bsub_filter + && strncmp(bsub_ctx->imsi, bsub_filter->imsi, sizeof(bsub_ctx->imsi)) == 0) return 1; return 0; -- To view, visit https://gerrit.osmocom.org/12252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia73fd2f38e42396db8f6d2cc6b2c163aa8f67f3f Gerrit-Change-Number: 12252 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 00:08:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 00:08:10 +0000 Subject: Change in osmo-bsc[master]: bsc: Set subscr log context during complete_layer3 In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12253 ) Change subject: bsc: Set subscr log context during complete_layer3 ...................................................................... bsc: Set subscr log context during complete_layer3 Change-Id: I162a474f711248a3f64a0438967fa6f8a9a3e686 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 16 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index a3e8b30..c3c5000 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -433,12 +433,14 @@ enum bsc_con ret; struct gsm0808_speech_codec_list scl; + log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub); + /* Check the filter */ rc = bsc_filter_initial(msc->network->bsc_data, msc, conn, msg, &imsi, &con_type, &lu_cause); if (rc < 0) { bsc_maybe_lu_reject(conn, con_type, lu_cause); - return false; + goto early_fail; } /* allocate resource for a new connection */ @@ -450,8 +452,7 @@ bsc_send_ussd_no_srv(conn, msg, msc->ussd_msc_lost_txt); else if (ret == BSC_CON_REJECT_RF_GRACE) bsc_send_ussd_no_srv(conn, msg, msc->ussd_grace_txt); - - return false; + goto early_fail; } /* TODO: also extract TMSI. We get an IMSI only when an initial L3 Complete comes in that @@ -460,15 +461,18 @@ if (imsi) { conn->filter_state.imsi = talloc_steal(conn, imsi); if (conn->bsub) { + log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub); /* Already a subscriber on L3 Complete? Should never happen... */ if (conn->bsub->imsi[0] && strcmp(conn->bsub->imsi, imsi)) LOGP(DMSC, LOGL_ERROR, "Subscriber's IMSI changes from %s to %s\n", conn->bsub->imsi, imsi); bsc_subscr_set_imsi(conn->bsub, imsi); - } else + } else { conn->bsub = bsc_subscr_find_or_create_by_imsi(msc->network->bsc_subscribers, imsi); + log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub); + } gscon_update_id(conn); } conn->filter_state.con_type = con_type; @@ -493,14 +497,16 @@ } else resp = gsm0808_create_layer3_2(msg, cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)), NULL); - if (!resp) { + if (resp) + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, resp); + else LOGP(DMSC, LOGL_DEBUG, "Failed to create layer3 message.\n"); - return false; - } - osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, resp); - - return true; + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); + return !!resp; +early_fail: + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); + return false; } /* -- To view, visit https://gerrit.osmocom.org/12253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I162a474f711248a3f64a0438967fa6f8a9a3e686 Gerrit-Change-Number: 12253 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 00:08:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 00:08:11 +0000 Subject: Change in osmo-bsc[master]: bsc: rsl: Set subscr log context during meas report In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12254 ) Change subject: bsc: rsl: Set subscr log context during meas report ...................................................................... bsc: rsl: Set subscr log context during meas report Change-Id: Idc6af592e870d15491797ae6fcaffaac2b411766 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 9 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 954fb0f..8ffb07e 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -917,11 +917,14 @@ { int i; const char *name = ""; + struct bsc_subscr *bsub = NULL; if (lchan && lchan->conn) { - if (lchan->conn->bsub) - name = bsc_subscr_name(lchan->conn->bsub); - else + bsub = lchan->conn->bsub; + if (bsub) { + log_set_context(LOG_CTX_BSC_SUBSCR, bsub); + name = bsc_subscr_name(bsub); + } else name = lchan->name; } @@ -960,6 +963,9 @@ DEBUGP(DMEAS, "IDX=%u ARFCN=%u BSIC=%u => %d dBm\n", mrc->neigh_idx, mrc->arfcn, mrc->bsic, rxlev2dbm(mrc->rxlev)); } + + if (bsub) + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); } static struct gsm_meas_rep *lchan_next_meas_rep(struct gsm_lchan *lchan) -- To view, visit https://gerrit.osmocom.org/12254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idc6af592e870d15491797ae6fcaffaac2b411766 Gerrit-Change-Number: 12254 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 00:08:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 00:08:13 +0000 Subject: Change in osmo-bsc[master]: bsc: dtap: Set subscr log context In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12255 ) Change subject: bsc: dtap: Set subscr log context ...................................................................... bsc: dtap: Set subscr log context Change-Id: I362a7d10f5ca9a95b594f7caafd7ed5b10fd059a --- M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/osmo_bsc_bssap.c 2 files changed, 11 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index c3c5000..2c6a689 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -602,8 +602,10 @@ { int lu_cause; + log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub); + if (!msc_connected(conn)) - return; + goto done; LOGP(DMSC, LOGL_INFO, "Tx MSC DTAP LINK_ID=0x%02x\n", link_id); @@ -612,7 +614,7 @@ * to handle it. If it was handled we will return. */ if (handle_cc_setup(conn, msg) >= 1) - return; + goto done; /* Check the filter */ if (bsc_filter_data(conn, msg, &lu_cause) < 0) { @@ -620,7 +622,7 @@ conn->filter_state.con_type, lu_cause); bsc_clear_request(conn, 0); - return; + goto done; } bsc_scan_bts_msg(conn, msg); @@ -628,6 +630,9 @@ /* Store link_id in msg->cb */ OBSC_LINKID_CB(msg) = link_id; osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_MO_DTAP, msg); +done: + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); + return; } /*! BSC->MSC: RR conn has been cleared. */ diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 39425f6..b5ff152 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -980,6 +980,8 @@ int bsc_handle_dt(struct gsm_subscriber_connection *conn, struct msgb *msg, unsigned int len) { + log_set_context(LOG_CTX_BSC_SUBSCR, conn->bsub); + if (len < sizeof(struct bssmap_header)) { LOGP(DMSC, LOGL_ERROR, "The header is too short.\n"); } @@ -997,6 +999,7 @@ gsm0808_bssap_name(msg->l3h[0])); } + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); return -1; } -- To view, visit https://gerrit.osmocom.org/12255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I362a7d10f5ca9a95b594f7caafd7ed5b10fd059a Gerrit-Change-Number: 12255 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 00:08:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 00:08:14 +0000 Subject: Change in osmo-bsc[master]: bsc: bssap: Set subscr log context during paging In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12256 ) Change subject: bsc: bssap: Set subscr log context during paging ...................................................................... bsc: bssap: Set subscr log context during paging Change-Id: I3998a35ff6ea29440882514bbb30cafed66f03fa --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index b5ff152..60ec5fb 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -96,11 +96,15 @@ struct bsc_subscr *subscr; int ret; + subscr = bsc_subscr_find_or_create_by_imsi(msc->network->bsc_subscribers, + mi_string); + + if (subscr) + log_set_context(LOG_CTX_BSC_SUBSCR, subscr); + LOGP(DMSC, LOGL_INFO, "Paging request from MSC BTS: %d IMSI: '%s' TMSI: '0x%x/%u' LAC: 0x%x\n", bts->nr, mi_string, tmsi, tmsi, lac); - subscr = bsc_subscr_find_or_create_by_imsi(msc->network->bsc_subscribers, - mi_string); if (!subscr) { LOGP(DMSC, LOGL_ERROR, "Paging request failed: Could not allocate subscriber for %s\n", mi_string); return; @@ -116,6 +120,8 @@ /* the paging code has grabbed its own references */ bsc_subscr_put(subscr); + + log_set_context(LOG_CTX_BSC_SUBSCR, NULL); } static void -- To view, visit https://gerrit.osmocom.org/12256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3998a35ff6ea29440882514bbb30cafed66f03fa Gerrit-Change-Number: 12256 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 00:18:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 00:18:55 +0000 Subject: Change in osmo-mgw[master]: check_rtp: on IP:port errors, log the IP and port Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12265 Change subject: check_rtp: on IP:port errors, log the IP and port ...................................................................... check_rtp: on IP:port errors, log the IP and port Half of those are obviously zero, but I'd rather print the raw data instead of adding string constants, even if the condition must always lead to 0.0.0.0:0. Rationale: I had osmo-mgw listen on 0.0.0.0 and got the error message DRTP ERROR endpoint:0x1 destination IP-address is invalid which didn't convey that 0.0.0.0 is regarded as invalid. Change-Id: I9e98d464a27038904797c5c10735a98ef5b7b9c3 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/12265/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index de34cc6..7af8e71 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -945,22 +945,22 @@ * and IP-address for outgoing data. */ if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0 && conn->end.rtp_port == 0) { LOGP(DRTP, LOGL_DEBUG, - "endpoint:0x%x destination IP-address and rtp port is (not yet) known\n", - ENDPOINT_NUMBER(endp)); + "endpoint:0x%x destination IP-address and rtp port is (not yet) known (%s:%u)\n", + ENDPOINT_NUMBER(endp), inet_ntoa(conn->end.addr), conn->end.rtp_port); return -1; } if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0) { LOGP(DRTP, LOGL_ERROR, - "endpoint:0x%x destination IP-address is invalid\n", - ENDPOINT_NUMBER(endp)); + "endpoint:0x%x destination IP-address is invalid (%s:%u)\n", + ENDPOINT_NUMBER(endp), inet_ntoa(conn->end.addr), conn->end.rtp_port); return -1; } if (conn->end.rtp_port == 0) { LOGP(DRTP, LOGL_ERROR, - "endpoint:0x%x destination rtp port is invalid\n", - ENDPOINT_NUMBER(endp)); + "endpoint:0x%x destination rtp port is invalid (%s:%u)\n", + ENDPOINT_NUMBER(endp), inet_ntoa(conn->end.addr), conn->end.rtp_port); return -1; } -- To view, visit https://gerrit.osmocom.org/12265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9e98d464a27038904797c5c10735a98ef5b7b9c3 Gerrit-Change-Number: 12265 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 12 00:52:59 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 12 Dec 2018 00:52:59 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7408?= Message-ID: <2010217903.1228.1544575979322.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 24.06 KB...] CC bits.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory '/build/deps/libosmocore/src' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la '/build/deps/install/stow/libosmocore/lib' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 /build/deps/install/stow/libosmocore/lib/libosmocore.so.11.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai /build/deps/install/stow/libosmocore/lib/libosmocore.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/libosmocore/src' make[3]: Leaving directory '/build/deps/libosmocore/src' make[2]: Leaving directory '/build/deps/libosmocore/src' Making install in src/vty make[2]: Entering directory '/build/deps/libosmocore/src/vty' CC buffer.lo CC command.lo CC vty.lo CC logging_vty.lo CC telnet_interface.lo CC vector.lo CC stats_vty.lo CC utils.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory '/build/deps/libosmocore/src/vty' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmovty.la' libtool: install: (cd /build/deps/libosmocore/src/vty; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath /build/deps/install/stow/libosmocore/lib buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T /build/deps/install/stow/libosmocore/lib/libosmovty.so.4.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai /build/deps/install/stow/libosmocore/lib/libosmovty.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmocore/src/vty' make[2]: Leaving directory '/build/deps/libosmocore/src/vty' Making install in src/codec make[2]: Entering directory '/build/deps/libosmocore/src/codec' CC gsm610.lo CC gsm620.lo CC gsm660.lo CC gsm690.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory '/build/deps/libosmocore/src/codec' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocodec.la' libtool: install: (cd /build/deps/libosmocore/src/codec; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath /build/deps/install/stow/libosmocore/lib gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T /build/deps/install/stow/libosmocore/lib/libosmocodec.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai /build/deps/install/stow/libosmocore/lib/libosmocodec.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmocore/src/codec' make[2]: Leaving directory '/build/deps/libosmocore/src/codec' Making install in src/gsm make[2]: Entering directory '/build/deps/libosmocore/src/gsm' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/src/gsm' CC a5.lo CC rxlev_stat.lo CC tlv_parser.lo CC comp128v23.lo CC comp128.lo CC gsm48.lo CC rsl.lo CC gsm_utils.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^ gsm_utils.c: In function 'osmo_get_rand_id': gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^ CC gsm0808.lo CC gsm48_ie.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_smc.lo CC gsm0411_utils.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo /bin/bash: line 2: 6091 Segmentation fault (core dumped) /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT auth_milenage.lo -MD -MP -MF $depbase.Tpo -c -o auth_milenage.lo auth_milenage.c make[3]: *** [auth_milenage.lo] Error 139 Makefile:582: recipe for target 'auth_milenage.lo' failed make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' Makefile:687: recipe for target 'install' failed make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: *** [install] Error 2 make[1]: *** [install-recursive] Error 1 Makefile:604: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:903: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 12 00:59:46 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 12 Dec 2018 00:59:46 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--enab?= =?UTF-8?Q?le-iu,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7409?= In-Reply-To: <2010217903.1228.1544575979322.JavaMail.jenkins@jenkins.osmocom.org> References: <2010217903.1228.1544575979322.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1714276760.1229.1544576386868.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Dec 12 03:06:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 03:06:48 +0000 Subject: Change in osmo-msc[master]: vty: show subscriber: put() before printing the use count Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12266 Change subject: vty: show subscriber: put() before printing the use count ...................................................................... vty: show subscriber: put() before printing the use count Do not show the VTY command's own use count during 'show subscriber '. When using 'show subscriber msisdn 2023', I was surprised to see a use count of 2 and suspected a use count leak. With 'show subscriber cache' however, the use count is 1. So I realized it is the vty command's own use count that makes it two, besides the lu_complete=true one. Change-Id: Id02b57b7ed299b010b9f8b9e809548eb1e6aa699 --- M src/libmsc/msc_vty.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/66/12266/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 06e1139..9516752 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -826,10 +826,12 @@ return CMD_WARNING; } - subscr_dump_full_vty(vty, vsub); - + /* Do not taint the use count in the output. It will not become deallocated, since we are not multi-threaded, + * and since it existed before we called _get() on it above. */ vlr_subscr_put(vsub); + subscr_dump_full_vty(vty, vsub); + return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/12266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id02b57b7ed299b010b9f8b9e809548eb1e6aa699 Gerrit-Change-Number: 12266 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 03:06:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 03:06:49 +0000 Subject: Change in osmo-msc[master]: log: by default start with all categories on LOGL_NOTICE Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12267 Change subject: log: by default start with all categories on LOGL_NOTICE ...................................................................... log: by default start with all categories on LOGL_NOTICE They were on DEBUG during early development stages, and it's high time that I drop those back to NOTICE. Change-Id: I3b46e9107a7a1d81a44d2a2eb855c10960a1ab6b --- M src/osmo-msc/msc_main.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/67/12267/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 8500b97..806632a 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -468,22 +468,22 @@ [DSMPP] = { .name = "DSMPP", .description = "SMPP interface for external SMS apps", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DRANAP] = { .name = "DRANAP", .description = "Radio Access Network Application Part Protocol", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DVLR] = { .name = "DVLR", .description = "Visitor Location Register", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DIUCS] = { .name = "DIUCS", .description = "Iu-CS Protocol", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DBSSAP] = { .name = "DBSSAP", -- To view, visit https://gerrit.osmocom.org/12267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3b46e9107a7a1d81a44d2a2eb855c10960a1ab6b Gerrit-Change-Number: 12267 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 03:48:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 03:48:58 +0000 Subject: Change in libosmocore[master]: add to osmo_sock_get_name*() API Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12268 Change subject: add to osmo_sock_get_name*() API ...................................................................... add to osmo_sock_get_name*() API Basically, I am applying code review that I would have given had I not been on vacation when the last osmo_sock_get_name* stuff was merged. osmo_sock_get_name2() is so far a static internal function. However, it is nothing like osmo_sock_get_name(), so instead rename it to osmo_sock_get_ip_and_port(). Also make it public API, no need to hide it. I'm adding an "and" in the name to hopefully clarify: "ip_port" vs. "ip_and_port" -- there already are _get_X_ip_port() functions that only return the port string, despite "ip" in the name. Add new public osmo_sock_get_name2(), which is like osmo_sock_get_name(), except it uses a static string instead of talloc, and omits the braces. This is most convenient for log statement formats, avoiding dyn allocations. Add new osmo_sock_get_name2_buf(), which is like osmo_sock_get_name2() but writes to a caller provided char buffer. Technically this should be called osmo_sock_get_name_buf() without '2', but that would be quite confusing. Use osmo_sock_get_name2_buf() in the implementation of osmo_sock_get_name(), but use another (non-static) local string buffer, because adding braces is too complex without talloc_snprintf(). Rationale: I want to improve the logging of socket errors, e.g. change DLMGCP ERROR Failed to read: 111/Connection refused (mgcp_client.c:720) to DLMGCP ERROR Failed to read: r=10.0.99.2:2427<->l=10.0.99.2:2728: 111='Connection refused' (mgcp_client.c:721) but it is just not handy to compose logging with the current API: - osmo_sock_get_name() requires a talloc_free(). - all the others require output buffers. - the only way to conveniently compose a logging string and, - notably, the only trivial way to skip the string composition if the logging level is currently muted, is to have a function that returns a static string: the new osmo_sock_get_name2(). - (I think the osmo_sock_get_{local,remote}_* convenience wrappers should never have been added, because they encourage the caller to invoke the same code twice, for IP addr and port, and throw away one half each time.) Related: Iae728192f499330d16836d9435648f6b8ed213b6 (osmo-mgw) Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 49 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/12268/1 diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 79a61bb..fd28f21 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -60,6 +60,9 @@ const char *socket_path, unsigned int flags); char *osmo_sock_get_name(void *ctx, int fd); +const char *osmo_sock_get_name2(int fd); +int osmo_sock_get_name2_buf(char *str, size_t str_len, int fd); +int osmo_sock_get_ip_and_port(int fd, char *ip, size_t ip_len, char *port, size_t port_len, bool local); int osmo_sock_get_local_ip(int fd, char *host, size_t len); int osmo_sock_get_local_ip_port(int fd, char *port, size_t len); int osmo_sock_get_remote_ip(int fd, char *host, size_t len); diff --git a/src/socket.c b/src/socket.c index e804ab5..25c5504 100644 --- a/src/socket.c +++ b/src/socket.c @@ -697,10 +697,7 @@ return osmo_fd_init_ofd(ofd, osmo_sock_unix_init(type, proto, socket_path, flags)); } -/*! Get the IP and/or port number on socket. This is for internal usage. - * Convenience wrappers: osmo_sock_get_local_ip(), - * osmo_sock_get_local_ip_port(), osmo_sock_get_remote_ip(), - * osmo_sock_get_remote_ip_port() and osmo_sock_get_name() +/*! Get the IP and/or port number on socket in separate string buffers. * \param[in] fd file descriptor of socket * \param[out] ip IP address (will be filled in when not NULL) * \param[in] ip_len length of the ip buffer @@ -709,7 +706,7 @@ * \param[in] local (true) or remote (false) name will get looked at * \returns 0 on success; negative otherwise */ -static int osmo_sock_get_name2(int fd, char *ip, size_t ip_len, char *port, size_t port_len, bool local) +int osmo_sock_get_ip_and_port(int fd, char *ip, size_t ip_len, char *port, size_t port_len, bool local) { struct sockaddr sa; socklen_t len = sizeof(sa); @@ -741,7 +738,7 @@ */ int osmo_sock_get_local_ip(int fd, char *ip, size_t len) { - return osmo_sock_get_name2(fd, ip, len, NULL, 0, true); + return osmo_sock_get_ip_and_port(fd, ip, len, NULL, 0, true); } /*! Get local port on socket @@ -752,7 +749,7 @@ */ int osmo_sock_get_local_ip_port(int fd, char *port, size_t len) { - return osmo_sock_get_name2(fd, NULL, 0, port, len, true); + return osmo_sock_get_ip_and_port(fd, NULL, 0, port, len, true); } /*! Get remote IP address on socket @@ -763,7 +760,7 @@ */ int osmo_sock_get_remote_ip(int fd, char *ip, size_t len) { - return osmo_sock_get_name2(fd, ip, len, NULL, 0, false); + return osmo_sock_get_ip_and_port(fd, ip, len, NULL, 0, false); } /*! Get remote port on socket @@ -774,29 +771,61 @@ */ int osmo_sock_get_remote_ip_port(int fd, char *port, size_t len) { - return osmo_sock_get_name2(fd, NULL, 0, port, len, false); + return osmo_sock_get_ip_and_port(fd, NULL, 0, port, len, false); } -/*! Get address/port information on socket in dyn-alloc string +/*! Get address/port information on socket in dyn-alloc string like "(r=1.2.3.4:5<->l=6.7.8.9:10)". + * Usually, it is better to use osmo_sock_get_name2() for a static string buffer or osmo_sock_get_name2_buf() for a + * caller provided string buffer, to avoid the dynamic talloc allocation. * \param[in] ctx talloc context from which to allocate string buffer * \param[in] fd file descriptor of socket - * \returns string identifying the connection of this socket + * \returns string identifying the connection of this socket, talloc'd from ctx. */ char *osmo_sock_get_name(void *ctx, int fd) { + char str[2 + INET6_ADDRSTRLEN + 1 + 5 + 3 + 2 + INET6_ADDRSTRLEN + 1 + 5 + 1]; + int rc; + rc = osmo_sock_get_name2_buf(str, sizeof(str), fd); + if (rc <= 0) + return NULL; + return talloc_asprintf(ctx, "(%s)", str); +} + +/*! Get address/port information on socket in provided string buffer, like "r=1.2.3.4:5<->l=6.7.8.9:10". + * This does not include braces like osmo_sock_get_name(). + * \param[out] str Destination string buffer. + * \param[in] str_len sizeof(str). + * \param[in] fd File descriptor of socket + * \return String length as returned by snprintf(), or negative on error. + */ +int osmo_sock_get_name2_buf(char *str, size_t str_len, int fd) +{ char hostbuf_l[INET6_ADDRSTRLEN], hostbuf_r[INET6_ADDRSTRLEN]; char portbuf_l[6], portbuf_r[6]; + int rc; /* get local */ - if (osmo_sock_get_name2(fd, hostbuf_l, sizeof(hostbuf_l), portbuf_l, sizeof(portbuf_l), true)) - return NULL; + if ((rc = osmo_sock_get_ip_and_port(fd, hostbuf_l, sizeof(hostbuf_l), portbuf_l, sizeof(portbuf_l), true))) + return rc; /* get remote */ - if (!osmo_sock_get_name2(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false)) - return talloc_asprintf(ctx, "(r=%s:%s<->l=%s:%s)", hostbuf_r, portbuf_r, hostbuf_l, portbuf_l); + if (osmo_sock_get_ip_and_port(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false) != 0) + return snprintf(str, str_len, "r=NULL<->l=%s:%s", hostbuf_l, portbuf_l); - /* local only: different format */ - return talloc_asprintf(ctx, "(r=NULL<->l=%s:%s)", hostbuf_l, portbuf_l); + return snprintf(str, str_len, "r=%s:%s<->l=%s:%s", hostbuf_r, portbuf_r, hostbuf_l, portbuf_l); +} + +/*! Get address/port information on socket in static string, like "r=1.2.3.4:5<->l=6.7.8.9:10". + * This does not include braces like osmo_sock_get_name(). + * \param[in] fd File descriptor of socket + * \return Static string buffer containing the result. + */ +const char *osmo_sock_get_name2(int fd) +{ + /* "r=1.2.3.4:123<->l=5.6.7.8:987" */ + static char str[2 + INET6_ADDRSTRLEN + 1 + 5 + 3 + 2 + INET6_ADDRSTRLEN + 1 + 5 + 1]; + osmo_sock_get_name2_buf(str, sizeof(str), fd); + return str; } static int sock_get_domain(int fd) -- To view, visit https://gerrit.osmocom.org/12268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 Gerrit-Change-Number: 12268 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 03:49:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 03:49:12 +0000 Subject: Change in osmo-mgw[master]: drop/replace very weird logging in mgcp_client.c Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12269 Change subject: drop/replace very weird logging in mgcp_client.c ...................................................................... drop/replace very weird logging in mgcp_client.c mgcp_do_write() is the final stage of writing data towards the MGCP server (MGW). In that function, drop an unconditional iteration and copy of the MGCP message to a static string buffer for no apparent reason besides debug logging. Instead, use osmo_escape_str() with a limited length, which can just be an inline format argument in the LOGP() statement. This way, the string mangling is simpler and only gets run when DMGCP is actually on debug log level. Change-Id: Id6877ed7fd7dbe009b2ece8792d5160d040c1aaa --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 5 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/69/12269/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 2a8cc15..fc9c5d3 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -735,26 +735,15 @@ static int mgcp_do_write(struct osmo_fd *fd, struct msgb *msg) { int ret; - static char strbuf[4096]; - unsigned int l = msg->len < sizeof(strbuf) ? msg->len : sizeof(strbuf); - unsigned int i; - osmo_strlcpy(strbuf, (const char*)msg->data, l); - for (i = 0; i < sizeof(strbuf); i++) { - if (strbuf[i] == '\n' || strbuf[i] == '\r') { - strbuf[i] = '\0'; - break; - } - } - DEBUGP(DLMGCP, "Tx MGCP msg to MGCP GW: '%s'\n", strbuf); - - LOGP(DLMGCP, LOGL_DEBUG, "Sending msg to MGCP GW size: %u\n", msg->len); + LOGP(DLMGCP, LOGL_DEBUG, "Sending msg to MGCP GW size: len=%u '%s'...\n", + msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len))); ret = write(fd->fd, msg->data, msg->len); if (ret != msg->len) - LOGP(DLMGCP, LOGL_ERROR, "Failed to forward message to MGCP" - " GW: %s\n", strerror(errno)); - + LOGP(DLMGCP, LOGL_ERROR, "Failed to Tx MGCP: %d='%s'; msg: len=%u '%s'...\n", + errno, strerror(errno), + msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len))); return ret; } -- To view, visit https://gerrit.osmocom.org/12269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id6877ed7fd7dbe009b2ece8792d5160d040c1aaa Gerrit-Change-Number: 12269 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 03:49:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 03:49:13 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: logging tweaks Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12270 Change subject: mgcp_client: logging tweaks ...................................................................... mgcp_client: logging tweaks Fix typos, use osmo_sock_get_name2() to show the tx source and target IP:port, shorten some wording. Depends: I8ad89ac447c9c582742e70d082072bdd40a5a398 (libosmocore) Change-Id: Iae728192f499330d16836d9435648f6b8ed213b6 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/70/12270/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index fc9c5d3..f5eee95 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -717,11 +717,13 @@ ret = read(fd->fd, msg->data, 4096 - 128); if (ret <= 0) { - LOGP(DLMGCP, LOGL_ERROR, "Failed to read: %d/%s\n", errno, strerror(errno)); + LOGP(DLMGCP, LOGL_ERROR, "Failed to read: %s: %d='%s'\n", osmo_sock_get_name2(fd->fd), + errno, strerror(errno)); + msgb_free(msg); return -1; } else if (ret > 4096 - 128) { - LOGP(DLMGCP, LOGL_ERROR, "Too much data: %d\n", ret); + LOGP(DLMGCP, LOGL_ERROR, "Too much data: %s: %d\n", osmo_sock_get_name2(fd->fd), ret); msgb_free(msg); return -1; } @@ -736,13 +738,13 @@ { int ret; - LOGP(DLMGCP, LOGL_DEBUG, "Sending msg to MGCP GW size: len=%u '%s'...\n", - msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len))); + LOGP(DLMGCP, LOGL_DEBUG, "Tx MGCP: %s: len=%u '%s'...\n", + osmo_sock_get_name2(fd->fd), msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len))); ret = write(fd->fd, msg->data, msg->len); if (ret != msg->len) - LOGP(DLMGCP, LOGL_ERROR, "Failed to Tx MGCP: %d='%s'; msg: len=%u '%s'...\n", - errno, strerror(errno), + LOGP(DLMGCP, LOGL_ERROR, "Failed to Tx MGCP: %s: %d='%s'; msg: len=%u '%s'...\n", + osmo_sock_get_name2(fd->fd), errno, strerror(errno), msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len))); return ret; } @@ -803,12 +805,12 @@ /* Choose a new port number to try next */ LOGP(DLMGCP, LOGL_NOTICE, - "MGCPGW faild to bind to port %u, retrying with port %u -- check configuration!\n", - mgcp->actual.local_port, mgcp->actual.local_port + 1); + "MGCPGW failed to bind to %s:%u, retrying with port %u\n", + mgcp->actual.local_addr, mgcp->actual.local_port, mgcp->actual.local_port + 1); mgcp->actual.local_port++; } - LOGP(DLMGCP, LOGL_FATAL, "MGCPGW faild to find a port to bind on %i times.\n", i); + LOGP(DLMGCP, LOGL_FATAL, "MGCPGW failed to find a port to bind on %i times.\n", i); return -EINVAL; } @@ -846,9 +848,7 @@ wq->read_cb = mgcp_do_read; wq->write_cb = mgcp_do_write; - LOGP(DLMGCP, LOGL_INFO, "MGCP GW connection: %s:%u -> %s:%u\n", - mgcp->actual.local_addr, mgcp->actual.local_port, - mgcp->actual.remote_addr, mgcp->actual.remote_port); + LOGP(DLMGCP, LOGL_INFO, "MGCP GW connection: %s\n", osmo_sock_get_name2(wq->bfd.fd)); return 0; error_close_fd: -- To view, visit https://gerrit.osmocom.org/12270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iae728192f499330d16836d9435648f6b8ed213b6 Gerrit-Change-Number: 12270 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 09:02:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 09:02:10 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Patch Set 13: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 13 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Dec 2018 09:02:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 09:03:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 09:03:58 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass2() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass2() ...................................................................... Patch Set 28: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 28 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Dec 2018 09:03:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 09:06:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 09:06:23 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Patch Set 4: Code-Review-2 I really don't like to disable this by default, nor the warning. A 3GPP (compliant, compatible, inspired) network records privacy related information all over the place. -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 09:06:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 09:34:13 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 09:34:13 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... msgb: add test helpers It's often handy to compare certain msgb layer to a given array and print the position where they differ. Add simple pretty-printer and corresponding L* wrappers. Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 --- M include/osmocom/core/msgb.h M src/msgb.c 2 files changed, 231 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index 1bb5fe5..b7c8422 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -560,6 +560,145 @@ return lbound <= msg->head + msg->data_len; } + +/* msgb data comparison helpers */ + +/*! Compare: check data in msgb against given data + * \param[in] msg message buffer + * \param[in] data expected data + * \param[in] len length of data + * \returns boolean indicating whether msgb content is equal to the given data + */ +#define msgb_eq_data(msg, data, len) \ + _msgb_eq(__FILE__, __LINE__, __func__, 0, msg, data, len, false) + +/*! Compare: check L1 data in msgb against given data + * \param[in] msg message buffer + * \param[in] data expected L1 data + * \param[in] len length of data + * \returns boolean indicating whether msgb L1 content is equal to the given data + */ +#define msgb_eq_l1_data(msg, data, len) \ + _msgb_eq(__FILE__, __LINE__, __func__, 1, msg, data, len, false) + +/*! Compare: check L2 data in msgb against given data + * \param[in] msg message buffer + * \param[in] data expected L2 data + * \param[in] len length of data + * \returns boolean indicating whether msgb L2 content is equal to the given data + */ +#define msgb_eq_l2_data(msg, data, len) \ + _msgb_eq(__FILE__, __LINE__, __func__, 2, msg, data, len, false) + +/*! Compare: check L3 data in msgb against given data + * \param[in] msg message buffer + * \param[in] data expected L3 data + * \param[in] len length of data + * \returns boolean indicating whether msgb L3 content is equal to the given data + */ +#define msgb_eq_l3_data(msg, data, len) \ + _msgb_eq(__FILE__, __LINE__, __func__, 3, msg, data, len, false) + +/*! Compare: check L4 data in msgb against given data + * \param[in] msg message buffer + * \param[in] data expected L4 data + * \param[in] len length of data + * \returns boolean indicating whether msgb L4 content is equal to the given data + */ +#define msgb_eq_l4_data(msg, data, len) \ + _msgb_eq(__FILE__, __LINE__, __func__, 4, msg, data, len, false) + + +/* msgb test/debug helpers */ + +/*! Compare and print: check data in msgb against given data and print errors if any + * \param[in] msg message buffer + * \param[in] data expected data + * \param[in] len length of data + * \returns boolean indicating whether msgb content is equal to the given data + */ +#define msgb_eq_data_print(msg, data, len) \ + _msgb_eq(__FILE__, __LINE__, __func__, 0, msg, data, len, true) + +/*! Compare and print: check L1 data in msgb against given data and print errors if any + * \param[in] msg message buffer + * \param[in] data expected L1 data + * \param[in] len length of data + * \returns boolean indicating whether msgb L1 content is equal to the given data + */ +#define msgb_eq_l1_data_print(msg, data, len) \ + _msgb_eq(__FILE__, __LINE__, __func__, 1, msg, data, len, true) + +/*! Compare and print: check L2 data in msgb against given data and print errors if any + * \param[in] msg message buffer + * \param[in] data expected L2 data + * \param[in] len length of data + * \returns boolean indicating whether msgb L2 content is equal to the given data + */ +#define msgb_eq_l2_data_print(msg, data, len) \ + _msgb_eq(__FILE__, __LINE__, __func__, 2, msg, data, len, true) + +/*! Compare and print: check L3 data in msgb against given data and print errors if any + * \param[in] msg message buffer + * \param[in] data expected L3 data + * \param[in] len length of data + * \returns boolean indicating whether msgb L3 content is equal to the given data + */ +#define msgb_eq_l3_data_print(msg, data, len) \ + _msgb_eq(__FILE__, __LINE__, __func__, 3, msg, data, len, true) + + +/*! Compare and print: check L4 data in msgb against given data and print errors if any + * \param[in] msg message buffer + * \param[in] data expected L4 data + * \param[in] len length of data + * \returns boolean indicating whether msgb L4 content is equal to the given data + */ +#define msgb_eq_l4_data_print(msg, data, len) \ + _msgb_eq(__FILE__, __LINE__, __func__, 4, msg, data, len, true) + +bool _msgb_eq(const char *file, size_t line, const char *func, uint8_t level, + const struct msgb *msg, const uint8_t *data, size_t len, bool print); + + +/* msgb data comparison */ + +/*! Compare msgbs + * \param[in] msg1 message buffer + * \param[in] msg2 reference message buffer + * \returns boolean indicating whether msgb content is equal + */ +#define msgb_eq(msg1, msgb2, len) msgb_eq_data(msg1, msgb_data(msg2), msgb_length(msg2)) + +/*! Compare msgbs L1 content + * \param[in] msg1 message buffer + * \param[in] msg2 reference message buffer + * \returns boolean indicating whether msgb L1 content is equal + */ +#define msgb_eq_l1(msg1, msgb2, len) msgb_eq_l1_data(msg1, msgb_l1(msg2), msgb_l1len(msg2)) + +/*! Compare msgbs L2 content + * \param[in] msg1 message buffer + * \param[in] msg2 reference message buffer + * \returns boolean indicating whether msgb L2 content is equal + */ +#define msgb_eq_l2(msg1, msgb2, len) msgb_eq_l2_data(msg1, msgb_l2(msg2), msgb_l2len(msg2)) + +/*! Compare msgbs L3 content + * \param[in] msg1 message buffer + * \param[in] msg2 reference message buffer + * \returns boolean indicating whether msgb L3 content is equal + */ +#define msgb_eq_l3(msg1, msgb2, len) msgb_eq_l3_data(msg1, msgb_l3(msg2), msgb_l3len(msg2)) + +/*! Compare msgbs L4 content + * \param[in] msg1 message buffer + * \param[in] msg2 reference message buffer + * \returns boolean indicating whether msgb L4 content is equal + */ +#define msgb_eq_l4(msg1, msgb2, len) msgb_eq_l4_data(msg1, msgb_l4(msg2), msgb_l4len(msg2)) + + /* non inline functions to ease binding */ uint8_t *msgb_data(const struct msgb *msg); diff --git a/src/msgb.c b/src/msgb.c index 844cfc6..9cd59c6 100644 --- a/src/msgb.c +++ b/src/msgb.c @@ -173,6 +173,98 @@ return msg->data; } +/*! Compare and print: check data in msgb against given data and print errors if any + * \param[in] file text prefix, usually __FILE__, ignored if print == false + * \param[in] line numeric prefix, usually __LINE__, ignored if print == false + * \param[in] func text prefix, usually __func__, ignored if print == false + * \param[in] level while layer (L1, L2 etc) data should be compared against + * \param[in] msg message buffer + * \param[in] data expected data + * \param[in] len length of data + * \param[in] print boolean indicating whether we should print anything to stdout + * \returns boolean indicating whether msgb content is equal to a given data + * + * This function is not intended to be called directly but rather used through corresponding macro wrappers. + */ +bool _msgb_eq(const char *file, size_t line, const char *func, uint8_t level, + const struct msgb *msg, const uint8_t *data, size_t len, bool print) +{ + const char *m_dump; + unsigned int m_len, i; + uint8_t *m_data; + + if (!msg) { + if (print) + LOGPSRC(DLGLOBAL, LOGL_FATAL, file, line, "%s() NULL msg comparison\n", func); + return false; + } + + if (!data) { + if (print) + LOGPSRC(DLGLOBAL, LOGL_FATAL, file, line, "%s() NULL comparison data\n", func); + return false; + } + + switch (level) { + case 0: + m_len = msgb_length(msg); + m_data = msgb_data(msg); + m_dump = print ? msgb_hexdump(msg) : NULL; + break; + case 1: + m_len = msgb_l1len(msg); + m_data = msgb_l1(msg); + m_dump = print ? msgb_hexdump_l1(msg) : NULL; + break; + case 2: + m_len = msgb_l2len(msg); + m_data = msgb_l2(msg); + m_dump = print ? msgb_hexdump_l2(msg) : NULL; + break; + case 3: + m_len = msgb_l3len(msg); + m_data = msgb_l3(msg); + m_dump = print ? msgb_hexdump_l3(msg) : NULL; + break; + case 4: + m_len = msgb_l4len(msg); + m_data = msgb_l4(msg); + m_dump = print ? msgb_hexdump_l4(msg) : NULL; + break; + default: + LOGPSRC(DLGLOBAL, LOGL_FATAL, file, line, + "%s() FIXME: unexpected comparison level %u\n", func, level); + return false; + } + + if (m_len != len) { + if (print) + LOGPSRC(DLGLOBAL, LOGL_FATAL, file, line, + "%s() Length mismatch: %d != %zu, %s\n", func, m_len, len, m_dump); + return false; + } + + if (memcmp(m_data, data, len) == 0) + return true; + + if (!print) + return false; + + LOGPSRC(DLGLOBAL, LOGL_FATAL, file, line, + "%s() L%u data mismatch:\nexpected %s\n ", func, level, osmo_hexdump(data, len)); + + for(i = 0; i < len; i++) + if (data[i] != m_data[i]) { + LOGPC(DLGLOBAL, LOGL_FATAL, "!!\n"); + break; + } else + LOGPC(DLGLOBAL, LOGL_FATAL, ".. "); + + LOGPC(DLGLOBAL, LOGL_FATAL, " msgb %s\n", m_dump); + + return false; +} + /*! get length of message buffer * \param[in] msg message buffer * \returns length of data section in message buffer -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 14 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 09:36:39 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Dec 2018 09:36:39 +0000 Subject: Change in docker-playground[master]: osmo-msc: set bind ip for SGs-interface In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12248 ) Change subject: osmo-msc: set bind ip for SGs-interface ...................................................................... Patch Set 1: > (1 comment) I have now put 0.0.0.0 as default, so it works without configuring and we can abandon this. -- To view, visit https://gerrit.osmocom.org/12248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf2c36d253ce13a61fb98b4afd1739e1c321bb4b Gerrit-Change-Number: 12248 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 12 Dec 2018 09:36:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 09:36:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Dec 2018 09:36:48 +0000 Subject: Change in docker-playground[master]: osmo-msc: set bind ip for SGs-interface In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/12248 ) Change subject: osmo-msc: set bind ip for SGs-interface ...................................................................... Abandoned not needed anymore -- To view, visit https://gerrit.osmocom.org/12248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Icf2c36d253ce13a61fb98b4afd1739e1c321bb4b Gerrit-Change-Number: 12248 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 09:49:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 09:49:14 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11827 to look at the new patch set (#24). Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... LCLS, TS 29.205: add GCR routines Add functions to encode and decode Global Call Reference as per 3GPP TS 29.205 Table B 2.1.9.1 add corresponding tests. Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Related: OS#2487 --- M include/Makefile.am M include/osmocom/gsm/gsm0808_utils.h A include/osmocom/gsm/gsm29205.h M src/gsm/Makefile.am A src/gsm/gsm29205.c M src/gsm/libosmogsm.map M tests/Makefile.am A tests/gsm29205/gsm29205_test.c A tests/gsm29205/gsm29205_test.ok M tests/testsuite.at 10 files changed, 263 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/11827/24 -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 24 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 09:49:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 09:49:14 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12020 to look at the new patch set (#18). Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... LCLS, TS 48.008: add GCR IE encoding/decoding * add functions to encode Global Call. Ref. from TS 29.205 as 3GPP TS 48.008 ?3.2.2.115 information element * add corresponding tests Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 123 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/12020/18 -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 18 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 09:53:43 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 09:53:43 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 18: (2 comments) https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c at 586 PS4, Line 586: { > It's "better" using {0} for two reasons, but after reading in lots of places about the topic, there' [?] Since the opinions differ I'd rather keep the code as it is because I find it easier to read. I've read Neels argument but have not found it convincing. https://gerrit.osmocom.org/#/c/12020/17/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/17/tests/gsm0808/gsm0808_test.c at 1864 PS17, Line 1864: void *ctx = talloc_named_const(NULL, 0, "gsm0808 test"); > and possibly trace the logging in expected stderr output No output is expected on stderr as long as test passes. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 18 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 09:53:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 09:56:26 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 09:56:26 +0000 Subject: Change in osmo-sgsn[master]: remove pointless declaration of struct gsm_network In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12242 ) Change subject: remove pointless declaration of struct gsm_network ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12242/1/src/gprs/sgsn_ctrl.c File src/gprs/sgsn_ctrl.c: https://gerrit.osmocom.org/#/c/12242/1/src/gprs/sgsn_ctrl.c at 64 PS1, Line 64: struct ctrl_handle *sgsn_controlif_setup(void *data, const char *bind_addr, uint16_t port) > I think it's even more confusing this way. If parameter is unused than simply drop the parameter. In fact, entire function is trivial one-line wrapper used in single place. Better drop it completely and just call ctrl_interface_setup_dynip() directly from main(). -- To view, visit https://gerrit.osmocom.org/12242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Gerrit-Change-Number: 12242 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 09:56:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 09:56:35 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Dec 2018 09:56:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: fix pattern warning In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12237 ) Change subject: MGCP: fix pattern warning ...................................................................... Patch Set 1: (2 comments) > Patch Set 2: Code-Review+1 https://gerrit.osmocom.org/#/c/12237/1/library/MGCP_Types.ttcn File library/MGCP_Types.ttcn: https://gerrit.osmocom.org/#/c/12237/1/library/MGCP_Types.ttcn at 57 PS1, Line 57: variant "END('\n', '([\n])|(\n)')" > IIUC that can just be '\n' now in that regex part, without the ()|() stuff? As far as I know there is always a second separator line between MGCP and SDP. I might be wrong since I am no good with REGEX anyway... https://gerrit.osmocom.org/#/c/12237/1/library/MGCP_Types.ttcn at 94 PS1, Line 94: //variant "END('\r\n', '(\n)|(\r\n)')" > (also drop this?) (I would drop all commented lines in this file) -- To view, visit https://gerrit.osmocom.org/12237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99948e4b82b5b4bd5b8f7c1a4c60a97fcab3c0eb Gerrit-Change-Number: 12237 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 12 Dec 2018 09:56:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 10:04:53 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Dec 2018 10:04:53 +0000 Subject: Change in osmo-bsc[master]: abisip-find: add getopts and option to prevent endless loop In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/5239 ) Change subject: abisip-find: add getopts and option to prevent endless loop ...................................................................... Patch Set 2: (1 comment) > (1 comment) > > (posting forgotten Draft comments, may be hoplessly outdated now. > Easiest to get rid of them is to just "Reply", so bear with me, > thx) Thanks, but this is abandoned anyway, maybe I get back to this when I run into the problem next time. https://gerrit.osmocom.org/#/c/5239/1/src/ipaccess/abisip-find.c File src/ipaccess/abisip-find.c: https://gerrit.osmocom.org/#/c/5239/1/src/ipaccess/abisip-find.c at 212 PS1, Line 212: > ws fix... Done -- To view, visit https://gerrit.osmocom.org/5239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I819b9616282dd6efd36c9557c7d6a50b6b00cdc2 Gerrit-Change-Number: 5239 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Neels Hofmeyr Gerrit-CC: dexter Gerrit-Comment-Date: Wed, 12 Dec 2018 10:04:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 10:06:09 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 10:06:09 +0000 Subject: Change in openbsc[master]: CTRL: remove boilerplate In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/1576 ) Change subject: CTRL: remove boilerplate ...................................................................... Patch Set 5: > Easiest to get rid of them is to just "Reply", so bear with me You mean you've saved yourself 2 mouse clicks to publish instead of discard? In future, please try to choose slightly less easy solution to avoid spamming people - clicking couple of times is hardly a backbreaking effort. -- To view, visit https://gerrit.osmocom.org/1576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5bcea0b4f4b8f535bef2b423f2013b8b4a218b5b Gerrit-Change-Number: 1576 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Wed, 12 Dec 2018 10:06:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From nhofmeyr at sysmocom.de Wed Dec 12 10:54:48 2018 From: nhofmeyr at sysmocom.de (Neels Hofmeyr) Date: Wed, 12 Dec 2018 11:54:48 +0100 Subject: build slave segfaults In-Reply-To: <2010217903.1228.1544575979322.JavaMail.jenkins@jenkins.osmocom.org> References: <2010217903.1228.1544575979322.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <20181212105448.GC1926@my.box> I see sporadic segfaults during jenkins builds every now and then... Let's keep an eye on it. This one built on build2-deb9build-ansible ~N On Wed, Dec 12, 2018 at 12:52:59AM +0000, jenkins at lists.osmocom.org wrote: > See > ... > CC auth_milenage.lo > /bin/bash: line 2: 6091 Segmentation fault (core dumped) /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT auth_milenage.lo -MD -MP -MF $depbase.Tpo -c -o auth_milenage.lo auth_milenage.c > make[3]: *** [auth_milenage.lo] Error 139 > Makefile:582: recipe for target 'auth_milenage.lo' failed > make[3]: *** Waiting for unfinished jobs.... > make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 11:05:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 11:05:40 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 1: actually, the same applies to the osmo-msc patch. Please add 'no ipa-name' -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 11:05:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 11:07:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 11:07:50 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12243/1/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/1/src/gprs/sgsn_vty.c at 1376 PS1, Line 1376: install_element(SGSN_NODE, &cfg_sgsn_ipa_name_cmd); kind of a weird spot to put it, right in the middle of the ggsn cfg :) better fit is below with the gsup stuff -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 11:07:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 11:08:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 11:08:36 +0000 Subject: Change in osmo-msc[master]: vty: show subscriber: put() before printing the use count In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12266 ) Change subject: vty: show subscriber: put() before printing the use count ...................................................................... Patch Set 1: looks a bit like a hack and rely on not-really-always-guaranteed-behavior. I guess the cleaner way would be to tell the printing function to subtract one.. -- To view, visit https://gerrit.osmocom.org/12266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id02b57b7ed299b010b9f8b9e809548eb1e6aa699 Gerrit-Change-Number: 12266 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 12 Dec 2018 11:08:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 11:09:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 11:09:04 +0000 Subject: Change in osmo-msc[master]: log: by default start with all categories on LOGL_NOTICE In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12267 ) Change subject: log: by default start with all categories on LOGL_NOTICE ...................................................................... Patch Set 1: Code-Review+2 please consider this for other osmo-* projects, too. -- To view, visit https://gerrit.osmocom.org/12267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b46e9107a7a1d81a44d2a2eb855c10960a1ab6b Gerrit-Change-Number: 12267 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 12 Dec 2018 11:09:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 11:33:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 11:33:01 +0000 Subject: Change in osmo-msc[master]: vty: show subscriber: put() before printing the use count In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12266 ) Change subject: vty: show subscriber: put() before printing the use count ...................................................................... Patch Set 1: > looks a bit like a hack and rely on not-really-always-guaranteed-behavior. I guess the cleaner way would be to tell the printing function to subtract one.. I thought about that, but then also the 'show subscriber cache' iterates subscribers without get()ting them. And, since this is not multithreaded, there actually is no way how a subscriber can exist before this invocation and then be discarded by the put(). By definition we only find subscribers with a use count initially >= 1, and this count cannot decrease externally while the vty command is running. right? Instead, printing a use count that is not actually there is IMHO the hacky solution. Thinking if we might at some point add a used-by bitflag like for ran_conn, then we'd have to hack around in that, too... I guess the least hacky is to always get() and put() and expect a use count of 2 on the vty output. Yet ... the single-threaded-there-is-no-way-to-lose-the-vsub argument makes sense to me. Further opinions welcome... -- To view, visit https://gerrit.osmocom.org/12266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id02b57b7ed299b010b9f8b9e809548eb1e6aa699 Gerrit-Change-Number: 12266 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 12 Dec 2018 11:33:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 11:34:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 11:34:17 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12236 ) Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... Patch Set 2: Code-Review+1 trying out whether we have +3 now... -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 11:34:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 11:34:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 11:34:37 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... Removed Code-Review+1 by Neels Hofmeyr -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 11:37:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 11:37:10 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12236 ) Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12236/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12236/1//COMMIT_MSG at 12 PS1, Line 12: have to be the same as for WAIT_SUB_PRES, i.e. also WAIT_IMEI_TMSI and > Don't you mean WAIT_IMEI_TMSI (IMEI, not IEMI)? :-P now you're confusing me! There is no IEMI, is there?? if you carry on I will write WAUT_UNEU_UNSU -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 11:37:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 12:14:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 12:14:34 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 18: (1 comment) https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c at 586 PS4, Line 586: { > Since the opinions differ I'd rather keep the code as it is because I find it easier to read. [?] Pretty poor show, guys, how you dismiss a sound argument by not naming sources nor examples (Pau) and not even mentioning why it is not convincing (Max). If you declare the argument closed, then have something to show for it besides "I once read somewhere" and "nah you know, mh-nah". It makes me not want to spend time on your code. I'm going to let this one go because it's just a zero, but next time please be a little more considerate. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 18 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 12:14:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From pespin at sysmocom.de Wed Dec 12 12:26:45 2018 From: pespin at sysmocom.de (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 13:26:45 +0100 Subject: build slave segfaults In-Reply-To: <20181212105448.GC1926@my.box> References: <2010217903.1228.1544575979322.JavaMail.jenkins@jenkins.osmocom.org> <20181212105448.GC1926@my.box> Message-ID: <8d590832-e52d-cedf-c1fe-2c08f691a26f@sysmocom.de> There's no much we can do about that other than opening an OBS bug report. It's a segfault in either bash or libtool, so not related to us. It could be a bug in bash/libtool or even on the virtualization layer being used by OBS to run containers. Regards, Pau -- - Pau Espin Pedrol http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschaeftsfuehrer / Managing Director: Harald Welte From gerrit-no-reply at lists.osmocom.org Wed Dec 12 12:33:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 12:33:39 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c at 586 PS4, Line 586: struct gsm29205_gcr g = { .net_len = 3, .node = 0xDEAD }, p = { 0 }; > Pretty poor show, guys, how you dismiss a sound argument by not naming sources nor examples (Pau) an [?] You could call your show about answering one week later poor too, I may have remembered better what I read and could more easily provide more feedback, and I already lost too much time with this detail, I don't want to spend it a second time trying to find the exact commit and web page with the information. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 12:33:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 12:35:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 12:35:02 +0000 Subject: Change in osmo-mgw[master]: check_rtp: on IP:port errors, log the IP and port In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12265 ) Change subject: check_rtp: on IP:port errors, log the IP and port ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e98d464a27038904797c5c10735a98ef5b7b9c3 Gerrit-Change-Number: 12265 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 12:35:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 12:46:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 12:46:30 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 18: (1 comment) https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c at 586 PS4, Line 586: { No need to be bitter about it: it's not the first time people disagree with you (or me, or Pau...) nor the last. > you dismiss a sound argument If you find it sound it doesn't mean others would automatically share your opinion. Here're some more details since you insist: > memset() is the byte hacking way and I don't like it... It's a standard function and your liking/disliking it is irrelevant and hardly a sound argument. > just 'var = {0}' doesn't work you need to supply the type name to the compiler (unless it is a new variable declaration init... Irrelevant in this case because "it's a new variable declaration init". > the struct variable is part of ran_conn... Irrelevant again - it's standalone struct which we initialize entirely. > to write "{0}" means that I indicate the first item's value to be zero... The only part of your link which is actually applicable to the code you're commenting on. Yes, initializing via {} is equivalent to {0} precisely because {} initialize entire thing with 0 and { x } initialize first byte with x and the rest with 0. And yes, it's "more general" if you will. But nobody have argued with those points to begin with. My point was (and still is) that it's easier to read the code because the 0 immediately reminds you how the rest is initialized. That's also seems to be preferred variant in libosmocore so far according to git grep. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 18 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 12:46:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 12:49:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 12:49:09 +0000 Subject: Change in libosmocore[master]: add to osmo_sock_get_name*() API In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12268 ) Change subject: add to osmo_sock_get_name*() API ...................................................................... Patch Set 1: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/12268/1/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/#/c/12268/1/include/osmocom/core/socket.h at 63 PS1, Line 63: const char *osmo_sock_get_name2(int fd); what about osmo_sock_get_name_static()? https://gerrit.osmocom.org/#/c/12268/1/include/osmocom/core/socket.h at 64 PS1, Line 64: int osmo_sock_get_name2_buf(char *str, size_t str_len, int fd); no need to have a 2 here. https://gerrit.osmocom.org/#/c/12268/1/src/socket.c File src/socket.c: https://gerrit.osmocom.org/#/c/12268/1/src/socket.c at 796 PS1, Line 796: * \param[out] str Destination string buffer. 2 whitespace here and in next line. -- To view, visit https://gerrit.osmocom.org/12268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 Gerrit-Change-Number: 12268 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 12:49:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 12:55:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 12:55:32 +0000 Subject: Change in osmo-mgw[master]: drop/replace very weird logging in mgcp_client.c In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12269 ) Change subject: drop/replace very weird logging in mgcp_client.c ...................................................................... Patch Set 1: Code-Review+1 Leaving +2 until dexter has a look at it. -- To view, visit https://gerrit.osmocom.org/12269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6877ed7fd7dbe009b2ece8792d5160d040c1aaa Gerrit-Change-Number: 12269 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 12 Dec 2018 12:55:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 12:58:32 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 12:58:32 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12271 Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Use msgb helper instead of local #define for debug print This change was made using following spatch program: @@ expression a, b, c; @@ - VERIFY(a, b, c); + if (!msgb_eq_l3_data_print(a, b, c)) + abort(); Which was applied as follows: spatch --in-place --sp-file verif.spatch tests/gsm0808/gsm0808_test.c Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b --- M tests/gsm0808/gsm0808_test.c 1 file changed, 62 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/12271/1 diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 63b8720..a31e7d4 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -116,7 +116,8 @@ msgb_v_put(in_msg, 0x23); msg = gsm0808_create_layer3_2(in_msg, &cgi, NULL); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); msgb_free(in_msg); } @@ -152,7 +153,8 @@ msg = gsm0808_create_layer3_2(in_msg, &cgi, &sc_list); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); msgb_free(in_msg); @@ -165,7 +167,8 @@ printf("Testing creating Reset\n"); msg = gsm0808_create_reset(); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -176,7 +179,8 @@ printf("Testing creating Reset Ack\n"); msg = gsm0808_create_reset_ack(); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -188,7 +192,8 @@ printf("Testing creating Clear Command\n"); msg = gsm0808_create_clear_command(0x23); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -199,7 +204,8 @@ printf("Testing creating Clear Complete\n"); msg = gsm0808_create_clear_complete(); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -234,12 +240,14 @@ printf("Testing creating Chipher Mode Command\n"); msg = gsm0808_create_cipher(&ei, NULL); OSMO_ASSERT(msg); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); msg = gsm0808_create_cipher(&ei, &include_imeisv); OSMO_ASSERT(msg); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); } @@ -259,19 +267,22 @@ /* with l3 data */ msg = gsm0808_create_cipher_complete(l3, 4); - VERIFY(msg, res1, ARRAY_SIZE(res1)); + if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1))) + abort(); msgb_free(msg); /* with l3 data but short */ l3->len -= 1; l3->tail -= 1; msg = gsm0808_create_cipher_complete(l3, 4); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); /* without l3 data */ msg = gsm0808_create_cipher_complete(NULL, 4); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); @@ -308,7 +319,8 @@ printf("Testing creating Cipher Reject\n"); msg = gsm0808_create_cipher_reject(cause); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); parse_cipher_reject(msg, cause); @@ -323,7 +335,8 @@ printf("Testing creating Cipher Reject (extended)\n"); msg = gsm0808_create_cipher_reject_ext(GSM0808_CAUSE_CLASS_INVAL, cause); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); parse_cipher_reject(msg, cause); @@ -342,12 +355,14 @@ printf("Testing creating CM U\n"); msg = gsm0808_create_classmark_update(&cm2, 1, &cm3, 1); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); msg = gsm0808_create_classmark_update(&cm2, 1, NULL, 0); - VERIFY(msg, res2o, ARRAY_SIZE(res2o)); + if (!msgb_eq_l3_data_print(msg, res2o, ARRAY_SIZE(res2o))) + abort(); msgb_free(msg); } @@ -359,7 +374,8 @@ printf("Testing creating SAPI Reject\n"); msg = gsm0808_create_sapi_reject(3); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -404,12 +420,14 @@ printf("Testing creating Assignment Request\n"); msg = gsm0808_create_ass(&ct, &cic, NULL, NULL, NULL); OSMO_ASSERT(msg); - VERIFY(msg, res1, ARRAY_SIZE(res1)); + if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1))) + abort(); msgb_free(msg); msg = gsm0808_create_ass(&ct, &cic, &ss, &sc_list, &call_id); OSMO_ASSERT(msg); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); } @@ -424,11 +442,13 @@ printf("Testing creating Assignment Complete\n"); msg = gsm0808_create_assignment_completed(0x23, 0x42, 0x11, 0x22); - VERIFY(msg, res1, ARRAY_SIZE(res1)); + if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1))) + abort(); msgb_free(msg); msg = gsm0808_create_assignment_completed(0x23, 0x42, 0x11, 0); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); } @@ -464,7 +484,8 @@ printf("Testing creating Assignment Complete (AoIP)\n"); msg = gsm0808_create_ass_compl(0x23, 0x42, 0x11, 0x22, &ss, &sc, &sc_list); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -478,11 +499,13 @@ printf("Testing creating Assignment Failure\n"); msg = gsm0808_create_assignment_failure(0x23, NULL); - VERIFY(msg, res1, ARRAY_SIZE(res1)); + if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1))) + abort(); msgb_free(msg); msg = gsm0808_create_assignment_failure(0x23, &rr_res); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); } @@ -504,11 +527,13 @@ printf("Testing creating Assignment Failure (AoIP)\n"); msg = gsm0808_create_ass_fail(0x23, NULL, &sc_list); - VERIFY(msg, res1, ARRAY_SIZE(res1)); + if (!msgb_eq_l3_data_print(msg, res1, ARRAY_SIZE(res1))) + abort(); msgb_free(msg); msg = gsm0808_create_ass_fail(0x23, &rr_res, &sc_list); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); } @@ -519,7 +544,8 @@ printf("Testing creating Clear Request\n"); msg = gsm0808_create_clear_rqst(0x23); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); } @@ -551,15 +577,18 @@ printf("Testing creating Paging Request\n"); msg = gsm0808_create_paging2(imsi, NULL, &cil, NULL); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); msg = gsm0808_create_paging2(imsi, &tmsi, &cil, NULL); - VERIFY(msg, res2, ARRAY_SIZE(res2)); + if (!msgb_eq_l3_data_print(msg, res2, ARRAY_SIZE(res2))) + abort(); msgb_free(msg); msg = gsm0808_create_paging2(imsi, &tmsi, &cil, &chan_needed); - VERIFY(msg, res3, ARRAY_SIZE(res3)); + if (!msgb_eq_l3_data_print(msg, res3, ARRAY_SIZE(res3))) + abort(); msgb_free(msg); } @@ -575,7 +604,8 @@ msgb_v_put(l3, 0x42); msg = gsm0808_create_dtap(l3, 0x3); - VERIFY(msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(msg); msgb_free(l3); } @@ -593,7 +623,8 @@ gsm0808_prepend_dtap_header(in_msg, 0x3); in_msg->l3h = in_msg->data; - VERIFY(in_msg, res, ARRAY_SIZE(res)); + if (!msgb_eq_l3_data_print(in_msg, res, ARRAY_SIZE(res))) + abort(); msgb_free(in_msg); } -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 12:58:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 12:58:33 +0000 Subject: Change in libosmocore[master]: cleanup: remove unused define Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12272 Change subject: cleanup: remove unused define ...................................................................... cleanup: remove unused define Change-Id: Ibff603dd581f60b600f2469ad464a0bf77e24bfe --- M tests/gsm0808/gsm0808_test.c 1 file changed, 0 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/12272/1 diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index a31e7d4..23961c8 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -37,19 +37,6 @@ OSMO_ASSERT(rc_enc == msg->len); \ } while(0) -#define VERIFY(msg, data, len) \ - if (msgb_l3len(msg) != len) { \ - printf("%s:%d Length don't match: %d vs. %d. %s\n", \ - __func__, __LINE__, msgb_l3len(msg), (int) len, \ - osmo_hexdump(msg->l3h, msgb_l3len(msg))); \ - abort(); \ - } else if (memcmp(msg->l3h, data, len) != 0) { \ - printf("%s:%d didn't match: got: %s\n", \ - __func__, __LINE__, \ - osmo_hexdump(msg->l3h, msgb_l3len(msg))); \ - abort(); \ - } - /* Setup a fake codec list for testing */ static void setup_codec_list(struct gsm0808_speech_codec_list *scl) { -- To view, visit https://gerrit.osmocom.org/12272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibff603dd581f60b600f2469ad464a0bf77e24bfe Gerrit-Change-Number: 12272 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 12:58:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 12:58:39 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: logging tweaks In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12270 ) Change subject: mgcp_client: logging tweaks ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12270/1/src/libosmo-mgcp-client/mgcp_client.c File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/#/c/12270/1/src/libosmo-mgcp-client/mgcp_client.c at 851 PS1, Line 851: LOGP(DLMGCP, LOGL_INFO, "MGCP GW connection: %s\n", osmo_sock_get_name2(wq->bfd.fd)); Why issuing a syscall if we already have the information stored in a struct? -- To view, visit https://gerrit.osmocom.org/12270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae728192f499330d16836d9435648f6b8ed213b6 Gerrit-Change-Number: 12270 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 12:58:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 12:59:27 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 12:59:27 +0000 Subject: Change in osmo-ci[master]: master-builds: set PUBLISH=0 temporarily In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12137 ) Change subject: master-builds: set PUBLISH=0 temporarily ...................................................................... Abandoned Harald adjusted the config of rita.osmocom.org, now publishing works \o/ http://ftp.osmocom.org/docs/latest/ (see last changed date). Tested with osmo-hlr (without Docker) and osmo-mgw (with Docker) so far, triggered all master jobs once to update the manuals. -- To view, visit https://gerrit.osmocom.org/12137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I946f2e17229d3c602bbe79a72cc37104745ea552 Gerrit-Change-Number: 12137 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:05:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 13:05:53 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12271/1/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12271/1/tests/gsm0808/gsm0808_test.c at 40 PS1, Line 40: #define VERIFY(msg, data, len) \ This one can be dropped then right? -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-CC: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 13:05:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:06:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 13:06:20 +0000 Subject: Change in osmo-ci[master]: Build verification: manuals for the rest Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12273 Change subject: Build verification: manuals for the rest ...................................................................... Build verification: manuals for the rest Build manuals for osmocom-bb and openbsc in gerrit-verifications.yml. Build and publish manuals for osmocom-bb, openbsc and osmo-gsm-tester in master-builds.yml. Following recommendations on the ML, building manuals for osmo-gsm-tester was not done with a new job in gerrit-verifications.yml. It will be done with the existing osmo-gsm-tester_gerrit job (which is generated by osmo-gsm-tester-runner.yml). No changes are necessary for that in osmo-ci.git, see I4ebfe12a164f807b63bc897aff44db83fc0705bd ("contrib/jenkins*: build and publish manuals") in osmo-gsm-tester.git. Related: OS#3385 Change-Id: I2845d14b656f11e3a07107b4f16e8d7a0e3c7bbf --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/73/12273/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index d17934d..20eceef 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -81,6 +81,7 @@ -e MGCP="$MGCP" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e WITH_MANUALS="1" \ -w /build -i -u build \ -v "$PWD:/build" \ -v "$HOME/bin:/build_bin" \ @@ -247,7 +248,8 @@ combination_filter: > (INSTR == "--with-sse" && WITH_MANUALS == "1") - - osmocom-bb + - osmocom-bb: + cmd: WITH_MANUALS=1 ./contrib/jenkins.sh - osmo-tetra - osmo-sysmon - osmo-remsim diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 1b7cdfd..97e193a 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -159,6 +159,8 @@ -e MGCP="$MGCP" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e WITH_MANUALS="1" \ + -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" \ -v "$HOME/bin:/build_bin" \ @@ -220,6 +222,9 @@ # keep first line with less indent to preserve newlines ./contrib/jenkins.sh + - osmo-gsm-tester: + cmd: PUBLISH=1 ./contrib/jenkins-build-manuals.sh + - osmo-hlr: cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh @@ -349,7 +354,9 @@ (INSTR == "--with-sse" && WITH_MANUALS == "1") cmd: PUBLISH=1 ./contrib/jenkins.sh - - osmocom-bb + - osmocom-bb: + cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + - osmo-sysmon - osmo-remsim - simtrace2: -- To view, visit https://gerrit.osmocom.org/12273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2845d14b656f11e3a07107b4f16e8d7a0e3c7bbf Gerrit-Change-Number: 12273 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:07:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 13:07:22 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Patch Set 1: Ah it's done in next patch. I know you wanted to split them based on spatch, but this way adds extra verbosity to history and makes it more difficult to revert for no good reason. -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 13:07:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:08:11 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 13:08:11 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12274 Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. Related: OS#3385 Change-Id: I856e4bc71e1b648de5f27d4044aa60bd0b45e0f5 --- M contrib/jenkins.sh 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/74/12274/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index f886c21..aa02b28 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,4 +1,10 @@ #!/bin/sh +# jenkins build helper script for osmocom-bb. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# set -ex @@ -35,4 +41,15 @@ make done +# Build and publish manuals +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + make -C "$base/doc/manuals" + make -C "$base/doc/manuals" check + + if [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish + fi +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I856e4bc71e1b648de5f27d4044aa60bd0b45e0f5 Gerrit-Change-Number: 12274 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:09:35 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 13:09:35 +0000 Subject: Change in openbsc[master]: contrib/jenkins.sh: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12275 Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. Related: OS#3385 Change-Id: I89be11d346d50169282c991235ffc47dacc30b11 --- M contrib/jenkins.sh 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/75/12275/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5bab5bf..7083976 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,4 +1,13 @@ #!/bin/sh -ex +# jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * IU: configure 3G support (values: "--enable-iu", "--disable-iu") +# * MGCP: configure transcoding for MGCP (values: "--enable-mgcp-transcoding", "--disable-mgcp-transcoding") +# * SMPP: configure the SMPP interface (values: "--enable-smpp", "--disable-smpp") +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# osmo-clean-workspace.sh @@ -59,4 +68,24 @@ . osmo-build.sh +# Build and publish manuals +if [ "$WITH_MANUALS" = "1" ]; then + # Build all manuals first + osmo-build-dep.sh osmo-gsm-manuals + for dir in "$base"/manuals/*/; do + make -C "$dir" + done + + # Run 'make check' for the OsmoNITB manuals. + # The other dirs only have VTY references, so there is no 'make check' target for them. + make -C "$base/manuals/OsmoNITB" check + + # Publish all at once + if [ "$PUBLISH" = "1" ]; then + for dir in "$base"/manuals/*/; do + make -C "$dir" publish + done + fi +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I89be11d346d50169282c991235ffc47dacc30b11 Gerrit-Change-Number: 12275 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 12 13:09:40 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 12 Dec 2018 13:09:40 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-ss?= =?UTF-8?Q?e,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#737?= Message-ID: <1871881363.1246.1544620180589.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 266.38 KB...] make[4]: Leaving directory ' Making install in uhd make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' Making install in lms make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-trx-uhd osmo-trx-usrp1 osmo-trx-lms ' libtool: install: /usr/bin/install -c osmo-trx-uhd libtool: install: /usr/bin/install -c osmo-trx-usrp1 libtool: install: /usr/bin/install -c osmo-trx-lms /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../Transceiver52M/std_inband.rbf ' /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../Transceiver52M/std_inband.rbf ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in contrib make[2]: Entering directory ' Making install in systemd make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../../contrib/systemd/osmo-trx-uhd.service ../../../../contrib/systemd/osmo-trx-usrp1.service ../../../../contrib/systemd/osmo-trx-lms.service ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' Making install in CommonLibs make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in Transceiver52M make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in doc make[2]: Entering directory ' Making installcheck in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'installcheck'. make[3]: Leaving directory ' Making installcheck in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'installcheck'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'installcheck-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making installcheck in CommonLibs make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in GSM make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in Transceiver52M make[2]: Entering directory ' Making installcheck in arch make[3]: Entering directory ' Making installcheck in common make[4]: Entering directory ' make[4]: Nothing to be done for 'installcheck'. make[4]: Leaving directory ' Making installcheck in x86 make[4]: Entering directory ' make[4]: Nothing to be done for 'installcheck'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'installcheck-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' Making installcheck in device make[3]: Entering directory ' Making installcheck in usrp1 make[4]: Entering directory ' make[4]: Nothing to be done for 'installcheck'. make[4]: Leaving directory ' Making installcheck in uhd make[4]: Entering directory ' make[4]: Nothing to be done for 'installcheck'. make[4]: Leaving directory ' Making installcheck in lms make[4]: Entering directory ' make[4]: Nothing to be done for 'installcheck'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'installcheck-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'installcheck-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making installcheck in contrib make[2]: Entering directory ' Making installcheck in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'installcheck'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'installcheck-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making installcheck in tests make[2]: Entering directory ' Making installcheck in CommonLibs make[3]: Entering directory ' make[3]: Nothing to be done for 'installcheck'. make[3]: Leaving directory ' Making installcheck in Transceiver52M make[3]: Entering directory ' make[3]: Nothing to be done for 'installcheck'. make[3]: Leaving directory ' make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' AUTOTEST_PATH=' ## ------------------------------------- ## ## osmo-trx 0.4.0.115-fe865f test suite. ## ## ------------------------------------- ## Regression tests. 1: BitVectorTest ok 2: InterthreadTest ok 3: LogTest ok 4: PRBSTest ok 5: SocketsTest ok 6: TimevalTest FAILED (testsuite.at:38) 7: VectorTest ok 8: convolve_test skipped (testsuite.at:50) ## ------------- ## ## Test results. ## ## ------------- ## ERROR: 7 tests were run, 1 failed unexpectedly. 1 test was skipped. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [osmo-trx 0.4.0.115-fe865f] testsuite: 6 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:692: recipe for target 'installcheck-local' failed make[3]: *** [installcheck-local] Error 1 make[3]: Leaving directory ' Makefile:401: recipe for target 'installcheck-recursive' failed make[2]: *** [installcheck-recursive] Error 1 make[2]: Leaving directory ' Makefile:516: recipe for target 'installcheck-recursive' failed make[1]: *** [installcheck-recursive] Error 1 make[1]: Leaving directory ' Makefile:722: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh ======================== ./osmo-trx-0.4.0.115-fe865f/_build/sub/tests/testsuite.dir/6/testsuite.log # -*- compilation -*- 6. testsuite.at:35: testing TimevalTest ... ../../../tests/testsuite.at:38: $abs_top_builddir/tests/CommonLibs/TimevalTest stderr: 1544620180.158972 elapsed: -10000 now: 1544620170.169126 then: 1544620180.158972 remaining: 9990 now: 1544620170.669290 then: 1544620180.158972 remaining: 9490 now: 1544620173.842233 then: 1544620180.158972 remaining: 6317 now: 1544620174.342361 then: 1544620180.158972 remaining: 5817 now: 1544620174.842480 then: 1544620180.158972 remaining: 5317 now: 1544620175.342601 then: 1544620180.158972 remaining: 4817 now: 1544620175.842720 then: 1544620180.158972 remaining: 4317 now: 1544620176.342848 then: 1544620180.158972 remaining: 3817 now: 1544620176.842964 then: 1544620180.158972 remaining: 3317 now: 1544620177.343086 then: 1544620180.158972 remaining: 2816 now: 1544620177.843202 then: 1544620180.158972 remaining: 2316 now: 1544620178.343325 then: 1544620180.158972 remaining: 1816 now: 1544620178.843448 then: 1544620180.158972 remaining: 1316 now: 1544620179.343597 then: 1544620180.158972 remaining: 816 now: 1544620179.843729 then: 1544620180.158972 remaining: 316 now: 1544620180.343856 then: 1544620180.158972 remaining: -184 TimevalTest: ../../../../tests/CommonLibs/TimevalTest.cpp:61: int main(int, char**): Assertion `loops >= 18' failed. : line 25: 2996 Aborted $abs_top_builddir/tests/CommonLibs/TimevalTest --- expout 2018-12-12 13:09:30.140749044 +0000 +++ 2018-12-12 13:09:30.140749044 +0000 @@ -1 +0,0 @@ -Done ../../../tests/testsuite.at:38: exit code was 134, expected 0 6. testsuite.at:35: 6. TimevalTest (testsuite.at:35): FAILED (testsuite.at:38) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:10:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 13:10:27 +0000 Subject: Change in osmo-ci[master]: Build verification: manuals for the rest In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12273 ) Change subject: Build verification: manuals for the rest ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2845d14b656f11e3a07107b4f16e8d7a0e3c7bbf Gerrit-Change-Number: 12273 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 13:10:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:17:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 13:17:06 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12274 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I856e4bc71e1b648de5f27d4044aa60bd0b45e0f5 Gerrit-Change-Number: 12274 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 13:17:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:17:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 13:17:53 +0000 Subject: Change in openbsc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12275 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I89be11d346d50169282c991235ffc47dacc30b11 Gerrit-Change-Number: 12275 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 12 Dec 2018 13:17:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:19:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 13:19:49 +0000 Subject: Change in osmo-ci[master]: Build verification: manuals for the rest In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12273 ) Change subject: Build verification: manuals for the rest ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2845d14b656f11e3a07107b4f16e8d7a0e3c7bbf Gerrit-Change-Number: 12273 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 12 Dec 2018 13:19:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:20:05 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 13:20:05 +0000 Subject: Change in osmo-ci[master]: Build verification: manuals for the rest In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12273 ) Change subject: Build verification: manuals for the rest ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2845d14b656f11e3a07107b4f16e8d7a0e3c7bbf Gerrit-Change-Number: 12273 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 12 Dec 2018 13:20:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:20:11 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 13:20:11 +0000 Subject: Change in osmo-ci[master]: Build verification: manuals for the rest In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12273 ) Change subject: Build verification: manuals for the rest ...................................................................... Build verification: manuals for the rest Build manuals for osmocom-bb and openbsc in gerrit-verifications.yml. Build and publish manuals for osmocom-bb, openbsc and osmo-gsm-tester in master-builds.yml. Following recommendations on the ML, building manuals for osmo-gsm-tester was not done with a new job in gerrit-verifications.yml. It will be done with the existing osmo-gsm-tester_gerrit job (which is generated by osmo-gsm-tester-runner.yml). No changes are necessary for that in osmo-ci.git, see I4ebfe12a164f807b63bc897aff44db83fc0705bd ("contrib/jenkins*: build and publish manuals") in osmo-gsm-tester.git. Related: OS#3385 Change-Id: I2845d14b656f11e3a07107b4f16e8d7a0e3c7bbf --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved osmith: Looks good to me, but someone else must approve; Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index d17934d..20eceef 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -81,6 +81,7 @@ -e MGCP="$MGCP" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e WITH_MANUALS="1" \ -w /build -i -u build \ -v "$PWD:/build" \ -v "$HOME/bin:/build_bin" \ @@ -247,7 +248,8 @@ combination_filter: > (INSTR == "--with-sse" && WITH_MANUALS == "1") - - osmocom-bb + - osmocom-bb: + cmd: WITH_MANUALS=1 ./contrib/jenkins.sh - osmo-tetra - osmo-sysmon - osmo-remsim diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 1b7cdfd..97e193a 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -159,6 +159,8 @@ -e MGCP="$MGCP" \ -e PATH="$PATH:/build_bin" \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -e WITH_MANUALS="1" \ + -e PUBLISH="1" \ -w /build -i -u build \ -v "$PWD:/build" \ -v "$HOME/bin:/build_bin" \ @@ -220,6 +222,9 @@ # keep first line with less indent to preserve newlines ./contrib/jenkins.sh + - osmo-gsm-tester: + cmd: PUBLISH=1 ./contrib/jenkins-build-manuals.sh + - osmo-hlr: cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh @@ -349,7 +354,9 @@ (INSTR == "--with-sse" && WITH_MANUALS == "1") cmd: PUBLISH=1 ./contrib/jenkins.sh - - osmocom-bb + - osmocom-bb: + cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh + - osmo-sysmon - osmo-remsim - simtrace2: -- To view, visit https://gerrit.osmocom.org/12273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2845d14b656f11e3a07107b4f16e8d7a0e3c7bbf Gerrit-Change-Number: 12273 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:20:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 13:20:38 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12274 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 1: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I856e4bc71e1b648de5f27d4044aa60bd0b45e0f5 Gerrit-Change-Number: 12274 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 12 Dec 2018 13:20:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:20:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 13:20:40 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12274 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. Related: OS#3385 Change-Id: I856e4bc71e1b648de5f27d4044aa60bd0b45e0f5 --- M contrib/jenkins.sh 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve; Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index f886c21..aa02b28 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,4 +1,10 @@ #!/bin/sh +# jenkins build helper script for osmocom-bb. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# set -ex @@ -35,4 +41,15 @@ make done +# Build and publish manuals +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + make -C "$base/doc/manuals" + make -C "$base/doc/manuals" check + + if [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish + fi +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I856e4bc71e1b648de5f27d4044aa60bd0b45e0f5 Gerrit-Change-Number: 12274 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 12 13:22:09 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 12 Dec 2018 13:22:09 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_origin/nr?= =?UTF-8?Q?w/litecell15,0,osmocom-master-debian9,lc15,True_#1068?= Message-ID: <1399662695.1247.1544620929114.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 95.85 KB...] make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c osmo-release.sh ' /usr/bin/install -c -m 644 osmo-release.mk ' /usr/bin/install -c -m 644 libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc ' make install-data-hook make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-hook'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmocore + export PKG_CONFIG_PATH=: + export LD_LIBRARY_PATH= + export PATH=:/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin + [ 0 = 1 ] + set +x =============================== osmo-pcu =============================== + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, '.'. libtoolize: copying file './ltmain.sh' libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac, libtoolize: and rerunning libtoolize and aclocal. libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am. configure.ac:21: installing './compile' configure.ac:24: installing './config.guess' configure.ac:24: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/Makefile.am: installing './depcomp' tests/Makefile.am:13: warning: source file 'alloc/AllocTest.cpp' is in a subdirectory, tests/Makefile.am:13: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. tests/Makefile.am:21: warning: source file 'alloc/MslotTest.cpp' is in a subdirectory, tests/Makefile.am:21: but option 'subdir-objects' is disabled tests/Makefile.am:38: warning: source file 'bitcomp/BitcompTest.cpp' is in a subdirectory, tests/Makefile.am:38: but option 'subdir-objects' is disabled tests/Makefile.am:38: warning: source file '../src/egprs_rlc_compression.cpp' is in a subdirectory, tests/Makefile.am:38: but option 'subdir-objects' is disabled tests/Makefile.am:97: warning: source file 'codel/codel_test.c' is in a subdirectory, tests/Makefile.am:97: but option 'subdir-objects' is disabled tests/Makefile.am:44: warning: source file 'edge/EdgeTest.cpp' is in a subdirectory, tests/Makefile.am:44: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/pcu_emu.cpp' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/test_replay_gprs_attach.cpp' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/openbsc_clone.c' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/test_pdp_activation.cpp' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:103: warning: source file 'fn/FnTest.cpp' is in a subdirectory, tests/Makefile.am:103: but option 'subdir-objects' is disabled tests/Makefile.am:81: warning: source file 'llc/LlcTest.cpp' is in a subdirectory, tests/Makefile.am:81: but option 'subdir-objects' is disabled tests/Makefile.am:92: warning: source file 'llist/LListTest.cpp' is in a subdirectory, tests/Makefile.am:92: but option 'subdir-objects' is disabled tests/Makefile.am:70: warning: source file 'ms/MsTest.cpp' is in a subdirectory, tests/Makefile.am:70: but option 'subdir-objects' is disabled tests/Makefile.am:7: warning: source file 'rlcmac/RLCMACTest.cpp' is in a subdirectory, tests/Makefile.am:7: but option 'subdir-objects' is disabled tests/Makefile.am:29: warning: source file 'tbf/TbfTest.cpp' is in a subdirectory, tests/Makefile.am:29: but option 'subdir-objects' is disabled tests/Makefile.am:62: warning: source file 'types/TypesTest.cpp' is in a subdirectory, tests/Makefile.am:62: but option 'subdir-objects' is disabled + ./configure --enable-lc15bts-phy --with-litecell15= --enable-vty-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking how to run the C++ preprocessor... g++ -E checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC -DPIC checking if g++ PIC flag -fPIC -DPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking if g++ supports -c -o file.o... (cached) yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... (cached) GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOGB... yes checking whether to enable direct DSP access for PDCH of sysmocom-bts... unset checking whether to enable direct PHY access for PDCH of NuRAN Wireless Litecell 1.5 BTS... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY tests... yes CPPFLAGS="" CFLAGS="-g -O2" CXXFLAGS="-g -O2" LDFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating osmo-pcu.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating tests/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 Making all in include make[1]: Entering directory ' make[1]: Nothing to be done for 'all'. make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' CXX gprs_debug.lo CXX csn1.lo CXX gsm_rlcmac.lo CXX gprs_bssgp_pcu.lo CXX gprs_rlcmac.lo CXX gprs_rlcmac_sched.lo CXX gprs_rlcmac_meas.lo CXX gprs_rlcmac_ts_alloc.lo gprs_bssgp_pcu.cpp:982:2: warning: #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" [-Wcpp] #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" ^~~~~~~ CXX gprs_ms.lo CXX gprs_ms_storage.lo CXX gsm_timer.lo CXX pcu_l1_if.lo CC pcu_vty.lo CXX pcu_vty_functions.lo CC mslot_class.lo CXX tbf.lo CXX tbf_ul.lo CXX tbf_dl.lo /bin/bash: line 2: 9155 Segmentation fault /bin/bash ../libtool --silent --tag=CXX --mode=compile g++ -DPACKAGE_NAME=\"osmo-pcu\" -DPACKAGE_TARNAME=\"osmo-pcu\" -DPACKAGE_VERSION=\"0.5.1.38-5b52\" -DPACKAGE_STRING=\"osmo-pcu\ 0.5.1.38-5b52\" -DPACKAGE_BUGREPORT=\"osmocom-net-gprs at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-pcu\" -DVERSION=\"0.5.1.38-5b52\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DSTDC_HEADERS=1 -I. -I../include -Wall -I -I -fno-strict-aliasing -I -DENABLE_DIRECT_PHY -I -I./osmo-bts-litecell15 -Wall -ldl -pthread -g -O2 -MT tbf_ul.lo -MD -MP -MF $depbase.Tpo -c -o tbf_ul.lo tbf_ul.cpp Makefile:779: recipe for target 'tbf_ul.lo' failed make[1]: *** [tbf_ul.lo] Error 139 make[1]: *** Waiting for unfinished jobs.... make[1]: Leaving directory ' Makefile:466: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 12 13:42:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 12 Dec 2018 13:42:42 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu_=C2=BB_origi?= =?UTF-8?Q?n/nrw/litecell15,0,osmocom-master-debian9,lc15,True_#1069?= In-Reply-To: <1399662695.1247.1544620929114.JavaMail.jenkins@jenkins.osmocom.org> References: <1399662695.1247.1544620929114.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <458126114.1248.1544622162576.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Dec 12 13:49:27 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 12 Dec 2018 13:49:27 +0000 Subject: Change in osmo-mgw[master]: drop/replace very weird logging in mgcp_client.c In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12269 ) Change subject: drop/replace very weird logging in mgcp_client.c ...................................................................... Patch Set 1: Code-Review+1 > Leaving +2 until dexter has a look at it. I think this ok, the logging seems to be indeed strange since the for loop replaces all \r or \n with \0, this means the message will be chopped off very early. Now we should get a more complete message (as long as it is not longer than 255 chars.) -- To view, visit https://gerrit.osmocom.org/12269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6877ed7fd7dbe009b2ece8792d5160d040c1aaa Gerrit-Change-Number: 12269 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 12 Dec 2018 13:49:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 14:04:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 14:04:38 +0000 Subject: Change in osmo-mgw[master]: drop/replace very weird logging in mgcp_client.c In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12269 ) Change subject: drop/replace very weird logging in mgcp_client.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6877ed7fd7dbe009b2ece8792d5160d040c1aaa Gerrit-Change-Number: 12269 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 12 Dec 2018 14:04:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 12 14:23:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 12 Dec 2018 14:23:04 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-trx_=C2=BB_--wit?= =?UTF-8?Q?h-sse,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#738?= In-Reply-To: <1871881363.1246.1544620180589.JavaMail.jenkins@jenkins.osmocom.org> References: <1871881363.1246.1544620180589.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <542187105.1249.1544624584532.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Dec 12 14:24:58 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 14:24:58 +0000 Subject: Change in libosmocore[master]: cleanup: remove unused define In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12272 ) Change subject: cleanup: remove unused define ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibff603dd581f60b600f2469ad464a0bf77e24bfe Gerrit-Change-Number: 12272 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 12 Dec 2018 14:24:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 14:27:44 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 14:27:44 +0000 Subject: Change in osmo-trx[master]: tests: rename convolve_test -> ConvolveTest In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12244 ) Change subject: tests: rename convolve_test -> ConvolveTest ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I4ca533ca8c5e19b6dbe7b0aba672ee14cf5c3bd1 Gerrit-Change-Number: 12244 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 14:32:35 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 14:32:35 +0000 Subject: Change in osmo-trx[master]: configure.ac: check boost only if USRP1 support is enabled In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12088 ) Change subject: configure.ac: check boost only if USRP1 support is enabled ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4c3fa3ff58fd552d0cb4c4cf2033615d84c07c96 Gerrit-Change-Number: 12088 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Wed, 12 Dec 2018 14:32:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 14:44:24 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 14:44:24 +0000 Subject: Change in osmo-msc[master]: vty: show subscriber: put() before printing the use count In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12266 ) Change subject: vty: show subscriber: put() before printing the use count ...................................................................... Patch Set 1: (2 comments) Please clarify. https://gerrit.osmocom.org/#/c/12266/1/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12266/1/src/libmsc/msc_vty.c at 821 PS1, Line 821: argv[1]); If this taints the count than what about all other calls to get_vsub_by_argv()? https://gerrit.osmocom.org/#/c/12266/1/src/libmsc/msc_vty.c at 830 PS1, Line 830: * and since it existed before we called _get() on it above. */ Are you referring to get_vsub_by_argv()? Better use function name - it's more likely to persist than relative positions. -- To view, visit https://gerrit.osmocom.org/12266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id02b57b7ed299b010b9f8b9e809548eb1e6aa699 Gerrit-Change-Number: 12266 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Wed, 12 Dec 2018 14:44:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 14:47:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 14:47:11 +0000 Subject: Change in osmo-msc[master]: comment: vlr: put the 'balancing' comment closer to the put() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12240 ) Change subject: comment: vlr: put the 'balancing' comment closer to the put() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic42768b22d63d182455c8d860961c44159973d0c Gerrit-Change-Number: 12240 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 14:47:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 15:00:53 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 15:00:53 +0000 Subject: Change in osmo-bts[master]: clear GPRS indicator in SI3 while PCU is disconnected In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/10170 ) Change subject: clear GPRS indicator in SI3 while PCU is disconnected ...................................................................... Patch Set 1: Shouldn't this be marked as WIP while we're waiting on license clarification and related gerrit patch? -- To view, visit https://gerrit.osmocom.org/10170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a6f5c636c0fe098ee31c280d4572a3f8122b44b Gerrit-Change-Number: 10170 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Wed, 12 Dec 2018 15:00:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 15:47:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 15:47:01 +0000 Subject: Change in openbsc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12275 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I89be11d346d50169282c991235ffc47dacc30b11 Gerrit-Change-Number: 12275 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 15:47:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 15:47:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 15:47:03 +0000 Subject: Change in openbsc[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12275 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. Related: OS#3385 Change-Id: I89be11d346d50169282c991235ffc47dacc30b11 --- M contrib/jenkins.sh 1 file changed, 29 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5bab5bf..7083976 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,4 +1,13 @@ #!/bin/sh -ex +# jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * IU: configure 3G support (values: "--enable-iu", "--disable-iu") +# * MGCP: configure transcoding for MGCP (values: "--enable-mgcp-transcoding", "--disable-mgcp-transcoding") +# * SMPP: configure the SMPP interface (values: "--enable-smpp", "--disable-smpp") +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# osmo-clean-workspace.sh @@ -59,4 +68,24 @@ . osmo-build.sh +# Build and publish manuals +if [ "$WITH_MANUALS" = "1" ]; then + # Build all manuals first + osmo-build-dep.sh osmo-gsm-manuals + for dir in "$base"/manuals/*/; do + make -C "$dir" + done + + # Run 'make check' for the OsmoNITB manuals. + # The other dirs only have VTY references, so there is no 'make check' target for them. + make -C "$base/manuals/OsmoNITB" check + + # Publish all at once + if [ "$PUBLISH" = "1" ]; then + for dir in "$base"/manuals/*/; do + make -C "$dir" publish + done + fi +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I89be11d346d50169282c991235ffc47dacc30b11 Gerrit-Change-Number: 12275 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 15:48:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 15:48:12 +0000 Subject: Change in libosmocore[master]: ipa_ccm_idtag_parse*: Fix reported length value In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10216 ) Change subject: ipa_ccm_idtag_parse*: Fix reported length value ...................................................................... Patch Set 3: assigning this to neels. Not sure why this patch never got any review for months. -- To view, visit https://gerrit.osmocom.org/10216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I435aaa33605bd48635715a2c81aa2d231c1abf51 Gerrit-Change-Number: 10216 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Wed, 12 Dec 2018 15:48:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 12 15:55:38 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 12 Dec 2018 15:55:38 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-?= =?UTF-8?Q?openbsc_=C2=BB_--disable-iu,--enable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3398?= Message-ID: <782035809.1250.1544630138619.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Oliver Smith] contrib/jenkins.sh: build and publish manuals ------------------------------------------ [...truncated 1.03 MB...] else \ mode=644; \ fi; \ install -vDm$mode "$i" ""/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals"/$i" || exit 1; \ done; install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share' install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals' install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build' 'build/diag-filter.conf' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf' 'build/known_hosts' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' 'build/docinfo-releaseinfo.conf' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf' 'build/mscgen-filter.conf' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf' 'build/unix-time-to-fmt.py' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/unix-time-to-fmt.py' 'build/python2-filter.conf' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf' 'build/Makefile.docbook.inc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.docbook.inc' 'build/Makefile.vty-reference.inc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.vty-reference.inc' 'build/custom-dblatex.sty' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty' 'build/Makefile.common.inc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc' 'build/vty_reference_combine.sh' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh' 'build/Makefile.asciidoc.inc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc' 'build/filter-wrapper.py' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/filter-wrapper.py' install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common' 'common/vty_additions.xml' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml' install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/images' 'common/images/osmocom.pdf' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/images/osmocom.pdf' 'common/images/lte-eps-sgs.dot' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/images/lte-eps-sgs.dot' 'common/images/sysmocom.pdf' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/images/sysmocom.pdf' 'common/images/wireshark-gsmtap-log.png' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/images/wireshark-gsmtap-log.png' 'common/images/lte-eps.dot' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/images/lte-eps.dot' install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters' 'common/chapters/sigtran.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/sigtran.adoc' 'common/chapters/bibliography.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/bibliography.adoc' 'common/chapters/msc_mncc_mo_rtp.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/msc_mncc_mo_rtp.msc' 'common/chapters/bts.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/bts.adoc' 'common/chapters/rf.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/rf.adoc' 'common/chapters/sigtran-simple-2g.dot' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/sigtran-simple-2g.dot' 'common/chapters/logging.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/logging.adoc' 'common/chapters/control_if.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/control_if.adoc' 'common/chapters/vty.xml' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/vty.xml' 'common/chapters/oap.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/oap.adoc' 'common/chapters/port_numbers.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/port_numbers.adoc' 'common/chapters/spectrum.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/spectrum.adoc' 'common/chapters/nitb_mncc_mo_tch.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/nitb_mncc_mo_tch.msc' 'common/chapters/osmocom-cbs.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/osmocom-cbs.msc' 'common/chapters/bsc.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/bsc.adoc' 'common/chapters/glossary.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/glossary.adoc' 'common/chapters/gfdl.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/gfdl.adoc' 'common/chapters/preface.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/preface.adoc' 'common/chapters/abis.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/abis.adoc' 'common/chapters/nitb_mncc_mo_rtp.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/nitb_mncc_mo_rtp.msc' 'common/chapters/msc_mncc_mo_sip_mgcp.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/msc_mncc_mo_sip_mgcp.msc' 'common/chapters/msc_mncc_mt_sip_mgcp.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/msc_mncc_mt_sip_mgcp.msc' 'common/chapters/smpp.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/smpp.adoc' 'common/chapters/sigtran-osmocom.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/sigtran-osmocom.adoc' 'common/chapters/vty.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/vty.adoc' 'common/chapters/cell-broadcast.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/cell-broadcast.adoc' 'common/chapters/sigtran-simple-3g.dot' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/sigtran-simple-3g.dot' 'common/chapters/gb.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/gb.adoc' 'common/chapters/mncc.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/mncc.adoc' 'common/chapters/msc_mncc_mo_sip_rel18x_mgcp.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/msc_mncc_mo_sip_rel18x_mgcp.msc' 'common/chapters/trx_if.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/trx_if.adoc' 'common/chapters/gsup.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/gsup.adoc' install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/snippets' 'common/snippets/dynamic_channel_type_bullets.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/snippets/dynamic_channel_type_bullets.adoc' 'common/ns_vty_additions.xml' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/ns_vty_additions.xml' 'merge_doc.xsl' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl' 'vty_reference.xsl' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl' install -Dm755 "./check-depends.sh" "/build/deps/install/stow/osmo-gsm-manuals/bin/osmo-gsm-manuals-check-depends" make[4]: Leaving directory '/build/deps/osmo-gsm-manuals' make[3]: Leaving directory '/build/deps/osmo-gsm-manuals' make[2]: Leaving directory '/build/deps/osmo-gsm-manuals' make[1]: Leaving directory '/build/deps/osmo-gsm-manuals' + STOW_DIR=/build/deps/install/stow stow --restow osmo-gsm-manuals Possible precedence issue with control flow operator at /usr/share/perl5/Stow.pm line 1736. + make -C /build/manuals/OsmoBSCMGCP/ make: Entering directory '/build/manuals/OsmoBSCMGCP' OSMO_GSM_MANUALS_DIR: /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ /build/manuals/OsmoBSCMGCP/vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ /build/manuals/OsmoBSCMGCP/vty/*additions*.xml + mkdir -p generated + cp /build/manuals/OsmoBSCMGCP/vty/mgcp_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n /build/manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml ] + realpath /build/manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml + addition=/build/manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common xmllint --xinclude --postvalid --noout osmo-bsc-mgcp-vty-reference.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmo-bsc-mgcp-vty-reference.pdf osmo-bsc-mgcp-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmo-bsc-mgcp-vty-reference.pdf 'osmo-bsc-mgcp-vty-reference.pdf' successfully built make: Leaving directory '/build/manuals/OsmoBSCMGCP' + make -C /build/manuals/OsmoBSCNAT/ make: Entering directory '/build/manuals/OsmoBSCNAT' OSMO_GSM_MANUALS_DIR: /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ /build/manuals/OsmoBSCNAT/vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ /build/manuals/OsmoBSCNAT/vty/*additions*.xml + mkdir -p generated + cp /build/manuals/OsmoBSCNAT/vty/nat_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n /build/manuals/OsmoBSCNAT/vty/nat_vty_additions.xml ] + realpath /build/manuals/OsmoBSCNAT/vty/nat_vty_additions.xml + addition=/build/manuals/OsmoBSCNAT/vty/nat_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/manuals/OsmoBSCNAT/vty/nat_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common xmllint --xinclude --postvalid --noout osmo-bsc-nat-vty-reference.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmo-bsc-nat-vty-reference.pdf osmo-bsc-nat-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmo-bsc-nat-vty-reference.pdf 'osmo-bsc-nat-vty-reference.pdf' successfully built make: Leaving directory '/build/manuals/OsmoBSCNAT' + make -C /build/manuals/OsmoNITB/ make: Entering directory '/build/manuals/OsmoNITB' OSMO_GSM_MANUALS_DIR: /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at /srcfile.adoc pointing at # /build/manuals/OsmoNITB/srcfile.adoc. osmonitb-usermanual.adoc is the /build/manuals/OsmoNITB/srcfile.adoc, # is like basename from coreutils, and is WD. if ! [ -f osmonitb-usermanual.adoc ]; then \ ln -s osmonitb-usermanual.adoc osmonitb-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='/build/manuals/OsmoNITB'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.1.0-113-g5e068" -a revdate="2018-Nov-30" osmonitb-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='/build/manuals/OsmoNITB' osmonitb-usermanual.adoc; exit 1) /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ /build/manuals/OsmoNITB/vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ /build/manuals/OsmoNITB/vty/*additions*.xml + mkdir -p generated + cp /build/manuals/OsmoNITB/vty/nitb_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n /build/manuals/OsmoNITB/vty/bsc_vty_additions.xml ] + realpath /build/manuals/OsmoNITB/vty/bsc_vty_additions.xml + addition=/build/manuals/OsmoNITB/vty/bsc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/manuals/OsmoNITB/vty/bsc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n /build/manuals/OsmoNITB/vty/nitb_vty_additions.xml ] + realpath /build/manuals/OsmoNITB/vty/nitb_vty_additions.xml + addition=/build/manuals/OsmoNITB/vty/nitb_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/manuals/OsmoNITB/vty/nitb_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml xmllint --xinclude --postvalid --noout osmonitb-vty-reference.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmonitb-vty-reference.pdf osmonitb-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmonitb-vty-reference.pdf 'osmonitb-vty-reference.pdf' successfully built make: Leaving directory '/build/manuals/OsmoNITB' + make -C /build/manuals/OsmoNITB check make: Entering directory '/build/manuals/OsmoNITB' OSMO_GSM_MANUALS_DIR: /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) # out-of-tree building: use a symlink to the output file like done in # the non-check build above, so the relative include paths work the # same. if ! [ -f osmonitb-usermanual.adoc ]; then \ ln -s osmonitb-usermanual.adoc osmonitb-usermanual.adoc; \ fi asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='/build/manuals/OsmoNITB' osmonitb-usermanual.adoc > osmonitb-usermanual.check 2>&1 # Make absolutely sure that the %.check target is updated. touch osmonitb-usermanual.check # Do print the WARNING output but return error if any was found # (grep -v would omit the WARNING output from the log). make: Leaving directory '/build/manuals/OsmoNITB' + [ 1 = 1 ] + make -C /build/manuals/OsmoBSCMGCP/ publish make: Entering directory '/build/manuals/OsmoBSCMGCP' OSMO_GSM_MANUALS_DIR: /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Could not create directory '/home/build/.ssh'. Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/manuals/OsmoBSCMGCP' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 12 15:55:45 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 12 Dec 2018 15:55:45 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3398?= Message-ID: <663097863.1251.1544630145882.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Oliver Smith] contrib/jenkins.sh: build and publish manuals ------------------------------------------ [...truncated 1.03 MB...] else \ mode=644; \ fi; \ install -vDm$mode "$i" ""/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals"/$i" || exit 1; \ done; install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share' install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals' install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build' 'build/diag-filter.conf' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf' 'build/known_hosts' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' 'build/docinfo-releaseinfo.conf' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf' 'build/mscgen-filter.conf' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf' 'build/unix-time-to-fmt.py' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/unix-time-to-fmt.py' 'build/python2-filter.conf' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf' 'build/Makefile.docbook.inc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.docbook.inc' 'build/Makefile.vty-reference.inc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.vty-reference.inc' 'build/custom-dblatex.sty' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty' 'build/Makefile.common.inc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc' 'build/vty_reference_combine.sh' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh' 'build/Makefile.asciidoc.inc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc' 'build/filter-wrapper.py' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/filter-wrapper.py' install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common' 'common/vty_additions.xml' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml' install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/images' 'common/images/osmocom.pdf' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/images/osmocom.pdf' 'common/images/lte-eps-sgs.dot' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/images/lte-eps-sgs.dot' 'common/images/sysmocom.pdf' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/images/sysmocom.pdf' 'common/images/wireshark-gsmtap-log.png' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/images/wireshark-gsmtap-log.png' 'common/images/lte-eps.dot' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/images/lte-eps.dot' install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters' 'common/chapters/sigtran.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/sigtran.adoc' 'common/chapters/bibliography.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/bibliography.adoc' 'common/chapters/msc_mncc_mo_rtp.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/msc_mncc_mo_rtp.msc' 'common/chapters/bts.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/bts.adoc' 'common/chapters/rf.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/rf.adoc' 'common/chapters/sigtran-simple-2g.dot' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/sigtran-simple-2g.dot' 'common/chapters/logging.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/logging.adoc' 'common/chapters/control_if.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/control_if.adoc' 'common/chapters/vty.xml' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/vty.xml' 'common/chapters/oap.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/oap.adoc' 'common/chapters/port_numbers.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/port_numbers.adoc' 'common/chapters/spectrum.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/spectrum.adoc' 'common/chapters/nitb_mncc_mo_tch.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/nitb_mncc_mo_tch.msc' 'common/chapters/osmocom-cbs.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/osmocom-cbs.msc' 'common/chapters/bsc.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/bsc.adoc' 'common/chapters/glossary.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/glossary.adoc' 'common/chapters/gfdl.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/gfdl.adoc' 'common/chapters/preface.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/preface.adoc' 'common/chapters/abis.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/abis.adoc' 'common/chapters/nitb_mncc_mo_rtp.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/nitb_mncc_mo_rtp.msc' 'common/chapters/msc_mncc_mo_sip_mgcp.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/msc_mncc_mo_sip_mgcp.msc' 'common/chapters/msc_mncc_mt_sip_mgcp.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/msc_mncc_mt_sip_mgcp.msc' 'common/chapters/smpp.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/smpp.adoc' 'common/chapters/sigtran-osmocom.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/sigtran-osmocom.adoc' 'common/chapters/vty.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/vty.adoc' 'common/chapters/cell-broadcast.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/cell-broadcast.adoc' 'common/chapters/sigtran-simple-3g.dot' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/sigtran-simple-3g.dot' 'common/chapters/gb.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/gb.adoc' 'common/chapters/mncc.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/mncc.adoc' 'common/chapters/msc_mncc_mo_sip_rel18x_mgcp.msc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/msc_mncc_mo_sip_rel18x_mgcp.msc' 'common/chapters/trx_if.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/trx_if.adoc' 'common/chapters/gsup.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters/gsup.adoc' install: creating directory '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/snippets' 'common/snippets/dynamic_channel_type_bullets.adoc' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/snippets/dynamic_channel_type_bullets.adoc' 'common/ns_vty_additions.xml' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/ns_vty_additions.xml' 'merge_doc.xsl' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl' 'vty_reference.xsl' -> '/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl' install -Dm755 "./check-depends.sh" "/build/deps/install/stow/osmo-gsm-manuals/bin/osmo-gsm-manuals-check-depends" make[4]: Leaving directory '/build/deps/osmo-gsm-manuals' make[3]: Leaving directory '/build/deps/osmo-gsm-manuals' make[2]: Leaving directory '/build/deps/osmo-gsm-manuals' make[1]: Leaving directory '/build/deps/osmo-gsm-manuals' + STOW_DIR=/build/deps/install/stow stow --restow osmo-gsm-manuals Possible precedence issue with control flow operator at /usr/share/perl5/Stow.pm line 1736. + make -C /build/manuals/OsmoBSCMGCP/ make: Entering directory '/build/manuals/OsmoBSCMGCP' OSMO_GSM_MANUALS_DIR: /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ /build/manuals/OsmoBSCMGCP/vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ /build/manuals/OsmoBSCMGCP/vty/*additions*.xml + mkdir -p generated + cp /build/manuals/OsmoBSCMGCP/vty/mgcp_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n /build/manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml ] + realpath /build/manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml + addition=/build/manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common xmllint --xinclude --postvalid --noout osmo-bsc-mgcp-vty-reference.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmo-bsc-mgcp-vty-reference.pdf osmo-bsc-mgcp-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmo-bsc-mgcp-vty-reference.pdf 'osmo-bsc-mgcp-vty-reference.pdf' successfully built make: Leaving directory '/build/manuals/OsmoBSCMGCP' + make -C /build/manuals/OsmoBSCNAT/ make: Entering directory '/build/manuals/OsmoBSCNAT' OSMO_GSM_MANUALS_DIR: /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ /build/manuals/OsmoBSCNAT/vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ /build/manuals/OsmoBSCNAT/vty/*additions*.xml + mkdir -p generated + cp /build/manuals/OsmoBSCNAT/vty/nat_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n /build/manuals/OsmoBSCNAT/vty/nat_vty_additions.xml ] + realpath /build/manuals/OsmoBSCNAT/vty/nat_vty_additions.xml + addition=/build/manuals/OsmoBSCNAT/vty/nat_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/manuals/OsmoBSCNAT/vty/nat_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common xmllint --xinclude --postvalid --noout osmo-bsc-nat-vty-reference.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmo-bsc-nat-vty-reference.pdf osmo-bsc-nat-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmo-bsc-nat-vty-reference.pdf 'osmo-bsc-nat-vty-reference.pdf' successfully built make: Leaving directory '/build/manuals/OsmoBSCNAT' + make -C /build/manuals/OsmoNITB/ make: Entering directory '/build/manuals/OsmoNITB' OSMO_GSM_MANUALS_DIR: /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build build ln -s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common common # a2x can't use a different output file. To support out-of-tree builds, # we create a symlink at /srcfile.adoc pointing at # /build/manuals/OsmoNITB/srcfile.adoc. osmonitb-usermanual.adoc is the /build/manuals/OsmoNITB/srcfile.adoc, # is like basename from coreutils, and is WD. if ! [ -f osmonitb-usermanual.adoc ]; then \ ln -s osmonitb-usermanual.adoc osmonitb-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals. TEXINPUTS="/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals" \ a2x -L --asciidoc-opts="-f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='/build/manuals/OsmoNITB'" --dblatex-opts="-s /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.1.0-113-g5e068" -a revdate="2018-Nov-30" osmonitb-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='/build/manuals/OsmoNITB' osmonitb-usermanual.adoc; exit 1) /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/vty_reference_combine.sh "/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl" \ /build/manuals/OsmoNITB/vty/*reference.xml \ /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml \ /build/manuals/OsmoNITB/vty/*additions*.xml + mkdir -p generated + cp /build/manuals/OsmoNITB/vty/nitb_vty_reference.xml generated/combined.xml + [ -n /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml ] + realpath /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + addition=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n /build/manuals/OsmoNITB/vty/bsc_vty_additions.xml ] + realpath /build/manuals/OsmoNITB/vty/bsc_vty_additions.xml + addition=/build/manuals/OsmoNITB/vty/bsc_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/manuals/OsmoNITB/vty/bsc_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n /build/manuals/OsmoNITB/vty/nitb_vty_additions.xml ] + realpath /build/manuals/OsmoNITB/vty/nitb_vty_additions.xml + addition=/build/manuals/OsmoNITB/vty/nitb_vty_additions.xml + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with /build/manuals/OsmoNITB/vty/nitb_vty_additions.xml /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/merge_doc.xsl generated/combine_src.xml + [ -n ] xsltproc /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml xmllint --xinclude --postvalid --noout osmonitb-vty-reference.xml dblatex --xslt-opts="--path /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/common/chapters:$PWD/generated" \ -P draft.mode=no -o osmonitb-vty-reference.pdf osmonitb-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.5-2) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmonitb-vty-reference.pdf 'osmonitb-vty-reference.pdf' successfully built make: Leaving directory '/build/manuals/OsmoNITB' + make -C /build/manuals/OsmoNITB check make: Entering directory '/build/manuals/OsmoNITB' OSMO_GSM_MANUALS_DIR: /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) # out-of-tree building: use a symlink to the output file like done in # the non-check build above, so the relative include paths work the # same. if ! [ -f osmonitb-usermanual.adoc ]; then \ ln -s osmonitb-usermanual.adoc osmonitb-usermanual.adoc; \ fi asciidoc -v -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/diag-filter.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='/build/manuals/OsmoNITB' osmonitb-usermanual.adoc > osmonitb-usermanual.check 2>&1 # Make absolutely sure that the %.check target is updated. touch osmonitb-usermanual.check # Do print the WARNING output but return error if any was found # (grep -v would omit the WARNING output from the log). make: Leaving directory '/build/manuals/OsmoNITB' + [ 1 = 1 ] + make -C /build/manuals/OsmoBSCMGCP/ publish make: Entering directory '/build/manuals/OsmoBSCMGCP' OSMO_GSM_MANUALS_DIR: /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals (from pkg-conf) mkdir -p out cp *.pdf out rsync -avz -e "ssh -o 'UserKnownHostsFile=/build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/known_hosts' -p 48" ./out/ docs at rita.osmocom.org:web-files/latest/ Could not create directory '/home/build/.ssh'. Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] /build/deps/install/stow/osmo-gsm-manuals/share/osmo-gsm-manuals/build/Makefile.common.inc:25: recipe for target 'publish' failed make: Leaving directory '/build/manuals/OsmoBSCMGCP' make: *** [publish] Error 255 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 12 16:06:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 12 Dec 2018 16:06:16 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_m?= =?UTF-8?Q?aster-openbsc_=C2=BB_--disable-iu,--disa?= =?UTF-8?Q?ble-mgcp-transcoding,--enable-smpp,?= =?UTF-8?Q?default,osmocom-master-debian9_#3399?= In-Reply-To: <663097863.1251.1544630145882.JavaMail.jenkins@jenkins.osmocom.org> References: <663097863.1251.1544630145882.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <401210198.1252.1544630776054.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Dec 12 16:06:17 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 12 Dec 2018 16:06:17 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_m?= =?UTF-8?Q?aster-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,d?= =?UTF-8?Q?efault,osmocom-master-debian9_#3399?= In-Reply-To: <782035809.1250.1544630138619.JavaMail.jenkins@jenkins.osmocom.org> References: <782035809.1250.1544630138619.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <338031812.1253.1544630777808.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:06:19 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 16:06:19 +0000 Subject: Change in osmo-ci[master]: master-builds: openbsc: make SSH keys available Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12276 Change subject: master-builds: openbsc: make SSH keys available ...................................................................... master-builds: openbsc: make SSH keys available Mount ~/.ssh in openbsc's docker container, just like it is done with all other Osmocom projects that build in docker (see Change-Id Icfff3b6a620de79d1bab7ff6a35309f828581c09 ("master-builds: make SSH keys available in Docker")). Related: OS#3385 Change-Id: Ib31ab4033c1cc71c10a96445e8bcc3b9f02e2a1f --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/76/12276/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 97e193a..eb5db88 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -164,6 +164,7 @@ -w /build -i -u build \ -v "$PWD:/build" \ -v "$HOME/bin:/build_bin" \ + -v "$HOME/.ssh:/home/build/.ssh:ro" \ -v "$ARTIFACT_STORE:/artifact_store" \ osmocom:amd64 /build/contrib/jenkins.sh -- To view, visit https://gerrit.osmocom.org/12276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib31ab4033c1cc71c10a96445e8bcc3b9f02e2a1f Gerrit-Change-Number: 12276 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From nhofmeyr at sysmocom.de Wed Dec 12 16:10:17 2018 From: nhofmeyr at sysmocom.de (Neels Hofmeyr) Date: Wed, 12 Dec 2018 17:10:17 +0100 Subject: build slave segfaults In-Reply-To: <8d590832-e52d-cedf-c1fe-2c08f691a26f@sysmocom.de> References: <2010217903.1228.1544575979322.JavaMail.jenkins@jenkins.osmocom.org> <20181212105448.GC1926@my.box> <8d590832-e52d-cedf-c1fe-2c08f691a26f@sysmocom.de> Message-ID: <20181212161017.GJ1926@my.box> On Wed, Dec 12, 2018 at 01:26:45PM +0100, Pau Espin Pedrol wrote: > on the virtualization layer being used by OBS to run containers. This is our own jenkins build slave, not an OBS package builder. In our build slaves, sporadic failures usually didn't happen. Might hint at faulty RAM or somesuch. Or just a flapping bug, of course. ~N -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:17:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 12 Dec 2018 16:17:40 +0000 Subject: Change in osmo-ci[master]: master-builds: openbsc: make SSH keys available In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12276 ) Change subject: master-builds: openbsc: make SSH keys available ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib31ab4033c1cc71c10a96445e8bcc3b9f02e2a1f Gerrit-Change-Number: 12276 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 12 Dec 2018 16:17:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:20:09 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 16:20:09 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Patch Set 1: > Patch Set 1: > I know you wanted to split them based on spatch Exactly. > but this way adds extra verbosity to history and makes it more difficult to revert for no good reason. I don't think it's actually a problem: reverting 2 patches would be 2 clicks instead of 1 (and we rarely have to do this anyway). I think keeping manual changes separated from automated code editing is worth it. -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 16:20:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:23:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 16:23:04 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Patch Set 1: Code-Review+2 I don't agree, I don't like leaving a define dangling in a commit, but anyway, not that important. -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 16:23:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:23:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 16:23:12 +0000 Subject: Change in libosmocore[master]: cleanup: remove unused define In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12272 ) Change subject: cleanup: remove unused define ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibff603dd581f60b600f2469ad464a0bf77e24bfe Gerrit-Change-Number: 12272 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 16:23:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:31:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 16:31:16 +0000 Subject: Change in osmo-ci[master]: master-builds: openbsc: make SSH keys available In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12276 ) Change subject: master-builds: openbsc: make SSH keys available ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib31ab4033c1cc71c10a96445e8bcc3b9f02e2a1f Gerrit-Change-Number: 12276 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 12 Dec 2018 16:31:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:32:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 16:32:17 +0000 Subject: Change in osmo-ci[master]: master-builds: openbsc: make SSH keys available In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12276 ) Change subject: master-builds: openbsc: make SSH keys available ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib31ab4033c1cc71c10a96445e8bcc3b9f02e2a1f Gerrit-Change-Number: 12276 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 12 Dec 2018 16:32:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:32:22 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 16:32:22 +0000 Subject: Change in osmo-ci[master]: master-builds: openbsc: make SSH keys available In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12276 ) Change subject: master-builds: openbsc: make SSH keys available ...................................................................... master-builds: openbsc: make SSH keys available Mount ~/.ssh in openbsc's docker container, just like it is done with all other Osmocom projects that build in docker (see Change-Id Icfff3b6a620de79d1bab7ff6a35309f828581c09 ("master-builds: make SSH keys available in Docker")). Related: OS#3385 Change-Id: Ib31ab4033c1cc71c10a96445e8bcc3b9f02e2a1f --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Harald Welte: Looks good to me, approved osmith: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 97e193a..eb5db88 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -164,6 +164,7 @@ -w /build -i -u build \ -v "$PWD:/build" \ -v "$HOME/bin:/build_bin" \ + -v "$HOME/.ssh:/home/build/.ssh:ro" \ -v "$ARTIFACT_STORE:/artifact_store" \ osmocom:amd64 /build/contrib/jenkins.sh -- To view, visit https://gerrit.osmocom.org/12276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib31ab4033c1cc71c10a96445e8bcc3b9f02e2a1f Gerrit-Change-Number: 12276 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:40:00 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 12 Dec 2018 16:40:00 +0000 Subject: Change in osmo-hlr[master]: disable recording of LU timestamps by default In-Reply-To: References: Message-ID: Stefan Sperling has abandoned this change. ( https://gerrit.osmocom.org/12228 ) Change subject: disable recording of LU timestamps by default ...................................................................... Abandoned Fair enough. I've made my point. -- To view, visit https://gerrit.osmocom.org/12228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I2f18b5ddc9b4b8e1174c6dea71cddf1c8d2230df Gerrit-Change-Number: 12228 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:43:35 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 16:43:35 +0000 Subject: Change in docker-playground[master]: MSC: use config file for mncc path Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12277 Change subject: MSC: use config file for mncc path ...................................................................... MSC: use config file for mncc path Use config file parameter instead of command line option for MNCC socket path. Change-Id: I689cfb3bad09b76859ef7e42c1312c636eebe637 --- M ttcn3-msc-test/jenkins.sh M ttcn3-msc-test/osmo-msc.cfg 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/77/12277/1 diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 662c377..82ec483 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -38,7 +38,7 @@ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-msc -d \ $REPO_USER/osmo-msc-$IMAGE_SUFFIX \ - /usr/local/bin/osmo-msc -M /data/unix/mncc + /usr/local/bin/osmo-msc echo Starting container with MSC testsuite docker run --rm \ diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg index f0180d8..4c3555b 100644 --- a/ttcn3-msc-test/osmo-msc.cfg +++ b/ttcn3-msc-test/osmo-msc.cfg @@ -73,6 +73,7 @@ cs7-instance-iu 0 mgw remote-ip 172.18.1.103 emergency-call route-to-msisdn 112 + mncc external /data/unix/mncc mncc-int default-codec tch-f fr default-codec tch-h hr -- To view, visit https://gerrit.osmocom.org/12277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I689cfb3bad09b76859ef7e42c1312c636eebe637 Gerrit-Change-Number: 12277 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:44:51 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 12 Dec 2018 16:44:51 +0000 Subject: Change in osmo-sgsn[master]: remove pointless declaration of struct gsm_network In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12242 ) Change subject: remove pointless declaration of struct gsm_network ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12242/1/src/gprs/sgsn_ctrl.c File src/gprs/sgsn_ctrl.c: https://gerrit.osmocom.org/#/c/12242/1/src/gprs/sgsn_ctrl.c at 64 PS1, Line 64: struct ctrl_handle *sgsn_controlif_setup(void *data, const char *bind_addr, uint16_t port) > In fact, entire function is trivial one-line wrapper used in single place. [?] Yes, good point. I'll do that. -- To view, visit https://gerrit.osmocom.org/12242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Gerrit-Change-Number: 12242 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 16:44:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:47:28 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 16:47:28 +0000 Subject: Change in osmo-trx[master]: LMSDevice: make use of dev-args in osmo-trx.cfg In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12245 to look at the new patch set (#3). Change subject: LMSDevice: make use of dev-args in osmo-trx.cfg ...................................................................... LMSDevice: make use of dev-args in osmo-trx.cfg Allow selecting a specific LimeSDR device by setting dev-args in the config file. Split up the given dev-args address by comma and select the device where all substrings can be found. I could not test this with real hardware, but I have added a test case to make sure this works as expected. Related: OS#3654 Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 --- M .gitignore M Transceiver52M/device/lms/LMSDevice.cpp A tests/Transceiver52M/LMSDeviceTest.cpp M tests/Transceiver52M/Makefile.am M tests/testsuite.at 5 files changed, 97 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/45/12245/3 -- To view, visit https://gerrit.osmocom.org/12245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 Gerrit-Change-Number: 12245 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:47:28 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 16:47:28 +0000 Subject: Change in osmo-trx[master]: osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12278 Change subject: osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp ...................................................................... osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp Make the "opt" argument const. This function will also be used by LMSDevice.cpp in a follow-up commit. Related: OS#3654 Change-Id: If3f0f682ca453c2b0a06175ec9626567932cfce6 --- M CommonLibs/Makefile.am A CommonLibs/Utils.cpp A CommonLibs/Utils.h M Transceiver52M/osmo-trx.cpp 4 files changed, 63 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/78/12278/1 diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am index 9fabcf1..83bd0c0 100644 --- a/CommonLibs/Makefile.am +++ b/CommonLibs/Makefile.am @@ -34,6 +34,7 @@ Threads.cpp \ Timeval.cpp \ Logger.cpp \ + Utils.cpp \ trx_vty.c \ debug.c libcommon_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS) @@ -48,6 +49,7 @@ Timeval.h \ Vector.h \ Logger.h \ + Utils.h \ trx_vty.h \ debug.h \ osmo_signal.h \ diff --git a/CommonLibs/Utils.cpp b/CommonLibs/Utils.cpp new file mode 100644 index 0000000..6cd4f84 --- /dev/null +++ b/CommonLibs/Utils.cpp @@ -0,0 +1,36 @@ +/* + * Copyright 2018 sysmocom - s.f.m.c. GmbH + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include + +std::vector comma_delimited_to_vector(const char* opt) +{ + std::string str = std::string(opt); + std::vector result; + std::stringstream ss(str); + + while( ss.good() ) + { + std::string substr; + getline(ss, substr, ','); + result.push_back(substr); + } + return result; +} diff --git a/CommonLibs/Utils.h b/CommonLibs/Utils.h new file mode 100644 index 0000000..4f0fbc0 --- /dev/null +++ b/CommonLibs/Utils.h @@ -0,0 +1,24 @@ +/* + * Copyright 2018 sysmocom - s.f.m.c. GmbH + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#pragma once + +#include +#include + +std::vector comma_delimited_to_vector(const char* opt); diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 2b69da4..0e63020 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -22,6 +22,7 @@ #include "Transceiver.h" #include "radioDevice.h" +#include "Utils.h" #include #include @@ -194,21 +195,6 @@ osmo_init_ignore_signals(); } -static std::vector comma_delimited_to_vector(char* opt) -{ - std::string str = std::string(opt); - std::vector result; - std::stringstream ss(str); - - while( ss.good() ) - { - std::string substr; - getline(ss, substr, ','); - result.push_back(substr); - } - return result; -} - static void print_help() { fprintf(stdout, "Options:\n" -- To view, visit https://gerrit.osmocom.org/12278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If3f0f682ca453c2b0a06175ec9626567932cfce6 Gerrit-Change-Number: 12278 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:52:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 12 Dec 2018 16:52:20 +0000 Subject: Change in osmo-sgsn[master]: remove pointless declaration of struct gsm_network In-Reply-To: References: Message-ID: Hello Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12242 to look at the new patch set (#2). Change subject: remove pointless declaration of struct gsm_network ...................................................................... remove pointless declaration of struct gsm_network We were passing a NULL pointer of type struct gsm_network * to ctrl_interface_setup_dynip(). Remove the pointless declaration of this struct. Also, replace the sgsn_controlif_setup() helper function with a direct call to ctrl_interface_setup_dynip(). The helper fnuction was just a thin wrapper around the latter. Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Related: OS#3356 --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_ctrl.c M src/gprs/sgsn_main.c 3 files changed, 2 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/42/12242/2 -- To view, visit https://gerrit.osmocom.org/12242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Gerrit-Change-Number: 12242 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:53:04 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 12 Dec 2018 16:53:04 +0000 Subject: Change in osmo-trx[master]: LMSDevice: make use of dev-args in osmo-trx.cfg In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12245 to look at the new patch set (#4). Change subject: LMSDevice: make use of dev-args in osmo-trx.cfg ...................................................................... LMSDevice: make use of dev-args in osmo-trx.cfg Allow selecting a specific LimeSDR device by setting dev-args in the config file. Split up the given dev-args address by comma and select the device where all substrings can be found. I could not test this with real hardware, but I have added a test case to make sure this works as expected. Related: OS#3654 Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 --- M .gitignore M Transceiver52M/device/lms/LMSDevice.cpp A tests/Transceiver52M/LMSDeviceTest.cpp M tests/Transceiver52M/Makefile.am M tests/testsuite.at 5 files changed, 97 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/45/12245/4 -- To view, visit https://gerrit.osmocom.org/12245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 Gerrit-Change-Number: 12245 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:54:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 16:54:37 +0000 Subject: Change in osmo-trx[master]: osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12278 ) Change subject: osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If3f0f682ca453c2b0a06175ec9626567932cfce6 Gerrit-Change-Number: 12278 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 16:54:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 16:55:29 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 12 Dec 2018 16:55:29 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 1: > Patch Set 1: > > actually, the same applies to the osmo-msc patch. > > Please add 'no ipa-name' Does changing this option at run-time make sense? Currently, the option only affect new connections. Nothing is done to existing connections if the name is changed after the fact. Is managing connections when the name changes something we actually want to do? What is bad about requiring a restart in this case? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 16:55:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 17:01:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 12 Dec 2018 17:01:52 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12243 to look at the new patch set (#2). Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... make gsup ipa name configurable in osmo-sgsn.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the SGSN on the GSUP link towards the HLR. This is required for GSUP routing in multi-SGSN networks. Related: OS#3356 Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_subscriber.c M src/gprs/sgsn_vty.c 3 files changed, 30 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/12243/2 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 17:02:14 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 12 Dec 2018 17:02:14 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12243/1/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/1/src/gprs/sgsn_vty.c at 1376 PS1, Line 1376: //install_element(SGSN_NODE, &cfg_ggsn_remote_port_cmd); > kind of a weird spot to put it, right in the middle of the ggsn cfg :) better fit is below with the [?] Fair enough. I've moved it down in the next patch set. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 17:02:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 17:07:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 17:07:21 +0000 Subject: Change in osmo-trx[master]: LMSDevice: make use of dev-args in osmo-trx.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12245 ) Change subject: LMSDevice: make use of dev-args in osmo-trx.cfg ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12245/4/tests/Transceiver52M/Makefile.am File tests/Transceiver52M/Makefile.am: https://gerrit.osmocom.org/#/c/12245/4/tests/Transceiver52M/Makefile.am at 25 PS4, Line 25: $(top_builddir)/Transceiver52M/device/lms/.libs/LMSDevice.o \ Use $(builddir)/device/lms/libdevice.la here You should add $(LMS_CFLAGS) to LMSDeviceTest_CPPFLAGS, see Transceiver52/Makefile.am towards the end of file (DEVICE_LMS). -- To view, visit https://gerrit.osmocom.org/12245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 Gerrit-Change-Number: 12245 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 17:07:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 17:07:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 17:07:44 +0000 Subject: Change in osmo-trx[master]: Timeval: passed() returns true if time is equal Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12279 Change subject: Timeval: passed() returns true if time is equal ...................................................................... Timeval: passed() returns true if time is equal Change-Id: I96a9d26657f85447609693bc6932d218d354b84a --- M CommonLibs/Timeval.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/79/12279/1 diff --git a/CommonLibs/Timeval.cpp b/CommonLibs/Timeval.cpp index 50ce05d..991e241 100644 --- a/CommonLibs/Timeval.cpp +++ b/CommonLibs/Timeval.cpp @@ -57,7 +57,7 @@ Timeval nowTime; if (nowTime.mTimeval.tv_sec < mTimeval.tv_sec) return false; if (nowTime.mTimeval.tv_sec > mTimeval.tv_sec) return true; - if (nowTime.mTimeval.tv_usec > mTimeval.tv_usec) return true; + if (nowTime.mTimeval.tv_usec >= mTimeval.tv_usec) return true; return false; } -- To view, visit https://gerrit.osmocom.org/12279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I96a9d26657f85447609693bc6932d218d354b84a Gerrit-Change-Number: 12279 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 17:07:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 17:07:45 +0000 Subject: Change in osmo-trx[master]: Timeval: Move implementation to use clock_gettime and timespec Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12280 Change subject: Timeval: Move implementation to use clock_gettime and timespec ...................................................................... Timeval: Move implementation to use clock_gettime and timespec According to gettimeofday manual: "Applications should use the clock_gettime() function instead of the obsolescent gettimeofday() function." Furthermore, it may be desirable in the future to use other clocks such as monotonic. Change-Id: I2286998c5eefbf3c3dfb105c223daec7a1083803 --- M CommonLibs/Timeval.cpp M CommonLibs/Timeval.h 2 files changed, 28 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/80/12280/1 diff --git a/CommonLibs/Timeval.cpp b/CommonLibs/Timeval.cpp index 991e241..21072fc 100644 --- a/CommonLibs/Timeval.cpp +++ b/CommonLibs/Timeval.cpp @@ -34,36 +34,33 @@ now(); unsigned sec = offset/1000; unsigned msec = offset%1000; - mTimeval.tv_usec += msec*1000; - mTimeval.tv_sec += sec; - if (mTimeval.tv_usec>1000000) { - mTimeval.tv_usec -= 1000000; - mTimeval.tv_sec += 1; + mTimespec.tv_nsec += msec*1000*1000; + mTimespec.tv_sec += sec; + if (mTimespec.tv_nsec > 1000*1000*1000) { + mTimespec.tv_nsec -= 1000*1000*1000; + mTimespec.tv_sec += 1; } } struct timespec Timeval::timespec() const { - struct timespec retVal; - retVal.tv_sec = mTimeval.tv_sec; - retVal.tv_nsec = 1000 * (long)mTimeval.tv_usec; - return retVal; + return mTimespec; } bool Timeval::passed() const { Timeval nowTime; - if (nowTime.mTimeval.tv_sec < mTimeval.tv_sec) return false; - if (nowTime.mTimeval.tv_sec > mTimeval.tv_sec) return true; - if (nowTime.mTimeval.tv_usec >= mTimeval.tv_usec) return true; + if (nowTime.mTimespec.tv_sec < mTimespec.tv_sec) return false; + if (nowTime.mTimespec.tv_sec > mTimespec.tv_sec) return true; + if (nowTime.mTimespec.tv_nsec >= mTimespec.tv_nsec) return true; return false; } double Timeval::seconds() const { - return ((double)mTimeval.tv_sec) + 1e-6*((double)mTimeval.tv_usec); + return ((double)mTimespec.tv_sec) + 1e-9*((double)mTimespec.tv_nsec); } @@ -72,8 +69,8 @@ { // 2^31 milliseconds is just over 4 years. int32_t deltaS = other.sec() - sec(); - int32_t deltaUs = other.usec() - usec(); - return 1000*deltaS + deltaUs/1000; + int32_t deltaNs = other.nsec() - nsec(); + return 1000*deltaS + deltaNs/1000000; } @@ -89,7 +86,7 @@ ostream& operator<<(ostream& os, const struct timespec& ts) { - os << ts.tv_sec << "," << ts.tv_nsec; + os << ts.tv_sec << "," << ts.tv_nsec/1000; return os; } diff --git a/CommonLibs/Timeval.h b/CommonLibs/Timeval.h index c497864..b780af1 100644 --- a/CommonLibs/Timeval.h +++ b/CommonLibs/Timeval.h @@ -42,12 +42,12 @@ private: - struct timeval mTimeval; + struct timespec mTimespec; public: - /** Set the value to gettimeofday. */ - void now() { gettimeofday(&mTimeval,NULL); } + /** Set the value to current time. */ + void now() { clock_gettime(CLOCK_REALTIME, &mTimespec); } /** Set the value to gettimeofday plus an offset. */ void future(unsigned ms); @@ -55,16 +55,18 @@ //@{ Timeval(unsigned sec, unsigned usec) { - mTimeval.tv_sec = sec; - mTimeval.tv_usec = usec; + mTimespec.tv_sec = sec; + mTimespec.tv_nsec = usec*1000; } Timeval(const struct timeval& wTimeval) - :mTimeval(wTimeval) - {} + { + mTimespec.tv_sec = wTimeval.tv_sec; + mTimespec.tv_nsec = wTimeval.tv_sec*1000; + } /** - Create a Timeval offset into the future. + Create a Timespec offset into the future. @param offset milliseconds */ Timeval(unsigned offset=0) { future(offset); } @@ -76,8 +78,9 @@ /** Return total seconds. */ double seconds() const; - uint32_t sec() const { return mTimeval.tv_sec; } - uint32_t usec() const { return mTimeval.tv_usec; } + uint32_t sec() const { return mTimespec.tv_sec; } + uint32_t usec() const { return mTimespec.tv_nsec / 1000; } + uint32_t nsec() const { return mTimespec.tv_nsec; } /** Return differnce from other (other-self), in ms. */ long delta(const Timeval& other) const; @@ -88,11 +91,11 @@ /** Remaining time in ms. */ long remaining() const { return -elapsed(); } - /** Return true if the time has passed, as per gettimeofday. */ + /** Return true if the time has passed, as per clock_gettime(CLOCK_REALTIME). */ bool passed() const; /** Add a given number of minutes to the time. */ - void addMinutes(unsigned minutes) { mTimeval.tv_sec += minutes*60; } + void addMinutes(unsigned minutes) { mTimespec.tv_sec += minutes*60; } }; -- To view, visit https://gerrit.osmocom.org/12280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2286998c5eefbf3c3dfb105c223daec7a1083803 Gerrit-Change-Number: 12280 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 17:07:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 17:07:45 +0000 Subject: Change in osmo-trx[master]: Timeval: Move to osmo_clock_gettime Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12281 Change subject: Timeval: Move to osmo_clock_gettime ...................................................................... Timeval: Move to osmo_clock_gettime Change-Id: I24da3e1136c5396062662be1d10b07b4d97cfc2e --- M CommonLibs/Timeval.cpp M CommonLibs/Timeval.h 2 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/81/12281/1 diff --git a/CommonLibs/Timeval.cpp b/CommonLibs/Timeval.cpp index 21072fc..fd1bcda 100644 --- a/CommonLibs/Timeval.cpp +++ b/CommonLibs/Timeval.cpp @@ -27,8 +27,17 @@ #include "Timeval.h" +extern "C" { +#include +} + using namespace std; +void Timeval::now() +{ + osmo_clock_gettime(CLOCK_REALTIME, &mTimespec); +} + void Timeval::future(unsigned offset) { now(); diff --git a/CommonLibs/Timeval.h b/CommonLibs/Timeval.h index b780af1..7c6a6f6 100644 --- a/CommonLibs/Timeval.h +++ b/CommonLibs/Timeval.h @@ -47,7 +47,7 @@ public: /** Set the value to current time. */ - void now() { clock_gettime(CLOCK_REALTIME, &mTimespec); } + void now(); /** Set the value to gettimeofday plus an offset. */ void future(unsigned ms); -- To view, visit https://gerrit.osmocom.org/12281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I24da3e1136c5396062662be1d10b07b4d97cfc2e Gerrit-Change-Number: 12281 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 17:07:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 17:07:45 +0000 Subject: Change in osmo-trx[master]: TimevalTest: Make test deterministic with fake time Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12282 Change subject: TimevalTest: Make test deterministic with fake time ...................................................................... TimevalTest: Make test deterministic with fake time Change-Id: I74e577a0142fb6d1ef3630e02aff9910b191bff9 --- M tests/CommonLibs/TimevalTest.cpp 1 file changed, 18 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/82/12282/1 diff --git a/tests/CommonLibs/TimevalTest.cpp b/tests/CommonLibs/TimevalTest.cpp index 61a92c9..b822982 100644 --- a/tests/CommonLibs/TimevalTest.cpp +++ b/tests/CommonLibs/TimevalTest.cpp @@ -31,34 +31,45 @@ #include #include +extern "C" { +#include +} + using namespace std; int main(int argc, char *argv[]) { - long last_remaining = 10000; + + osmo_clock_override_enable(CLOCK_REALTIME, true); + + struct timespec *clk = osmo_clock_override_gettimespec(CLOCK_REALTIME); + clk->tv_sec = 0; + clk->tv_nsec = 1000; + + long last_remaining = 10000; /*10 sec */ Timeval then(last_remaining); assert(then.elapsed() == -last_remaining); cerr << then << " elapsed: " << then.elapsed() << endl; /* Check that last_remaining parameter affects setting time in the future */ - usleep(10000); + osmo_clock_override_add(CLOCK_REALTIME, 0, 10*1000*1000); double increased_time_secs = Timeval().seconds(); - assert(increased_time_secs <= then.seconds()); + assert(increased_time_secs < then.seconds()); struct timespec invariant_time = then.timespec(); int loops = 0; while (!then.passed()) { struct timespec tspecnow = then.timespec(); - cerr << "now: " << Timeval().seconds() << " then: " << then << " remaining: " << then.remaining() << endl; + cerr << "["<< loops << "] now: " << Timeval().seconds() << " then: " << then << " remaining: " << then.remaining() << endl; assert(last_remaining >= then.remaining()); assert(tspecnow.tv_sec == invariant_time.tv_sec && tspecnow.tv_nsec == invariant_time.tv_nsec); - usleep(500000); + osmo_clock_override_add(CLOCK_REALTIME, 0, 500000*1000); loops++; } cerr << "now: " << Timeval() << " then: " << then << " remaining: " << then.remaining() << endl; - assert(then.remaining() <= 0); - assert(loops >= 18); + assert(then.remaining() == -10); + assert(loops == 20); printf("Done\n"); } -- To view, visit https://gerrit.osmocom.org/12282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I74e577a0142fb6d1ef3630e02aff9910b191bff9 Gerrit-Change-Number: 12282 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 17:09:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 17:09:40 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 2: Code-Review-1 Some people may want to use "no foobar" and then safe config to file. If you don't add the "no foobar" one and it's enabled, it's not possible to disable it and save the cfg. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 17:09:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 17:35:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 12 Dec 2018 17:35:39 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 2: > Patch Set 2: Code-Review-1 > > Some people may want to use "no foobar" and then safe config to file. If you don't add the "no foobar" one and it's enabled, it's not possible to disable it and save the cfg. I don't understand this response. You're not answering my question. Let me try again: Assume this name is used by active GSUP connections. If this name is changed via VTY, what should happen to those active connections? Should those connections be left as they are? Should they be replaced with new connections which use the new name? I don't think there is a trivial answer, is there? I believe the easiest answer is that changing this name should require a restart of osmo-sgsn (and likewise osmo-msc). If there was a way to mark a VTY option such that it can only be set while the configuration file is being loaded, and not via a run-time VTY shell, then this option would be a good candidate for such treatment. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 17:35:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 17:42:56 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 12 Dec 2018 17:42:56 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 2: I forgot one important point: There are routes which refer to this name in other components of the network, such as the HLR. What needs to happen to those routes when the name is changed? Do we even have the means to synchronize such changes across several active GSUP speakers? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 17:42:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 17:46:12 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 17:46:12 +0000 Subject: Change in osmo-sgsn[master]: remove pointless declaration of struct gsm_network In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12242 ) Change subject: remove pointless declaration of struct gsm_network ...................................................................... Patch Set 2: Good, but now commit message require adjustment as well :) -- To view, visit https://gerrit.osmocom.org/12242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Gerrit-Change-Number: 12242 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 17:46:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 17:54:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 17:54:28 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 2: > Let me try again: > > Assume this name is used by active GSUP connections. If this name > is changed via VTY, what should happen to those active connections? > Should those connections be left as they are? Should they be > replaced with new connections which use the new name? I don't think > there is a trivial answer, is there? > > I believe the easiest answer is that changing this name should > require a restart of osmo-sgsn (and likewise osmo-msc). > They can be left as they are I guess. You can try re-establishing them in the patch if you see it's easy to do so with current code base. I think it's fine requiring the user to re-start the process for the change to take effect, I was just pointing out that independent of that topic, there should be a "no foobar" for the reason I introduced. > If there was a way to mark a VTY option such that it can only be > set while the configuration file is being loaded, and not via a > run-time VTY shell, then this option would be a good candidate for > such treatment. Agree, that would be handy in general. You could otherwise check if the link towards the HLR is ON when the VTY command is run, and if that's the case, print warning stating it won't be applied until it is reconnected. But still save the new value in order to be able to save the changed config if the user desires to do so. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 17:54:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 18:08:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 18:08:36 +0000 Subject: Change in osmo-sysmon[master]: Add m4 missing files to fix build Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12283 Change subject: Add m4 missing files to fix build ...................................................................... Add m4 missing files to fix build Same files are available in other osmocom projects, otherwise configure fails with "Please install autoconf-archive; re-run 'autoreconf -fi' for it to take effect.". Change-Id: Iabe3207fff8f076a3f4ddc81720bb7fdc671a46c --- M Makefile.am A m4/README A m4/ax_check_compile_flag.m4 3 files changed, 79 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/83/12283/1 diff --git a/Makefile.am b/Makefile.am index 5eb1cfb..cdf67bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = doc +ACLOCAL_AMFLAGS = -I m4 + AM_CPPFLAGS = \ $(all_includes) \ -I$(top_srcdir) \ diff --git a/m4/README b/m4/README new file mode 100644 index 0000000..92eb30b --- /dev/null +++ b/m4/README @@ -0,0 +1,3 @@ +We want to avoid creating too many external build-time dependencies +like this one to autoconf-archive. This directory provides a local +copy of required m4 rules. diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 0000000..ca36397 --- /dev/null +++ b/m4/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 4 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS -- To view, visit https://gerrit.osmocom.org/12283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iabe3207fff8f076a3f4ddc81720bb7fdc671a46c Gerrit-Change-Number: 12283 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 18:10:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 12 Dec 2018 18:10:54 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+2 > > I don't agree, I don't like leaving a define dangling in a commit, but anyway, not that important. So far I haven't found a way to make this cleanup with spatch as well unfortunately and I'd rather have 2 separate patches than mix up manual and autogenerated changes. -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 12 Dec 2018 18:10:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 18:19:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 18:19:18 +0000 Subject: Change in osmo-sysmon[master]: Move source code to src subdir Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12284 Change subject: Move source code to src subdir ...................................................................... Move source code to src subdir Change-Id: I1aa2893e2b274f8d087a0d2f126486cd4afcbdfe --- M Makefile.am M configure.ac A src/Makefile.am R src/osmo-ctrl-client.c R src/osysmon.h R src/osysmon_ctrl.c R src/osysmon_file.c R src/osysmon_main.c R src/osysmon_rtnl.c R src/osysmon_sysinfo.c R src/simple_ctrl.c R src/simple_ctrl.h R src/value_node.c R src/value_node.h 14 files changed, 56 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/84/12284/1 diff --git a/Makefile.am b/Makefile.am index cdf67bf..a838715 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,58 +1,3 @@ -SUBDIRS = doc +SUBDIRS = doc src ACLOCAL_AMFLAGS = -I m4 - -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir) \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOVTY_CFLAGS) \ - $(LIBMNL_CFLAGS) \ - $(NULL) - -AM_LDFLAGS = \ - $(COVERAGE_LDFLAGS) \ - $(NULL) - -bin_PROGRAMS = \ - osmo-sysmon \ - osmo-ctrl-client \ - $(NULL) - -osmo_sysmon_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(LIBMNL_LIBS) \ - $(NULL) - -osmo_sysmon_SOURCES = \ - value_node.c \ - simple_ctrl.c \ - osysmon_ctrl.c \ - osysmon_sysinfo.c \ - osysmon_rtnl.c \ - osysmon_file.c \ - osysmon_main.c \ - $(NULL) - -osmo_ctrl_client_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - -osmo_ctrl_client_SOURCES = \ - simple_ctrl.c \ - osmo-ctrl-client.c \ - $(NULL) - -noinst_HEADERS = \ - osysmon.h \ - simple_ctrl.h \ - value_node.h \ - $(NULL) diff --git a/configure.ac b/configure.ac index 13082b7..734ac99 100644 --- a/configure.ac +++ b/configure.ac @@ -129,4 +129,5 @@ AC_OUTPUT( doc/Makefile doc/examples/Makefile + src/Makefile Makefile) diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..9ad5947 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,54 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBMNL_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + $(NULL) + +bin_PROGRAMS = \ + osmo-sysmon \ + osmo-ctrl-client \ + $(NULL) + +osmo_sysmon_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBMNL_LIBS) \ + $(NULL) + +osmo_sysmon_SOURCES = \ + value_node.c \ + simple_ctrl.c \ + osysmon_ctrl.c \ + osysmon_sysinfo.c \ + osysmon_rtnl.c \ + osysmon_file.c \ + osysmon_main.c \ + $(NULL) + +osmo_ctrl_client_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + +osmo_ctrl_client_SOURCES = \ + simple_ctrl.c \ + osmo-ctrl-client.c \ + $(NULL) + +noinst_HEADERS = \ + osysmon.h \ + simple_ctrl.h \ + value_node.h \ + $(NULL) diff --git a/osmo-ctrl-client.c b/src/osmo-ctrl-client.c similarity index 100% rename from osmo-ctrl-client.c rename to src/osmo-ctrl-client.c diff --git a/osysmon.h b/src/osysmon.h similarity index 100% rename from osysmon.h rename to src/osysmon.h diff --git a/osysmon_ctrl.c b/src/osysmon_ctrl.c similarity index 100% rename from osysmon_ctrl.c rename to src/osysmon_ctrl.c diff --git a/osysmon_file.c b/src/osysmon_file.c similarity index 100% rename from osysmon_file.c rename to src/osysmon_file.c diff --git a/osysmon_main.c b/src/osysmon_main.c similarity index 100% rename from osysmon_main.c rename to src/osysmon_main.c diff --git a/osysmon_rtnl.c b/src/osysmon_rtnl.c similarity index 100% rename from osysmon_rtnl.c rename to src/osysmon_rtnl.c diff --git a/osysmon_sysinfo.c b/src/osysmon_sysinfo.c similarity index 100% rename from osysmon_sysinfo.c rename to src/osysmon_sysinfo.c diff --git a/simple_ctrl.c b/src/simple_ctrl.c similarity index 100% rename from simple_ctrl.c rename to src/simple_ctrl.c diff --git a/simple_ctrl.h b/src/simple_ctrl.h similarity index 100% rename from simple_ctrl.h rename to src/simple_ctrl.h diff --git a/value_node.c b/src/value_node.c similarity index 100% rename from value_node.c rename to src/value_node.c diff --git a/value_node.h b/src/value_node.h similarity index 100% rename from value_node.h rename to src/value_node.h -- To view, visit https://gerrit.osmocom.org/12284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1aa2893e2b274f8d087a0d2f126486cd4afcbdfe Gerrit-Change-Number: 12284 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 18:39:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 18:39:01 +0000 Subject: Change in osmo-sysmon[master]: Add cmdline option parsing support Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12285 Change subject: Add cmdline option parsing support ...................................................................... Add cmdline option parsing support Change-Id: I742974bd1440b09b49d26703c13361dd1c41008b --- M src/osysmon_main.c 1 file changed, 95 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/85/12285/1 diff --git a/src/osysmon_main.c b/src/osysmon_main.c index 5983212..486ee8f 100644 --- a/src/osysmon_main.c +++ b/src/osysmon_main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "config.h" #include "osysmon.h" @@ -69,8 +70,6 @@ .is_config_node = osysmon_is_config_node, }; - -static const char *config_file = "osmo-sysmon.cfg"; struct osysmon_state *g_oss; @@ -110,6 +109,88 @@ } } +static void print_usage() +{ + printf("Usage: osmo-sysmon\n"); +} + +static void print_help() +{ + printf(" -h --help This text.\n"); + printf(" -c --config-file filename The config file to use.\n"); + printf(" -d option --debug=DRLL:DCC:DMM:DRR:DRSL:DNM Enable debugging.\n"); + printf(" -D --daemonize Fork the process into a background daemon.\n"); + printf(" -s --disable-color Do not print ANSI colors in the log\n"); + printf(" -T --timestamp Prefix every log line with a timestamp.\n"); + printf(" -e --log-level number Set a global loglevel.\n"); + printf(" -V --version Print the version of OsmoHLR.\n"); +} + +static struct { + const char *config_file; + bool daemonize; +} cmdline_opts = { + .config_file = "osmo-sysmon.cfg", + .daemonize = false, +}; + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_index = 0, c; + static struct option long_options[] = { + {"help", 0, 0, 'h'}, + {"config-file", 1, 0, 'c'}, + {"debug", 1, 0, 'd'}, + {"daemonize", 0, 0, 'D'}, + {"disable-color", 0, 0, 's'}, + {"log-level", 1, 0, 'e'}, + {"timestamp", 0, 0, 'T'}, + {"version", 0, 0, 'V' }, + {0, 0, 0, 0} + }; + + c = getopt_long(argc, argv, "hc:d:Dse:TV", + long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 'h': + print_usage(); + print_help(); + exit(0); + case 'c': + cmdline_opts.config_file = optarg; + break; + case 'd': + log_parse_category_mask(osmo_stderr_target, optarg); + break; + case 'D': + cmdline_opts.daemonize = 1; + break; + case 's': + log_set_use_color(osmo_stderr_target, 0); + break; + case 'e': + log_set_log_level(osmo_stderr_target, atoi(optarg)); + break; + case 'T': + log_set_print_timestamp(osmo_stderr_target, 1); + break; + case 'V': + print_version(1); + exit(0); + break; + default: + /* catch unknown options *as well as* missing arguments. */ + fprintf(stderr, "Error in command line options. Exiting.\n"); + exit(-1); + break; + } + } +} + int main(int argc, char **argv) { int rc; @@ -122,14 +203,16 @@ INIT_LLIST_HEAD(&g_oss->files); vty_init(&vty_info); + handle_options(argc, argv); osysmon_sysinfo_init(); osysmon_ctrl_init(); osysmon_rtnl_init(); osysmon_file_init(); - rc = vty_read_config_file(config_file, NULL); + rc = vty_read_config_file(cmdline_opts.config_file, NULL); if (rc < 0) { - fprintf(stderr, "Failed to parse the config file %s\n", config_file); + fprintf(stderr, "Failed to parse the config file %s\n", + cmdline_opts.config_file); exit(2); } @@ -137,6 +220,14 @@ signal(SIGUSR2, &signal_handler); osmo_init_ignore_signals(); + if (cmdline_opts.daemonize) { + rc = osmo_daemonize(); + if (rc < 0) { + perror("Error during daemonize"); + exit(1); + } + } + while (1) { struct value_node *root = value_node_add(g_oss, NULL, "root", NULL); osysmon_sysinfo_poll(root); -- To view, visit https://gerrit.osmocom.org/12285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I742974bd1440b09b49d26703c13361dd1c41008b Gerrit-Change-Number: 12285 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 18:53:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 12 Dec 2018 18:53:33 +0000 Subject: Change in osmo-sysmon[master]: Install systemd services with autotools Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12286 Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Ic4875b74bcf2b6232d915070b77fc202a03ef997 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am A contrib/systemd/osmo-sysmon.service 5 files changed, 41 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/86/12286/1 diff --git a/Makefile.am b/Makefile.am index a838715..6018753 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,6 @@ -SUBDIRS = doc src +SUBDIRS = contrib doc src ACLOCAL_AMFLAGS = -I m4 + +AM_DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) diff --git a/configure.ac b/configure.ac index 734ac99..ba44f98 100644 --- a/configure.ac +++ b/configure.ac @@ -120,6 +120,23 @@ CPPFLAGS="$CPPFLAGS -pg" fi +# https://www.freedesktop.org/software/systemd/man/daemon.html +PKG_PROG_PKG_CONFIG +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) @@ -127,6 +144,8 @@ AM_CONFIG_HEADER(config.h) AC_OUTPUT( + contrib/Makefile + contrib/systemd/Makefile doc/Makefile doc/examples/Makefile src/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..10b28d9 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,6 @@ +EXTRA_DIST = osmo-sysmon.service + +if HAVE_SYSTEMD +systemdsystemunit_DATA = \ + osmo-sysmon.service +endif diff --git a/contrib/systemd/osmo-sysmon.service b/contrib/systemd/osmo-sysmon.service new file mode 100644 index 0000000..50d6639 --- /dev/null +++ b/contrib/systemd/osmo-sysmon.service @@ -0,0 +1,11 @@ +[Unit] +Description=Osmocom System Monitoring daemon + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-sysmon -c /etc/osmocom/osmo-sysmon.cfg +RestartSec=2 + +[Install] +WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/12286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4875b74bcf2b6232d915070b77fc202a03ef997 Gerrit-Change-Number: 12286 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 20:41:55 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 12 Dec 2018 20:41:55 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12271/1/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12271/1/tests/gsm0808/gsm0808_test.c at 40 PS1, Line 40: #define VERIFY(msg, data, len) \ > This one can be dropped then right? I would rather change this to: #define VERIFY(msg, data) \ if (!msgb_eq_l3_data_print(msg, data, ARRAY_SIZE(data))) \ abort(); -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 12 Dec 2018 20:41:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 20:54:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 20:54:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MGCP: fix pattern warning In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12237 ) Change subject: MGCP: fix pattern warning ...................................................................... Patch Set 2: Code-Review-1 I wouldn't dare to touch those regexes without first implementing thorough unit/selftests. And as nobody has time to invest in implementing said tests only to remove a warning from the compile process: Let it be. -- To view, visit https://gerrit.osmocom.org/12237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99948e4b82b5b4bd5b8f7c1a4c60a97fcab3c0eb Gerrit-Change-Number: 12237 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 12 Dec 2018 20:54:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 20:57:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 20:57:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 8: Code-Review-1 > (1 comment) > > > I mean, it would be nicer to allow having a ctrl for both sides, > > but if it fixes the status quo, this patch is ok, right? > > Making the control interface available from both sides requires an > additional architecture to route the message back and forth between > the two entities. I'm not sure I'm following you here. Why would two components not be able to each independently talk to the CTRL interface? Where exactly is the problem here? Where is what kind of "architecture" needed? > The patch does not break anything, also having the control > interface available at the BSC_ConnectionHandler makes more sense > than having it on the MTC_CT. For your particular use case right now, this may be true. For other use cases, it is different. I put it there intentionally at a time. As other test suites also show, for some tests it makes sense to access CTRL or VTY from the main test component,and for others from the respective *Handler. There's no one truth here. -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 12 Dec 2018 20:57:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 20:58:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 20:58:44 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Patch Set 24: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 24 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 12 Dec 2018 20:58:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From laforge at gnumonks.org Wed Dec 12 21:13:43 2018 From: laforge at gnumonks.org (Harald Welte) Date: Wed, 12 Dec 2018 22:13:43 +0100 Subject: build slave segfaults In-Reply-To: <20181212161017.GJ1926@my.box> References: <2010217903.1228.1544575979322.JavaMail.jenkins@jenkins.osmocom.org> <20181212105448.GC1926@my.box> <8d590832-e52d-cedf-c1fe-2c08f691a26f@sysmocom.de> <20181212161017.GJ1926@my.box> Message-ID: <20181212211343.GR16403@nataraja> On Wed, Dec 12, 2018 at 05:10:17PM +0100, Neels Hofmeyr wrote: > On Wed, Dec 12, 2018 at 01:26:45PM +0100, Pau Espin Pedrol wrote: > > on the virtualization layer being used by OBS to run containers. > > This is our own jenkins build slave, not an OBS package builder. might be useful to look at whether it happens on one particular build slave only, or on multiple/all. If it's only one particular machine, then very clearly that machine is likely broken. -- - Harald Welte http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6) From gerrit-no-reply at lists.osmocom.org Wed Dec 12 23:10:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 23:10:01 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Add comments documenting TA + MS power control ... Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12287 Change subject: osmo-bts-trx/loops.c: Add comments documenting TA + MS power control loop ...................................................................... osmo-bts-trx/loops.c: Add comments documenting TA + MS power control loop The loops.c code is not very easily understood, so let's add some comments to it. As can be seen, there are functions of integer type which always return 0, and whose callers don't check for the return value. This will be adressed in subsequent patches. Change-Id: Iafea07eb751ed85d29b214576bb0d31ea919cd72 Related: OS#1622, OS#1851 --- M src/osmo-bts-trx/loops.c 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/12287/1 diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index 926b4c6..cca2417 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -37,6 +37,11 @@ * MS Power loop */ +/*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan. + * \param lchan logical channel for which to compute (and in whihc to store) new power. + * \param[in] chan_nr RSL channel number of the channel, only used for logging purpose. + * \param[in] diff input delta value (in dB) + * \returns 0 in all cases */ static int ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff) { struct gsm_bts_trx *trx = lchan->ts->trx; @@ -44,14 +49,17 @@ uint16_t arfcn = trx->arfcn; int8_t new_power; + /* compute new target MS output power level based on current value subtracted by 'diff/2' */ new_power = lchan->ms_power_ctrl.current - (diff >> 1); if (diff == 0) return 0; + /* ms transmit power level cannot become negative */ if (new_power < 0) new_power = 0; + /* saturate at the maximum possible power level for the given band */ // FIXME: to go above 1W, we need to know classmark of MS if (arfcn >= 512 && arfcn <= 885) { if (new_power > 15) @@ -61,6 +69,8 @@ new_power = 19; } + /* don't ever change more than MS_{LOWER,RAISE}_MAX during one loop iteration, i.e. + * reduce the speed at which the MS transmit power can change */ /* a higher value means a lower level (and vice versa) */ if (new_power > lchan->ms_power_ctrl.current + MS_LOWER_MAX) new_power = lchan->ms_power_ctrl.current + MS_LOWER_MAX; @@ -83,11 +93,16 @@ ms_pwr_dbm(band, lchan->ms_power_ctrl.current), new_power, ms_pwr_dbm(band, new_power)); + /* store the resulting new MS power level in the lchan */ lchan->ms_power_ctrl.current = new_power; return 0; } +/*! Input a new RSSI value into the MS power control loop for the given logical channel. + * \param chan_state L1 channel state of the logical channel. + * \param rssi Received Signal Strength Indication (in dBm) + * \return 0 in all cases */ static int ms_power_val(struct l1sched_chan_state *chan_state, int8_t rssi) { /* ignore inserted dummy frames, treat as lost frames */ @@ -110,6 +125,10 @@ return 0; } +/*! Process a single clock tick of the MS power control loop. + * \param lchan Logical channel to which the clock tick applies + * \param[in] chan_nr RSL channel number (for logging purpose) + * \returns 0 in all cases */ static int ms_power_clock(struct gsm_lchan *lchan, uint8_t chan_nr, struct l1sched_chan_state *chan_state) { @@ -213,6 +232,14 @@ return 0; } +/*! Process a SACCH event as input to the MS power control and TA loop. Function + * is called once every uplink SACCH block is received. + * \param l1t L1 TRX instance on which we operate + * \param chan_nr RSL channel number on which we operate + * \param chan_state L1 scheduler channel state of the channel on which we operate + * \param[in] rssi Receive Signal Strength Indication + * \param[in] toa256 Time of Arrival in 1/256 symbol periods + * \returns 0 in all cases */ int trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, int8_t rssi, int16_t toa256) { @@ -220,15 +247,18 @@ .lchan[l1sap_chan2ss(chan_nr)]; struct phy_instance *pinst = trx_phy_instance(l1t->trx); + /* if MS power control loop is enabled, handle it */ if (pinst->phy_link->u.osmotrx.trx_ms_power_loop) ms_power_val(chan_state, rssi); + /* if TA loop is enabled, handle it */ if (pinst->phy_link->u.osmotrx.trx_ta_loop) ta_val(lchan, chan_nr, chan_state, toa256); return 0; } +/*! Called once every downlink SACCH block needs to be sent. */ int trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state) { -- To view, visit https://gerrit.osmocom.org/12287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iafea07eb751ed85d29b214576bb0d31ea919cd72 Gerrit-Change-Number: 12287 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 23:10:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 23:10:02 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.[ch]: Make functions "void" if they always return 0 Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12288 Change subject: osmo-bts-trx/loops.[ch]: Make functions "void" if they always return 0 ...................................................................... osmo-bts-trx/loops.[ch]: Make functions "void" if they always return 0 The concept of a return value only makes sense if there's actually ever something non-constant to return, and if the caller actually processes that return value. If we always "return 0" and ignore it on the caller side, functions should be of "void" type. Change-Id: I3575a2cef75f3fd4c3f95eddb40719d28a055b54 Related: OS#1622, OS#1851 --- M src/osmo-bts-trx/loops.c M src/osmo-bts-trx/loops.h 2 files changed, 35 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/12288/1 diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index cca2417..cb4a9cc 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -40,9 +40,8 @@ /*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan. * \param lchan logical channel for which to compute (and in whihc to store) new power. * \param[in] chan_nr RSL channel number of the channel, only used for logging purpose. - * \param[in] diff input delta value (in dB) - * \returns 0 in all cases */ -static int ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff) + * \param[in] diff input delta value (in dB) */ +static void ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff) { struct gsm_bts_trx *trx = lchan->ts->trx; enum gsm_band band = trx->bts->band; @@ -53,7 +52,7 @@ new_power = lchan->ms_power_ctrl.current - (diff >> 1); if (diff == 0) - return 0; + return; /* ms transmit power level cannot become negative */ if (new_power < 0) @@ -83,7 +82,7 @@ trx->nr, chan_nr, new_power, ms_pwr_dbm(band, new_power)); - return 0; + return; } LOGP(DLOOP, LOGL_INFO, "%s MS new_power of trx=%u chan_nr=0x%02x from " @@ -96,18 +95,17 @@ /* store the resulting new MS power level in the lchan */ lchan->ms_power_ctrl.current = new_power; - return 0; + return; } /*! Input a new RSSI value into the MS power control loop for the given logical channel. * \param chan_state L1 channel state of the logical channel. - * \param rssi Received Signal Strength Indication (in dBm) - * \return 0 in all cases */ -static int ms_power_val(struct l1sched_chan_state *chan_state, int8_t rssi) + * \param rssi Received Signal Strength Indication (in dBm) */ +static void ms_power_val(struct l1sched_chan_state *chan_state, int8_t rssi) { /* ignore inserted dummy frames, treat as lost frames */ if (rssi < -127) - return 0; + return; LOGP(DLOOP, LOGL_DEBUG, "Got RSSI value of %d\n", rssi); @@ -118,18 +116,15 @@ /* store and process RSSI */ if (chan_state->meas.rssi_valid_count == ARRAY_SIZE(chan_state->meas.rssi)) - return 0; + return; chan_state->meas.rssi[chan_state->meas.rssi_valid_count++] = rssi; chan_state->meas.rssi_valid_count++; - - return 0; } /*! Process a single clock tick of the MS power control loop. * \param lchan Logical channel to which the clock tick applies - * \param[in] chan_nr RSL channel number (for logging purpose) - * \returns 0 in all cases */ -static int ms_power_clock(struct gsm_lchan *lchan, + * \param[in] chan_nr RSL channel number (for logging purpose) */ +static void ms_power_clock(struct gsm_lchan *lchan, uint8_t chan_nr, struct l1sched_chan_state *chan_state) { struct gsm_bts_trx *trx = lchan->ts->trx; @@ -140,21 +135,22 @@ /* skip every second clock, to prevent oscillating due to roundtrip * delay */ if (!(chan_state->meas.clock & 1)) - return 0; + return; LOGP(DLOOP, LOGL_DEBUG, "Got SACCH master clock at RSSI count %d\n", chan_state->meas.rssi_count); /* wait for initial burst */ if (!chan_state->meas.rssi_got_burst) - return 0; + return; /* if no burst was received from MS at clock */ if (chan_state->meas.rssi_count == 0) { LOGP(DLOOP, LOGL_NOTICE, "LOST SACCH frame of trx=%u " "chan_nr=0x%02x, so we raise MS power\n", trx->nr, chan_nr); - return ms_power_diff(lchan, chan_nr, MS_RAISE_MAX); + ms_power_diff(lchan, chan_nr, MS_RAISE_MAX); + return; } /* reset total counter */ @@ -163,7 +159,7 @@ /* check the minimum level received after MS acknowledged the ordered * power level */ if (chan_state->meas.rssi_valid_count == 0) - return 0; + return; for (rssi = 999, i = 0; i < chan_state->meas.rssi_valid_count; i++) { if (rssi > chan_state->meas.rssi[i]) rssi = chan_state->meas.rssi[i]; @@ -179,8 +175,6 @@ ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current), trx->nr, chan_nr); ms_power_diff(lchan, chan_nr, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi); - - return 0; } @@ -191,19 +185,19 @@ * Timing Advance loop */ -int ta_val(struct gsm_lchan *lchan, uint8_t chan_nr, +void ta_val(struct gsm_lchan *lchan, uint8_t chan_nr, struct l1sched_chan_state *chan_state, int16_t toa256) { struct gsm_bts_trx *trx = lchan->ts->trx; /* check if the current L1 header acks to the current ordered TA */ if (lchan->meas.l1_info[1] != lchan->rqd_ta) - return 0; + return; /* sum measurement */ chan_state->meas.toa256_sum += toa256; if (++(chan_state->meas.toa_num) < 16) - return 0; + return; /* complete set */ toa256 = chan_state->meas.toa256_sum / chan_state->meas.toa_num; @@ -228,8 +222,6 @@ chan_state->meas.toa_num = 0; chan_state->meas.toa256_sum = 0; - - return 0; } /*! Process a SACCH event as input to the MS power control and TA loop. Function @@ -238,9 +230,8 @@ * \param chan_nr RSL channel number on which we operate * \param chan_state L1 scheduler channel state of the channel on which we operate * \param[in] rssi Receive Signal Strength Indication - * \param[in] toa256 Time of Arrival in 1/256 symbol periods - * \returns 0 in all cases */ -int trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, + * \param[in] toa256 Time of Arrival in 1/256 symbol periods */ +void trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, int8_t rssi, int16_t toa256) { struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)] @@ -254,12 +245,10 @@ /* if TA loop is enabled, handle it */ if (pinst->phy_link->u.osmotrx.trx_ta_loop) ta_val(lchan, chan_nr, chan_state, toa256); - - return 0; } /*! Called once every downlink SACCH block needs to be sent. */ -int trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr, +void trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state) { struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)] @@ -271,11 +260,9 @@ /* count the number of SACCH clocks */ chan_state->meas.clock++; - - return 0; } -int trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr, +void trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, float ber) { struct gsm_bts_trx *trx = l1t->trx; @@ -284,11 +271,11 @@ /* check if loop is enabled */ if (!chan_state->amr_loop) - return 0; + return; /* wait for MS to use the requested codec */ if (chan_state->ul_ft != chan_state->dl_cmr) - return 0; + return; /* count bit errors */ if (L1SAP_IS_CHAN_TCHH(chan_nr)) { @@ -301,7 +288,7 @@ /* count frames */ if (chan_state->ber_num < 48) - return 0; + return; /* calculate average (reuse ber variable) */ ber = chan_state->ber_sum / chan_state->ber_num; @@ -325,8 +312,7 @@ chan_state->dl_cmr - 1, trx->nr, chan_nr); chan_state->dl_cmr--; } - - return 0; + return; } /* upgrade */ @@ -342,18 +328,15 @@ chan_state->dl_cmr++; } - return 0; + return; } - - return 0; } -int trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop) +void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop) { if (chan_state->amr_loop && !loop) { chan_state->amr_loop = 0; - - return 0; + return; } if (!chan_state->amr_loop && loop) { @@ -363,8 +346,6 @@ chan_state->ber_num = 0; chan_state->ber_sum = 0; - return 0; + return; } - - return 0; } diff --git a/src/osmo-bts-trx/loops.h b/src/osmo-bts-trx/loops.h index f9e69c8..50a658d 100644 --- a/src/osmo-bts-trx/loops.h +++ b/src/osmo-bts-trx/loops.h @@ -13,15 +13,15 @@ * loops api */ -int trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, +void trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, int8_t rssi, int16_t toa); -int trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr, +void trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state); -int trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr, +void trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, float ber); -int trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop); +void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop); #endif /* _TRX_LOOPS_H */ -- To view, visit https://gerrit.osmocom.org/12288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3575a2cef75f3fd4c3f95eddb40719d28a055b54 Gerrit-Change-Number: 12288 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 23:10:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 23:10:03 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Use lchan name based logging Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12289 Change subject: osmo-bts-trx/loops.c: Use lchan name based logging ...................................................................... osmo-bts-trx/loops.c: Use lchan name based logging The loops.c code dates back to ancient times when we printed the TRX number and the raw channel number to identify a logical channel. We meanwhile have gsm_lchan_name() and should use it to log messages related to this lchan in a common format. This commit introduces the LOGPLCHAN() helper macro [similar to osmo-bsc], and uses it from loops.c. As a result, some functions don't need a chan_nr argument anymore, while some need to add a new lchan argument. Change-Id: I6976dd7444c26b1f52741bc367b0311ebbef1718 Related: OS#1622, OS#1851 --- M include/osmo-bts/gsm_data.h M src/osmo-bts-trx/loops.c 2 files changed, 38 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/12289/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 9e62cdf..1de5edd 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -24,6 +24,8 @@ #define GSM_BTS_AGCH_QUEUE_LOW_LEVEL_DEFAULT 41 #define GSM_BTS_AGCH_QUEUE_HIGH_LEVEL_DEFAULT 91 +#define LOGPLCHAN(lchan, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_lchan_name(lchan), ## args) + struct gsm_network { struct llist_head bts_list; unsigned int num_bts; diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index cb4a9cc..e9bc560 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -39,9 +39,8 @@ /*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan. * \param lchan logical channel for which to compute (and in whihc to store) new power. - * \param[in] chan_nr RSL channel number of the channel, only used for logging purpose. * \param[in] diff input delta value (in dB) */ -static void ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff) +static void ms_power_diff(struct gsm_lchan *lchan, int8_t diff) { struct gsm_bts_trx *trx = lchan->ts->trx; enum gsm_band band = trx->bts->band; @@ -77,20 +76,16 @@ new_power = lchan->ms_power_ctrl.current - MS_RAISE_MAX; if (lchan->ms_power_ctrl.current == new_power) { - LOGP(DLOOP, LOGL_INFO, "Keeping MS new_power of trx=%u " - "chan_nr=0x%02x at control level %d (%d dBm)\n", - trx->nr, chan_nr, new_power, - ms_pwr_dbm(band, new_power)); + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS new_power at control level %d (%d dBm)\n", + new_power, ms_pwr_dbm(band, new_power)); return; } - LOGP(DLOOP, LOGL_INFO, "%s MS new_power of trx=%u chan_nr=0x%02x from " - "control level %d (%d dBm) to %d (%d dBm)\n", + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS new_power from control level %d (%d dBm) to %d (%d dBm)\n", (diff > 0) ? "Raising" : "Lowering", - trx->nr, chan_nr, lchan->ms_power_ctrl.current, - ms_pwr_dbm(band, lchan->ms_power_ctrl.current), new_power, - ms_pwr_dbm(band, new_power)); + lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current), + new_power, ms_pwr_dbm(band, new_power)); /* store the resulting new MS power level in the lchan */ lchan->ms_power_ctrl.current = new_power; @@ -99,15 +94,16 @@ } /*! Input a new RSSI value into the MS power control loop for the given logical channel. + * \param lchan logical channel * \param chan_state L1 channel state of the logical channel. * \param rssi Received Signal Strength Indication (in dBm) */ -static void ms_power_val(struct l1sched_chan_state *chan_state, int8_t rssi) +static void ms_power_val(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state, int8_t rssi) { /* ignore inserted dummy frames, treat as lost frames */ if (rssi < -127) return; - LOGP(DLOOP, LOGL_DEBUG, "Got RSSI value of %d\n", rssi); + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Got RSSI value of %d\n", rssi); chan_state->meas.rssi_count++; @@ -122,10 +118,8 @@ } /*! Process a single clock tick of the MS power control loop. - * \param lchan Logical channel to which the clock tick applies - * \param[in] chan_nr RSL channel number (for logging purpose) */ -static void ms_power_clock(struct gsm_lchan *lchan, - uint8_t chan_nr, struct l1sched_chan_state *chan_state) + * \param lchan Logical channel to which the clock tick applies */ +static void ms_power_clock(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state) { struct gsm_bts_trx *trx = lchan->ts->trx; struct phy_instance *pinst = trx_phy_instance(trx); @@ -137,7 +131,7 @@ if (!(chan_state->meas.clock & 1)) return; - LOGP(DLOOP, LOGL_DEBUG, "Got SACCH master clock at RSSI count %d\n", + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Got SACCH master clock at RSSI count %d\n", chan_state->meas.rssi_count); /* wait for initial burst */ @@ -146,10 +140,8 @@ /* if no burst was received from MS at clock */ if (chan_state->meas.rssi_count == 0) { - LOGP(DLOOP, LOGL_NOTICE, "LOST SACCH frame of trx=%u " - "chan_nr=0x%02x, so we raise MS power\n", - trx->nr, chan_nr); - ms_power_diff(lchan, chan_nr, MS_RAISE_MAX); + LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE, "LOST SACCH frame, so we raise MS power\n"); + ms_power_diff(lchan, MS_RAISE_MAX); return; } @@ -169,12 +161,11 @@ chan_state->meas.rssi_valid_count = 0; /* change RSSI */ - LOGP(DLOOP, LOGL_DEBUG, "Lowest RSSI: %d Target RSSI: %d Current " - "MS power: %d (%d dBm) of trx=%u chan_nr=0x%02x\n", rssi, + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Lowest RSSI: %d Target RSSI: %d Current " + "MS power: %d (%d dBm)\n", rssi, pinst->phy_link->u.osmotrx.trx_target_rssi, lchan->ms_power_ctrl.current, - ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current), - trx->nr, chan_nr); - ms_power_diff(lchan, chan_nr, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi); + ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current)); + ms_power_diff(lchan, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi); } @@ -185,11 +176,8 @@ * Timing Advance loop */ -void ta_val(struct gsm_lchan *lchan, uint8_t chan_nr, - struct l1sched_chan_state *chan_state, int16_t toa256) +void ta_val(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state, int16_t toa256) { - struct gsm_bts_trx *trx = lchan->ts->trx; - /* check if the current L1 header acks to the current ordered TA */ if (lchan->meas.l1_info[1] != lchan->rqd_ta) return; @@ -204,21 +192,16 @@ /* check for change of TOA */ if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > 0) { - LOGP(DLOOP, LOGL_INFO, "TOA of trx=%u chan_nr=0x%02x is too " - "early (%d), now lowering TA from %d to %d\n", - trx->nr, chan_nr, toa256, lchan->rqd_ta, - lchan->rqd_ta - 1); + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too early (%d), now lowering TA from %d to %d\n", + toa256, lchan->rqd_ta, lchan->rqd_ta - 1); lchan->rqd_ta--; } else if (toa256 > TOA256_9OPERCENT && lchan->rqd_ta < 63) { - LOGP(DLOOP, LOGL_INFO, "TOA of trx=%u chan_nr=0x%02x is too " - "late (%d), now raising TA from %d to %d\n", - trx->nr, chan_nr, toa256, lchan->rqd_ta, - lchan->rqd_ta + 1); + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too late (%d), now raising TA from %d to %d\n", + toa256, lchan->rqd_ta, lchan->rqd_ta + 1); lchan->rqd_ta++; } else - LOGP(DLOOP, LOGL_INFO, "TOA of trx=%u chan_nr=0x%02x is " - "correct (%d), keeping current TA of %d\n", - trx->nr, chan_nr, toa256, lchan->rqd_ta); + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is correct (%d), keeping current TA of %d\n", + toa256, lchan->rqd_ta); chan_state->meas.toa_num = 0; chan_state->meas.toa256_sum = 0; @@ -240,11 +223,11 @@ /* if MS power control loop is enabled, handle it */ if (pinst->phy_link->u.osmotrx.trx_ms_power_loop) - ms_power_val(chan_state, rssi); + ms_power_val(lchan, chan_state, rssi); /* if TA loop is enabled, handle it */ if (pinst->phy_link->u.osmotrx.trx_ta_loop) - ta_val(lchan, chan_nr, chan_state, toa256); + ta_val(lchan, chan_state, toa256); } /*! Called once every downlink SACCH block needs to be sent. */ @@ -256,7 +239,7 @@ struct phy_instance *pinst = trx_phy_instance(l1t->trx); if (pinst->phy_link->u.osmotrx.trx_ms_power_loop) - ms_power_clock(lchan, chan_nr, chan_state); + ms_power_clock(lchan, chan_state); /* count the number of SACCH clocks */ chan_state->meas.clock++; @@ -297,19 +280,17 @@ chan_state->ber_num = 0; chan_state->ber_sum = 0; - LOGP(DLOOP, LOGL_DEBUG, "Current bit error rate (BER) %.6f " - "codec id %d of trx=%u chan_nr=0x%02x\n", ber, - chan_state->ul_ft, trx->nr, chan_nr); + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Current bit error rate (BER) %.6f " + "codec id %d\n", ber, chan_state->ul_ft); /* degrade */ if (chan_state->dl_cmr > 0) { /* degrade, if ber is above threshold FIXME: C/I */ if (ber > lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr-1].threshold) { - LOGP(DLOOP, LOGL_DEBUG, "Degrading due to BER %.6f " - "from codec id %d to %d of trx=%u " - "chan_nr=0x%02x\n", ber, chan_state->dl_cmr, - chan_state->dl_cmr - 1, trx->nr, chan_nr); + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Degrading due to BER %.6f " + "from codec id %d to %d\n", ber, chan_state->dl_cmr, + chan_state->dl_cmr - 1); chan_state->dl_cmr--; } return; @@ -321,10 +302,9 @@ if (ber < lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].threshold - lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].hysteresis) { - LOGP(DLOOP, LOGL_DEBUG, "Upgrading due to BER %.6f " - "from codec id %d to %d of trx=%u " - "chan_nr=0x%02x\n", ber, chan_state->dl_cmr, - chan_state->dl_cmr + 1, trx->nr, chan_nr); + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Upgrading due to BER %.6f " + "from codec id %d to %d\n", ber, chan_state->dl_cmr, + chan_state->dl_cmr + 1); chan_state->dl_cmr++; } -- To view, visit https://gerrit.osmocom.org/12289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6976dd7444c26b1f52741bc367b0311ebbef1718 Gerrit-Change-Number: 12289 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 12 23:10:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 12 Dec 2018 23:10:03 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Make code control flow more readable Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12290 Change subject: osmo-bts-trx/loops.c: Make code control flow more readable ...................................................................... osmo-bts-trx/loops.c: Make code control flow more readable Use the 'else' construct where applicable to avoid too many return paths from functions Change-Id: I819f0c80e90855e8b3252795c837f8e3053b6e87 Related: OS#1622, OS#1851 --- M src/osmo-bts-trx/loops.c 1 file changed, 9 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/90/12290/1 diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index e9bc560..a0b979a 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -78,19 +78,15 @@ if (lchan->ms_power_ctrl.current == new_power) { LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS new_power at control level %d (%d dBm)\n", new_power, ms_pwr_dbm(band, new_power)); + } else { + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS new_power from control level %d (%d dBm) to %d (%d dBm)\n", + (diff > 0) ? "Raising" : "Lowering", + lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current), + new_power, ms_pwr_dbm(band, new_power)); - return; + /* store the resulting new MS power level in the lchan */ + lchan->ms_power_ctrl.current = new_power; } - - LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS new_power from control level %d (%d dBm) to %d (%d dBm)\n", - (diff > 0) ? "Raising" : "Lowering", - lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current), - new_power, ms_pwr_dbm(band, new_power)); - - /* store the resulting new MS power level in the lchan */ - lchan->ms_power_ctrl.current = new_power; - - return; } /*! Input a new RSSI value into the MS power control loop for the given logical channel. @@ -110,8 +106,7 @@ chan_state->meas.rssi_got_burst = 1; /* store and process RSSI */ - if (chan_state->meas.rssi_valid_count - == ARRAY_SIZE(chan_state->meas.rssi)) + if (chan_state->meas.rssi_valid_count == ARRAY_SIZE(chan_state->meas.rssi)) return; chan_state->meas.rssi[chan_state->meas.rssi_valid_count++] = rssi; chan_state->meas.rssi_valid_count++; @@ -293,11 +288,7 @@ chan_state->dl_cmr - 1); chan_state->dl_cmr--; } - return; - } - - /* upgrade */ - if (chan_state->dl_cmr < chan_state->codecs - 1) { + } else if (chan_state->dl_cmr < chan_state->codecs - 1) { /* degrade, if ber is above threshold FIXME: C/I*/ if (ber < lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].threshold @@ -307,8 +298,6 @@ chan_state->dl_cmr + 1); chan_state->dl_cmr++; } - - return; } } -- To view, visit https://gerrit.osmocom.org/12290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I819f0c80e90855e8b3252795c837f8e3053b6e87 Gerrit-Change-Number: 12290 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 13 00:50:36 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 13 Dec 2018 00:50:36 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-libosmo-sccp_=C2=BB_a1=3Ddefault,a?= =?UTF-8?Q?2=3Ddefault,a3=3Ddefault,a4=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1933?= Message-ID: <189849357.1255.1544662236844.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 115.10 KB...] - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 libosmoabis.pc libosmotrau.pc ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmo-abis + osmo-build-dep.sh libosmo-netif =============================== libosmo-netif =============================== + mkdir -p + cd + osmo-deps.sh libosmo-netif + project=libosmo-netif + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmo-netif + cd libosmo-netif + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master HEAD is now at dc8fcf5... logging: fix typo in stream.c + git rev-parse HEAD dc8fcf5a696781048e2287e058f2b21af6164c9e + cd libosmo-netif + mkdir -p + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, '.'. libtoolize: copying file './ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'. libtoolize: copying file 'm4/libtool.m4' libtoolize: copying file 'm4/ltoptions.m4' libtoolize: copying file 'm4/ltsugar.m4' libtoolize: copying file 'm4/ltversion.m4' libtoolize: copying file 'm4/lt~obsolete.m4' configure.ac:20: installing './compile' configure.ac:22: installing './config.guess' configure.ac:22: installing './config.sub' configure.ac:8: installing './install-sh' configure.ac:8: installing './missing' examples/Makefile.am: installing './depcomp' + ./configure --prefix= --with-systemdsystemunitdir= configure: WARNING: unrecognized options: --with-systemdsystemunitdir checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking if gcc supports -fvisibility=hidden... yes checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for library containing sctp_send... -lsctp checking dahdi/user.h usability... no checking dahdi/user.h presence... no checking for dahdi/user.h... no configure: WARNING: DAHDI input driver will not be built checking pcap.h usability... yes checking pcap.h presence... yes checking for pcap.h... yes checking for doxygen... /usr/bin/doxygen checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-netif.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/netif/Makefile config.status: creating src/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.3.0.7-dc8f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' Making install in osmocom make[3]: Entering directory ' Making install in netif make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 amr.h datagram.h jibuf.h osmux.h ipa.h ipa_unit.h rs232.h rtp.h stream.h ' make[5]: Leaving directory ' make[4]: Leaving directory ' make[4]: Entering directory ' make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' CC amr.lo CC ipa_unit.lo CC datagram.lo CC ipa.lo CC rs232.lo CC osmux.lo CC jibuf.lo CC rtp.lo /bin/bash: line 2: 25782 Segmentation fault /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I.. -Wall -fPIC -Wall -I -I -I -g -O2 -Wall -MT datagram.lo -MD -MP -MF $depbase.Tpo -c -o datagram.lo datagram.c Makefile:465: recipe for target 'datagram.lo' failed make[2]: *** [datagram.lo] Error 139 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:494: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:793: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Dec 13 02:53:47 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 13 Dec 2018 02:53:47 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_trx.py: drop meaningless warnings Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12291 Change subject: trx_toolkit/ctrl_if_trx.py: drop meaningless warnings ...................................................................... trx_toolkit/ctrl_if_trx.py: drop meaningless warnings A timeslot can be reconfigured at runtime, this is normal. We should neither complain nor reject such commands. Change-Id: I0a69ebceed5aa724093e6d1b23faad8c16705055 --- M src/target/trx_toolkit/ctrl_if_trx.py 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/91/12291/1 diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py index b9fa751..5b2332b 100644 --- a/src/target/trx_toolkit/ctrl_if_trx.py +++ b/src/target/trx_toolkit/ctrl_if_trx.py @@ -120,18 +120,10 @@ # Deactivate TS (remove from the list of active timeslots) if ts in self.trx.ts_list: self.trx.ts_list.remove(ts) - else: - log.warning("TS %u was not activated before" % ts) - # TODO: uncomment as soon as RESET is introduced - # return -1 else: # Activate TS (add to the list of active timeslots) if ts not in self.trx.ts_list: self.trx.ts_list.append(ts) - else: - log.warning("TS %u was already activated before" % ts) - # TODO: uncomment as soon as RESET is introduced - # return -1 return 0 -- To view, visit https://gerrit.osmocom.org/12291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0a69ebceed5aa724093e6d1b23faad8c16705055 Gerrit-Change-Number: 12291 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 13 06:17:17 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 13 Dec 2018 06:17:17 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_?= =?UTF-8?Q?:_master-libosmo-sccp_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,a4=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#1934?= In-Reply-To: <189849357.1255.1544662236844.JavaMail.jenkins@jenkins.osmocom.org> References: <189849357.1255.1544662236844.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <903771852.1268.1544681837372.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Dec 13 08:05:02 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Thu, 13 Dec 2018 08:05:02 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: use VTY bind addr from config, deprecate cmd line opt... In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12208 ) Change subject: Revert "mobile: use VTY bind addr from config, deprecate cmd line options" ...................................................................... Patch Set 1: >From my point of view the original change should not have been submitted as it takes away a feature that is actively used and causes a regression. The revert seems to be the most fair option. I will take the pain and make the vty port configurable inside the config file. -- To view, visit https://gerrit.osmocom.org/12208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie89bc16b667dbe05baa76cfa4f86b4946f8019e8 Gerrit-Change-Number: 12208 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 13 Dec 2018 08:05:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 08:50:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 08:50:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: Add SGs testcases In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: Add SGs testcases ...................................................................... Patch Set 16: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 16 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Dec 2018 08:50:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 08:52:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 08:52:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... Patch Set 10: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11697/10//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11697/10//COMMIT_MSG at 10 PS10, Line 10: interface of the MSC while the actual test is running. Futer test Further or Future? -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 13 Dec 2018 08:52:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 08:59:18 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 13 Dec 2018 08:59:18 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 2: > Patch Set 2: > > > They can be left as they are I guess. You can try re-establishing them in the patch if you see it's easy to do so with current code base. No, I am not going to work on that because I don't think your suggested approach makes any sense. A program restart will look like one GSUP peer and route going away and a new GSUP peer and route appearing. And everything that needs to happen for this is already implemented by our current code. Compared to simply requiring that the problem be restarted. adding additional code paths to handle dynamic peer name and route changes at run-time carries a huge potential for bugs and side-effects. Perhaps this is a weak analogy but: A routing protocol daemon (such as OSPF) won't change its router ID at run-time either. > I think it's fine requiring the user to re-start the process for the change to take effect, I was just pointing out that independent of that topic, there should be a "no foobar" for the reason I introduced. I don't see a beneficial use case in clearing the IPA name before saving the current config. Why would anyone want to omit that name? If we require the name to be stored in the config file, why should it not always be saved when the file gets written out? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 13 Dec 2018 08:59:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 09:23:13 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 13 Dec 2018 09:23:13 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12243 to look at the new patch set (#3). Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... make gsup ipa name configurable in osmo-sgsn.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the SGSN on the GSUP link towards the HLR. This is required for GSUP routing in multi-SGSN networks. The 'ipa-name' option can only be set via the configuration file because changing the IPA name at run-time conflicts with active GSUP connections and routes configured in the HLR. The osmo-sgsn program must be restarted if its IPA name needs to change. Related: OS#3356 Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_subscriber.c M src/gprs/sgsn_vty.c 3 files changed, 39 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/12243/3 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 09:24:24 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 13 Dec 2018 09:24:24 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: For reasons I outlined above, patch set 3 adds the restriction that the 'ipa-name' option must be set in the configuration file and cannot be changed at run-time. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 13 Dec 2018 09:24:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 09:40:37 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Thu, 13 Dec 2018 09:40:37 +0000 Subject: Change in osmo-ci[master]: Reserve an ip address for the osmo-bts-virtual Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12292 Change subject: Reserve an ip address for the osmo-bts-virtual ...................................................................... Reserve an ip address for the osmo-bts-virtual Change-Id: Ia3b52d6fc66efc032b7de4769ad603da177e13da --- M ansible/roles/gsm-tester-network/templates/interface.j2 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/92/12292/1 diff --git a/ansible/roles/gsm-tester-network/templates/interface.j2 b/ansible/roles/gsm-tester-network/templates/interface.j2 index 30af679..b57aabb 100644 --- a/ansible/roles/gsm-tester-network/templates/interface.j2 +++ b/ansible/roles/gsm-tester-network/templates/interface.j2 @@ -73,3 +73,9 @@ iface {{ bts_interface }}:13 inet static address 10.42.42.54 netmask 255.255.255.0 + + +auto {{ bts_interface }}:14 +iface {{ bts_interface }}:14 inet static + address 10.42.42.55 + netmask 255.255.255.0 -- To view, visit https://gerrit.osmocom.org/12292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3b52d6fc66efc032b7de4769ad603da177e13da Gerrit-Change-Number: 12292 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:01:32 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 13 Dec 2018 10:01:32 +0000 Subject: Change in osmo-msc[master]: require 'ipa-name' option to be set via config file Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12293 Change subject: require 'ipa-name' option to be set via config file ...................................................................... require 'ipa-name' option to be set via config file The 'ipa-name' option can now only be set via the configuration file because changing the IPA name at run-time conflicts with active GSUP connections and routes configured in the HLR. The osmo-msc program must be restarted if its IPA name needs to change. Change-Id: I6cff91793e646e0396e8f1bc87d0f52709e5f12a Related: OS#3355 --- M include/osmocom/msc/vty.h M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c 3 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/93/12293/1 diff --git a/include/osmocom/msc/vty.h b/include/osmocom/msc/vty.h index 6a55df7..60a36d7 100644 --- a/include/osmocom/msc/vty.h +++ b/include/osmocom/msc/vty.h @@ -31,4 +31,6 @@ struct gsm_network *gsmnet_from_vty(struct vty *vty); +extern bool msc_parsing_config_file; + #endif diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 06e1139..87adc82 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -466,6 +466,12 @@ "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. " "The default is 'MSC-00-00-00-00-00-00'.\n") { + if (!msc_parsing_config_file) { + vty_out(vty, "The IPA name cannot be changed at run-time; " + "It can only be set in the configuraton file.%s", VTY_NEWLINE); + return CMD_WARNING; + } + gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]); return CMD_SUCCESS; } diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 8500b97..ce6ae38 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -24,6 +24,7 @@ * */ +#include #include #include #include @@ -514,6 +515,8 @@ extern void *tall_call_ctx; extern void *tall_trans_ctx; +bool msc_parsing_config_file = false; + int main(int argc, char **argv) { int rc; @@ -566,7 +569,9 @@ return -1; #endif + msc_parsing_config_file = true; rc = vty_read_config_file(msc_cmdline_config.config_file, NULL); + msc_parsing_config_file = false; if (rc < 0) { LOGP(DMSC, LOGL_FATAL, "Failed to parse the config file: '%s'\n", msc_cmdline_config.config_file); -- To view, visit https://gerrit.osmocom.org/12293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6cff91793e646e0396e8f1bc87d0f52709e5f12a Gerrit-Change-Number: 12293 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:03:55 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 13 Dec 2018 10:03:55 +0000 Subject: Change in osmo-sgsn[master]: remove pointless declaration of struct gsm_network In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12242 ) Change subject: remove pointless declaration of struct gsm_network ...................................................................... Patch Set 2: > Patch Set 2: > > Good, but now commit message require adjustment as well :) I did update the commit message, did I not? What is wrong with the current commit message? -- To view, visit https://gerrit.osmocom.org/12242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Gerrit-Change-Number: 12242 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 13 Dec 2018 10:03:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:07:43 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 10:07:43 +0000 Subject: Change in osmo-trx[master]: LMSDevice: make use of dev-args in osmo-trx.cfg In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12245 to look at the new patch set (#5). Change subject: LMSDevice: make use of dev-args in osmo-trx.cfg ...................................................................... LMSDevice: make use of dev-args in osmo-trx.cfg Allow selecting a specific LimeSDR device by setting dev-args in the config file. Split up the given dev-args address by comma and select the device where all substrings can be found. I could not test this with real hardware, but I have added a test case to make sure this works as expected. Related: OS#3654 Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 --- M .gitignore M Transceiver52M/device/lms/LMSDevice.cpp A tests/Transceiver52M/LMSDeviceTest.cpp M tests/Transceiver52M/Makefile.am M tests/testsuite.at 5 files changed, 98 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/45/12245/5 -- To view, visit https://gerrit.osmocom.org/12245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 Gerrit-Change-Number: 12245 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:07:50 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 10:07:50 +0000 Subject: Change in osmo-trx[master]: LMSDevice: make use of dev-args in osmo-trx.cfg In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12245 ) Change subject: LMSDevice: make use of dev-args in osmo-trx.cfg ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12245/4/tests/Transceiver52M/Makefile.am File tests/Transceiver52M/Makefile.am: https://gerrit.osmocom.org/#/c/12245/4/tests/Transceiver52M/Makefile.am at 25 PS4, Line 25: $(top_builddir)/Transceiver52M/device/lms/.libs/LMSDevice.o \ > Use $(builddir)/device/lms/libdevice.la here [?] Thanks. Applied the changes, but with $(top_builddir)/Transceiver52M/device/lms/libdevice.la instead, because otherwise it results in: make[2]: *** No rule to make target 'device/lms/libdevice.la', needed by 'LMSDeviceTest'. Stop -- To view, visit https://gerrit.osmocom.org/12245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 Gerrit-Change-Number: 12245 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 13 Dec 2018 10:07:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:08:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 10:08:41 +0000 Subject: Change in osmo-trx[master]: osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12278 ) Change subject: osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp ...................................................................... osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp Make the "opt" argument const. This function will also be used by LMSDevice.cpp in a follow-up commit. Related: OS#3654 Change-Id: If3f0f682ca453c2b0a06175ec9626567932cfce6 --- M CommonLibs/Makefile.am A CommonLibs/Utils.cpp A CommonLibs/Utils.h M Transceiver52M/osmo-trx.cpp 4 files changed, 63 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am index 9fabcf1..83bd0c0 100644 --- a/CommonLibs/Makefile.am +++ b/CommonLibs/Makefile.am @@ -34,6 +34,7 @@ Threads.cpp \ Timeval.cpp \ Logger.cpp \ + Utils.cpp \ trx_vty.c \ debug.c libcommon_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS) @@ -48,6 +49,7 @@ Timeval.h \ Vector.h \ Logger.h \ + Utils.h \ trx_vty.h \ debug.h \ osmo_signal.h \ diff --git a/CommonLibs/Utils.cpp b/CommonLibs/Utils.cpp new file mode 100644 index 0000000..6cd4f84 --- /dev/null +++ b/CommonLibs/Utils.cpp @@ -0,0 +1,36 @@ +/* + * Copyright 2018 sysmocom - s.f.m.c. GmbH + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include + +std::vector comma_delimited_to_vector(const char* opt) +{ + std::string str = std::string(opt); + std::vector result; + std::stringstream ss(str); + + while( ss.good() ) + { + std::string substr; + getline(ss, substr, ','); + result.push_back(substr); + } + return result; +} diff --git a/CommonLibs/Utils.h b/CommonLibs/Utils.h new file mode 100644 index 0000000..4f0fbc0 --- /dev/null +++ b/CommonLibs/Utils.h @@ -0,0 +1,24 @@ +/* + * Copyright 2018 sysmocom - s.f.m.c. GmbH + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#pragma once + +#include +#include + +std::vector comma_delimited_to_vector(const char* opt); diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 2b69da4..0e63020 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -22,6 +22,7 @@ #include "Transceiver.h" #include "radioDevice.h" +#include "Utils.h" #include #include @@ -194,21 +195,6 @@ osmo_init_ignore_signals(); } -static std::vector comma_delimited_to_vector(char* opt) -{ - std::string str = std::string(opt); - std::vector result; - std::stringstream ss(str); - - while( ss.good() ) - { - std::string substr; - getline(ss, substr, ','); - result.push_back(substr); - } - return result; -} - static void print_help() { fprintf(stdout, "Options:\n" -- To view, visit https://gerrit.osmocom.org/12278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If3f0f682ca453c2b0a06175ec9626567932cfce6 Gerrit-Change-Number: 12278 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:14:29 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Thu, 13 Dec 2018 10:14:29 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Add a virtual bts and make use of it In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12209 to look at the new patch set (#2). Change subject: ms_driver: Add a virtual bts and make use of it ...................................................................... ms_driver: Add a virtual bts and make use of it It's very close to the osmo-bts-trx but without osmo-trx. Modify the suite to make use of this BTS. Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 --- M example/resources.conf.prod A src/osmo_gsm_tester/bts_osmovirtual.py M src/osmo_gsm_tester/resource.py A src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl M suites/nitb_netreg_mass/suite.conf 5 files changed, 173 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/09/12209/2 -- To view, visit https://gerrit.osmocom.org/12209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 Gerrit-Change-Number: 12209 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:17:10 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Thu, 13 Dec 2018 10:17:10 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Add a virtual bts and make use of it In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12209 to look at the new patch set (#3). Change subject: ms_driver: Add a virtual bts and make use of it ...................................................................... ms_driver: Add a virtual bts and make use of it It's very close to the osmo-bts-trx but without osmo-trx. Modify the suite to make use of this BTS. Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 --- M example/defaults.conf M example/resources.conf.prod A src/osmo_gsm_tester/bts_osmovirtual.py M src/osmo_gsm_tester/resource.py A src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl M suites/nitb_netreg_mass/suite.conf 6 files changed, 175 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/09/12209/3 -- To view, visit https://gerrit.osmocom.org/12209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 Gerrit-Change-Number: 12209 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:17:42 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Thu, 13 Dec 2018 10:17:42 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Add a virtual bts and make use of it In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12209 ) Change subject: ms_driver: Add a virtual bts and make use of it ...................................................................... Patch Set 2: (3 comments) PTAL https://gerrit.osmocom.org/#/c/12209/1/example/resources.conf.prod File example/resources.conf.prod: https://gerrit.osmocom.org/#/c/12209/1/example/resources.conf.prod at 115 PS1, Line 115: ipa_unit_id: 13 > This ipa_unit_id is already used by LimeSDR-USB (line 54), use another one. 13 is fine. Done https://gerrit.osmocom.org/#/c/12209/1/example/resources.conf.prod at 116 PS1, Line 116: addr: 10.42.42.55 > This IP addr doesn't seem to be set up in the osmo-gsm-tester main unit. [?] Done https://gerrit.osmocom.org/#/c/12209/1/example/resources.conf.prod at 118 PS1, Line 118: num_trx: 1 > num_trx: 1 is the default (see bsc_bts in example/defaults.conf), no need to put it here. Done -- To view, visit https://gerrit.osmocom.org/12209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 Gerrit-Change-Number: 12209 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 10:17:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:21:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 10:21:03 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages ...................................................................... Patch Set 10: -Code-Review (6 comments) https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup_sms.h File include/osmocom/gsm/gsup_sms.h: https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup_sms.h at 17 PS10, Line 17: OSMO_GSUP_SMS_SM_RP_ODA_NONE = 0x00, > isn't "SMS_SM" redundant? could it be just OSMO_GSUP_SMS_ or just OSMO_GSUP_SM_? OSMO_GSUP_SMS is the gsup-sub-type SMS SM_RP_ODA is the 3GPP part for the SM- sub-layer. Everything fine here. https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup_sms.h at 29 PS10, Line 29: /* SM-RP-DA IE coding functions */ > a) I see that in the function name; unless you also explain "SM", "RP" or "DA", you might as well dr [?] The assumption here is probably that the potential reader is familiar with the SMS system as specified by 3GPP (and hence knows SM-RP-DA), but he may not be familiar with the osmocom specific GSUP protocol. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup.c File src/gsm/gsup.c: https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup.c at 569 PS10, Line 569: int idx, rc; > (rather place each var on its own line) we never had any such rule https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup.c at 668 PS10, Line 668: sizeof(u8), gsup_msg->sm_rp_mr); > (either line up with '(' or use a single tab as indent) we also never enforced a rule like this. I'm sure there are plenty of examples that look like this. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c File src/gsm/gsup_sms.c: https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 55 PS10, Line 55: msgb_tv_put I don't think we should introduce anything but TLV in GSUP. Having the IEI determine if it's a TV/TLV/TL16V etc. is quite ugly and we shouldn't replicate this in our own protocols. Let's have each IE be a TLV. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 82 PS10, Line 82: *ie_len = msg->tail - (ie_len + 1); > so ... this looks like this now? [?] I'm sure we have examples of nested IEs in other cases / protocol layers (like TS 12.21 Abis OML), in the xUA routing key management of osmo-stp. Not in GSUP so far, but I don't understand your strong opposition to it. What I do understand is that the current proposed code by vadim isn't nice. Whatever the solutoin (nested or not), there must be proper helper functions that avoid manual pointer calculations like the lines above. -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 10 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Dec 2018 10:21:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:23:17 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 10:23:17 +0000 Subject: Change in osmo-sgsn[master]: remove pointless declaration of struct gsm_network In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12242 ) Change subject: remove pointless declaration of struct gsm_network ...................................................................... Patch Set 2: Code-Review+1 > Patch Set 2: > What is wrong with the current commit message? My bad, probably looked at old version of the patch. -- To view, visit https://gerrit.osmocom.org/12242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Gerrit-Change-Number: 12242 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 13 Dec 2018 10:23:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:36:18 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 13 Dec 2018 10:36:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: add test to try two LU from different BSCs In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9204 to look at the new patch set (#6). Change subject: MSC_Tests: add test to try two LU from different BSCs ...................................................................... MSC_Tests: add test to try two LU from different BSCs Currently we are only able to simulate a Location Update from a single BSC. However, as a preperation for inter BSC handover tests we need to be able to communicate to the MSC from two independed BSC instances. A location update is a simple operation to try out the multi-bsc functionality - Add support to create multiple BSC instances in independed ports - Add test to simulate a LU from two different BSCs Change-Id: Ib3eabf8537066f43faed8fb983d9e1f4092ec515 Related: OS#1609 --- M library/BSSMAP_Emulation.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/expected-results.xml 4 files changed, 67 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/9204/6 -- To view, visit https://gerrit.osmocom.org/9204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib3eabf8537066f43faed8fb983d9e1f4092ec515 Gerrit-Change-Number: 9204 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:49:18 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 10:49:18 +0000 Subject: Change in osmo-sgsn[master]: ACL: integrate sanitize check into sgsn_acl_* functions In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12227 ) Change subject: ACL: integrate sanitize check into sgsn_acl_* functions ...................................................................... Patch Set 5: > Patch Set 5: > I did, maybe it was not clear enough: "I think sanitizing the imsi should be done by caller of sgsn_acl_* based on where the information come from (from the wire or from known sanitized source)." > Hmm, I was sure I've addressed it already. Anyway, the "where the information come from" is not applicable because it only comes from a single source which is not trusted so we always sanitize it. > If you know your data is sane there's no need to re-sanitize it. That's not our case. > You should expect the caller of a data struct to provide sane data instead of internally sanitizing it and storing different data from what was provided. Sorry, you've lost me with "caller of a data struct" - what do you mean by that? > It's responsibility of the caller (vty code for instance) to make sure parse of human input is correctly parsed and sanitized. I disagree, and the code I've looked over seems to disagree as well. For example, in osmo_bsc_vty.c: * osmo_mcc_from_str() sanitize data internally * gsm_parse_reg() regexp compiled and result checked outside of vty In general, I don't see any non-trivial checks done inside vty which I think is the right thing. What would be the advantage of having this check in separate file instead of static function in the same file? We can also move it to libosmocore but I don't see any benefits from keeping it in vty. Do you? > You can do checks inside the data structure if you want (I wouldn't), but I'd avoid changing content of the data being handled in there. You mean inside function? The rest would be addressed in a next revision. -- To view, visit https://gerrit.osmocom.org/12227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic3dff108148683b107e9edac430a0475283580e9 Gerrit-Change-Number: 12227 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 13 Dec 2018 10:49:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:58:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 10:58:16 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Add comments documenting TA + MS power control ... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12287 ) Change subject: osmo-bts-trx/loops.c: Add comments documenting TA + MS power control loop ...................................................................... Patch Set 1: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/12287/1/src/osmo-bts-trx/loops.c File src/osmo-bts-trx/loops.c: https://gerrit.osmocom.org/#/c/12287/1/src/osmo-bts-trx/loops.c at 41 PS1, Line 41: * \param lchan logical channel for which to compute (and in whihc to store) new power. typo: which "new power value" seems more appropiate. Probably also add: "new power value from previous value" https://gerrit.osmocom.org/#/c/12287/1/src/osmo-bts-trx/loops.c at 52 PS1, Line 52: /* compute new target MS output power level based on current value subtracted by 'diff/2' */ s/current/previous would be more easy to catch. current may refer to new or old one. Perhaps you want to explain somehow why diff/2. I think it's because we use steps of 2dB as granularity? https://gerrit.osmocom.org/#/c/12287/1/src/osmo-bts-trx/loops.c at 64 PS1, Line 64: if (arfcn >= 512 && arfcn <= 885) { Not directly related, but: this code looks like a good candidate to be a separate function and perhaps in libosmogsm? osmo_max_power_ms_by_band() or similar. -- To view, visit https://gerrit.osmocom.org/12287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iafea07eb751ed85d29b214576bb0d31ea919cd72 Gerrit-Change-Number: 12287 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 10:58:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 10:58:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 10:58:50 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.[ch]: Make functions "void" if they always return 0 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12288 ) Change subject: osmo-bts-trx/loops.[ch]: Make functions "void" if they always return 0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3575a2cef75f3fd4c3f95eddb40719d28a055b54 Gerrit-Change-Number: 12288 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 10:58:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:00:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 11:00:52 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Use lchan name based logging In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12289 ) Change subject: osmo-bts-trx/loops.c: Use lchan name based logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6976dd7444c26b1f52741bc367b0311ebbef1718 Gerrit-Change-Number: 12289 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 11:00:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:01:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 11:01:01 +0000 Subject: Change in osmo-msc[master]: require 'ipa-name' option to be set via config file In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12293 ) Change subject: require 'ipa-name' option to be set via config file ...................................................................... Patch Set 1: (2 comments) That's a minor note though - mostly commenting just in case I need the same thing for some config option in future :) https://gerrit.osmocom.org/#/c/12293/1/src/osmo-msc/msc_main.c File src/osmo-msc/msc_main.c: https://gerrit.osmocom.org/#/c/12293/1/src/osmo-msc/msc_main.c at 518 PS1, Line 518: bool msc_parsing_config_file = false; Why not initialize it with true to begin with? https://gerrit.osmocom.org/#/c/12293/1/src/osmo-msc/msc_main.c at 572 PS1, Line 572: msc_parsing_config_file = true; So, here it's set to true. -- To view, visit https://gerrit.osmocom.org/12293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6cff91793e646e0396e8f1bc87d0f52709e5f12a Gerrit-Change-Number: 12293 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Thu, 13 Dec 2018 11:01:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:02:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 11:02:57 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Make code control flow more readable In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12290 ) Change subject: osmo-bts-trx/loops.c: Make code control flow more readable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I819f0c80e90855e8b3252795c837f8e3053b6e87 Gerrit-Change-Number: 12290 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 11:02:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:04:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 11:04:50 +0000 Subject: Change in osmo-ci[master]: Reserve an ip address for the osmo-bts-virtual In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12292 ) Change subject: Reserve an ip address for the osmo-bts-virtual ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3b52d6fc66efc032b7de4769ad603da177e13da Gerrit-Change-Number: 12292 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 11:04:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:06:08 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 11:06:08 +0000 Subject: Change in osmo-sysmon[master]: Add cmdline option parsing support In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12285 ) Change subject: Add cmdline option parsing support ...................................................................... Patch Set 1: Code-Review-1 (1 comment) This program regularly print stuff on screen based on config file - kinda similar to "watch". Why and when would we want to run it as daemon? https://gerrit.osmocom.org/#/c/12285/1/src/osysmon_main.c File src/osysmon_main.c: https://gerrit.osmocom.org/#/c/12285/1/src/osysmon_main.c at 224 PS1, Line 224: rc = osmo_daemonize(); What would be use-case for this? -- To view, visit https://gerrit.osmocom.org/12285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I742974bd1440b09b49d26703c13361dd1c41008b Gerrit-Change-Number: 12285 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 13 Dec 2018 11:06:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:07:51 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 11:07:51 +0000 Subject: Change in osmo-sysmon[master]: Move source code to src subdir In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12284 ) Change subject: Move source code to src subdir ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1aa2893e2b274f8d087a0d2f126486cd4afcbdfe Gerrit-Change-Number: 12284 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 13 Dec 2018 11:07:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:09:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 11:09:25 +0000 Subject: Change in osmo-ci[master]: Reserve an ip address for the osmo-bts-virtual In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12292 ) Change subject: Reserve an ip address for the osmo-bts-virtual ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3b52d6fc66efc032b7de4769ad603da177e13da Gerrit-Change-Number: 12292 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 11:09:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:09:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 11:09:43 +0000 Subject: Change in osmo-ci[master]: Reserve an ip address for the osmo-bts-virtual In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12292 ) Change subject: Reserve an ip address for the osmo-bts-virtual ...................................................................... Patch Set 1: IP addr are not added to prod and RnD setup, you can already use them. -- To view, visit https://gerrit.osmocom.org/12292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3b52d6fc66efc032b7de4769ad603da177e13da Gerrit-Change-Number: 12292 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 11:09:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:11:12 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 11:11:12 +0000 Subject: Change in osmo-sysmon[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12286 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: (1 comment) In general, see comment on the previous patch: I'm not convinced we would ever run this as daemon because the whole purpose of this is to regularly display stuff on the console. Hence detaching it from the console seems kinda pointless to me. https://gerrit.osmocom.org/#/c/12286/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12286/1//COMMIT_MSG at 7 PS1, Line 7: Install systemd services with autotools That's misleading - you're not just installing it, you've also added the service etc. More elaborate description please in such cases. -- To view, visit https://gerrit.osmocom.org/12286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4875b74bcf2b6232d915070b77fc202a03ef997 Gerrit-Change-Number: 12286 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Thu, 13 Dec 2018 11:11:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:11:17 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 11:11:17 +0000 Subject: Change in osmo-sysmon[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12286 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/12286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4875b74bcf2b6232d915070b77fc202a03ef997 Gerrit-Change-Number: 12286 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 13 Dec 2018 11:11:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:12:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 11:12:31 +0000 Subject: Change in osmo-trx[master]: LMSDevice: make use of dev-args in osmo-trx.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12245 ) Change subject: LMSDevice: make use of dev-args in osmo-trx.cfg ...................................................................... Patch Set 5: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12245/4/tests/Transceiver52M/Makefile.am File tests/Transceiver52M/Makefile.am: https://gerrit.osmocom.org/#/c/12245/4/tests/Transceiver52M/Makefile.am at 25 PS4, Line 25: $(top_builddir)/Transceiver52M/device/lms/libdevice.la \ > Thanks. Applied the changes, but with [?] Yes, correct, you should use top_builddir there :) -- To view, visit https://gerrit.osmocom.org/12245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 Gerrit-Change-Number: 12245 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 13 Dec 2018 11:12:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:13:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 11:13:05 +0000 Subject: Change in osmo-trx[master]: LMSDevice: make use of dev-args in osmo-trx.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12245 ) Change subject: LMSDevice: make use of dev-args in osmo-trx.cfg ...................................................................... LMSDevice: make use of dev-args in osmo-trx.cfg Allow selecting a specific LimeSDR device by setting dev-args in the config file. Split up the given dev-args address by comma and select the device where all substrings can be found. I could not test this with real hardware, but I have added a test case to make sure this works as expected. Related: OS#3654 Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 --- M .gitignore M Transceiver52M/device/lms/LMSDevice.cpp A tests/Transceiver52M/LMSDeviceTest.cpp M tests/Transceiver52M/Makefile.am M tests/testsuite.at 5 files changed, 98 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/.gitignore b/.gitignore index ad4c4e3..f163fb6 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ tests/CommonLibs/VectorTest tests/CommonLibs/PRBSTest tests/Transceiver52M/convolve_test +tests/Transceiver52M/LMSDeviceTest # automake/autoconf *.in diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 5e21894..270bd4a 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -21,6 +21,7 @@ #include "Logger.h" #include "Threads.h" #include "LMSDevice.h" +#include "Utils.h" #include @@ -95,6 +96,35 @@ << " Step=" << range->step; } +/*! Find the device string that matches all filters from \a args. + * \param[in] info_list device addresses found by LMS_GetDeviceList() + * \param[in] count length of info_list + * \param[in] args dev-args value from osmo-trx.cfg, containing comma separated key=value pairs + * \return index of first matching device or -1 (no match) */ +int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args) +{ + unsigned int i, j; + vector filters; + + filters = comma_delimited_to_vector(args.c_str()); + + /* iterate over device addresses */ + for (i=0; i < count; i++) { + /* check if all filters match */ + bool match = true; + for (j=0; j < filters.size(); j++) { + if (!strstr(info_list[i], filters[j].c_str())) { + match = false; + break; + } + } + + if (match) + return i; + } + return -1; +} + int LMSDevice::open(const std::string &args, int ref, bool swap_channels) { //lms_info_str_t dev_str; @@ -103,7 +133,7 @@ float_type sr_host, sr_rf, lpfbw_rx, lpfbw_tx; uint16_t dac_val; unsigned int i, n; - int rc; + int rc, dev_id; LOGC(DDEV, INFO) << "Opening LMS device.."; @@ -123,7 +153,15 @@ for (i = 0; i < n; i++) LOGC(DDEV, INFO) << "Device [" << i << "]: " << info_list[i]; - rc = LMS_Open(&m_lms_dev, info_list[0], NULL); + dev_id = info_list_find(info_list, n, args); + if (dev_id == -1) { + LOGC(DDEV, ERROR) << "No LMS device found with address '" << args << "'"; + delete[] info_list; + return -1; + } + + LOGC(DDEV, INFO) << "Using device[" << dev_id << "]"; + rc = LMS_Open(&m_lms_dev, info_list[dev_id], NULL); if (rc != 0) { LOGC(DDEV, ERROR) << "LMS_GetDeviceList() failed)"; delete [] info_list; diff --git a/tests/Transceiver52M/LMSDeviceTest.cpp b/tests/Transceiver52M/LMSDeviceTest.cpp new file mode 100644 index 0000000..d40a7ec --- /dev/null +++ b/tests/Transceiver52M/LMSDeviceTest.cpp @@ -0,0 +1,41 @@ +#include +#include +#include + +extern "C" +{ +size_t osmo_strlcpy(char *dst, const char *src, size_t siz); +} + +int info_list_find(lms_info_str_t* info_list, unsigned int count, const std::string &args); + +using namespace std; + +int main(void) +{ + unsigned int count; + lms_info_str_t* info_list; + std::string args; + + /* two fake entries for info_list */ + count = 2; + info_list = new lms_info_str_t[count]; + osmo_strlcpy(info_list[0], "LimeSDR Mini, addr=24607:1337, serial=FAKESERIAL0001", sizeof(lms_info_str_t)); + osmo_strlcpy(info_list[1], "LimeSDR Mini, addr=24607:1338, serial=FAKESERIAL0002", sizeof(lms_info_str_t)); + + /* find second entry by args filter */ + args = "serial=FAKESERIAL0002,LimeSDR Mini"; + assert(info_list_find(info_list, count, args) == 1); + + /* empty args -> first entry */ + args = ""; + assert(info_list_find(info_list, count, args) == 0); + + /* not matching args -> -1 */ + args = "serial=NOTMATCHING"; + assert(info_list_find(info_list, count, args) == -1); + + /* clean up */ + delete[] info_list; + return 0; +} diff --git a/tests/Transceiver52M/Makefile.am b/tests/Transceiver52M/Makefile.am index 06db5b0..df3ae57 100644 --- a/tests/Transceiver52M/Makefile.am +++ b/tests/Transceiver52M/Makefile.am @@ -16,3 +16,13 @@ if HAVE_SSE4_1 convolve_test_CFLAGS += $(SIMD_FLAGS) endif + +if DEVICE_LMS +noinst_PROGRAMS += LMSDeviceTest +LMSDeviceTest_SOURCES = LMSDeviceTest.cpp +LMSDeviceTest_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LMS_LIBS) +LMSDeviceTest_LDADD = \ + $(top_builddir)/Transceiver52M/device/lms/libdevice.la \ + $(COMMON_LA) +LMSDeviceTest_CPPFLAGS = $(AM_CPPFLAGS) $(LMS_CFLAGS) +endif diff --git a/tests/testsuite.at b/tests/testsuite.at index f84225e..22de782 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -1,6 +1,12 @@ AT_INIT AT_BANNER([Regression tests.]) +AT_SETUP([LMSDeviceTest]) +AT_KEYWORDS([LMSDeviceTest]) +AT_SKIP_IF([! test -e $abs_top_builddir/tests/Transceiver52M/LMSDeviceTest]) +AT_CHECK([$abs_top_builddir/tests/Transceiver52M/LMSDeviceTest], [], [], []) +AT_CLEANUP + AT_SETUP([BitVectorTest]) AT_KEYWORDS([BitVectorTest]) cat $abs_srcdir/CommonLibs/BitVectorTest.ok > expout -- To view, visit https://gerrit.osmocom.org/12245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib9aaa066a01bf9de3f78234d7ada884d6f28c852 Gerrit-Change-Number: 12245 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:14:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 11:14:08 +0000 Subject: Change in osmo-ci[master]: Reserve an ip address for the osmo-bts-virtual In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12292 ) Change subject: Reserve an ip address for the osmo-bts-virtual ...................................................................... Reserve an ip address for the osmo-bts-virtual Change-Id: Ia3b52d6fc66efc032b7de4769ad603da177e13da --- M ansible/roles/gsm-tester-network/templates/interface.j2 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/ansible/roles/gsm-tester-network/templates/interface.j2 b/ansible/roles/gsm-tester-network/templates/interface.j2 index 30af679..b57aabb 100644 --- a/ansible/roles/gsm-tester-network/templates/interface.j2 +++ b/ansible/roles/gsm-tester-network/templates/interface.j2 @@ -73,3 +73,9 @@ iface {{ bts_interface }}:13 inet static address 10.42.42.54 netmask 255.255.255.0 + + +auto {{ bts_interface }}:14 +iface {{ bts_interface }}:14 inet static + address 10.42.42.55 + netmask 255.255.255.0 -- To view, visit https://gerrit.osmocom.org/12292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia3b52d6fc66efc032b7de4769ad603da177e13da Gerrit-Change-Number: 12292 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:19:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 11:19:00 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Add a virtual bts and make use of it In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12209 ) Change subject: ms_driver: Add a virtual bts and make use of it ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 Gerrit-Change-Number: 12209 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 11:19:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:34:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 11:34:47 +0000 Subject: Change in osmo-sysmon[master]: Add cmdline option parsing support In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12285 ) Change subject: Add cmdline option parsing support ...................................................................... Patch Set 1: > (1 comment) > > This program regularly print stuff on screen based on config file - > kinda similar to "watch". Why and when would we want to run it as > daemon? You may still want to run it as a daemon and log to a file or syslog/journald to have a log where you can see evolution of the state of the system. For instance to see if some link broke during a wile and for how much time. It's true that the output format is not the best to be used this way, but it can be improved later via some cmd line opt to print in a better format for this kind of scenario (like printing only relevant changes, or everything in 1 line). -- To view, visit https://gerrit.osmocom.org/12285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I742974bd1440b09b49d26703c13361dd1c41008b Gerrit-Change-Number: 12285 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 11:34:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:37:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 11:37:31 +0000 Subject: Change in osmo-sysmon[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12286 ) Change subject: Install systemd services with autotools ...................................................................... Patch Set 1: (1 comment) > (1 comment) > > In general, see comment on the previous patch: I'm not convinced we > would ever run this as daemon because the whole purpose of this is > to regularly display stuff on the console. Hence detaching it from > the console seems kinda pointless to me. See my comment in previous patch explaining it may be useful to use it as a daemon. https://gerrit.osmocom.org/#/c/12286/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12286/1//COMMIT_MSG at 7 PS1, Line 7: Install systemd services with autotools > That's misleading - you're not just installing it, you've also added the service etc. [?] I re-used same commit message I used in most osmocom projects when I added systemd bits, so it can be matched to see similar stuff was done here. -- To view, visit https://gerrit.osmocom.org/12286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4875b74bcf2b6232d915070b77fc202a03ef997 Gerrit-Change-Number: 12286 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 11:37:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 11:39:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 11:39:12 +0000 Subject: Change in osmo-sysmon[master]: Introduce systemd service file and install with autotools In-Reply-To: References: Message-ID: Hello Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12286 to look at the new patch set (#2). Change subject: Introduce systemd service file and install with autotools ...................................................................... Introduce systemd service file and install with autotools Change-Id: Ic4875b74bcf2b6232d915070b77fc202a03ef997 --- M Makefile.am M configure.ac A contrib/Makefile.am A contrib/systemd/Makefile.am A contrib/systemd/osmo-sysmon.service 5 files changed, 41 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/86/12286/2 -- To view, visit https://gerrit.osmocom.org/12286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic4875b74bcf2b6232d915070b77fc202a03ef997 Gerrit-Change-Number: 12286 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 12:08:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 12:08:17 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Add a virtual bts and make use of it In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12209 ) Change subject: ms_driver: Add a virtual bts and make use of it ...................................................................... ms_driver: Add a virtual bts and make use of it It's very close to the osmo-bts-trx but without osmo-trx. Modify the suite to make use of this BTS. Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 --- M example/defaults.conf M example/resources.conf.prod A src/osmo_gsm_tester/bts_osmovirtual.py M src/osmo_gsm_tester/resource.py A src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl M suites/nitb_netreg_mass/suite.conf 6 files changed, 175 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/defaults.conf b/example/defaults.conf index eee17b1..3de5e29 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -84,3 +84,6 @@ type: uhd launch_trx: true clock_reference: internal + +osmo_bts_virtual: + max_trx: 1 diff --git a/example/resources.conf.prod b/example/resources.conf.prod index e786836..e6ade3a 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -110,6 +110,12 @@ device: '01:01:4d:98:24' port: '3' +- label: OsmoBTS Virtual + type: osmo-bts-virtual + ipa_unit_id: 13 + addr: 10.42.42.55 + band: GSM-1800 + arfcn: - arfcn: 512 band: GSM-1800 diff --git a/src/osmo_gsm_tester/bts_osmovirtual.py b/src/osmo_gsm_tester/bts_osmovirtual.py new file mode 100644 index 0000000..516d992 --- /dev/null +++ b/src/osmo_gsm_tester/bts_osmovirtual.py @@ -0,0 +1,115 @@ +# osmo_gsm_tester: specifics for running an osmo-bts-virtual +# +# Copyright (C) 2016-2017 by sysmocom - s.f.m.c. GmbH +# Copyright (C) 2018 Holger Hans Peter Freyther +# +# Author: Neels Hofmeyr +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import os +import pprint +from . import config, util, template, process, bts_osmo + +class OsmoBtsVirtual(bts_osmo.OsmoBtsMainUnit): +############## +# PROTECTED +############## + + BIN_BTS = 'osmo-bts-virtual' + BIN_PCU = 'osmo-pcu' + + CONF_BTS = 'osmo-bts-virtual.cfg' + + def __init__(self, suite_run, conf): + """Initializes the OsmoBtsVirtual.""" + super().__init__(suite_run, conf, OsmoBtsVirtual.BIN_BTS, 'osmo_bts_virtual') + self.run_dir = None + self.inst = None + self.env = {} + + def launch_process(self, keepalive, binary_name, *args): + """Launches the osmo-bts-virtual process.""" + + binary = os.path.abspath(self.inst.child('bin', binary_name)) + run_dir = self.run_dir.new_dir(binary_name) + if not os.path.isfile(binary): + raise RuntimeError('Binary missing: %r' % binary) + proc = process.Process(binary_name, run_dir, + (binary,) + args, + env=self.env) + self.suite_run.remember_to_stop(proc, keepalive) + proc.launch() + return proc + + def configure(self): + """Builds the configuration for osmo-bts-virtual and writes it to a file.""" + + if self.bsc is None: + raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be configured') + self.config_file = self.run_dir.new_file(OsmoBtsVirtual.CONF_BTS) + self.dbg(config_file=self.config_file) + + values = dict(osmo_bts_virtual=config.get_defaults('osmo_bts_virtual')) + config.overlay(values, self.suite_run.config()) + config.overlay(values, { + 'osmo_bts_virtual': { + 'oml_remote_ip': self.bsc.addr(), + 'pcu_socket_path': self.pcu_socket_path(), + } + }) + config.overlay(values, { 'osmo_bts_virtual': self.conf }) + + self.dbg('OSMO-BTS-VIRTUAL CONFIG:\n' + pprint.pformat(values)) + + with open(self.config_file, 'w') as f: + r = template.render(OsmoBtsVirtual.CONF_BTS, values) + self.dbg(r) + f.write(r) + +######################## +# PUBLIC - INTERNAL API +######################## + def conf_for_bsc(self): + """Returns the configuration for the BSC (including the BSC/NITB IP).""" + values = self.conf_for_bsc_prepare() + self.dbg(conf=values) + return values + +################### +# PUBLIC (test API included) +################### + def start(self, keepalive=False): + """Handles starting/turning-up the osmo-bts-virtual process.""" + if self.bsc is None: + raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started') + self.suite_run.poll() + + self.log('Starting to connect to', self.bsc) + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) + self.configure() + + self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-bts'))) + lib = self.inst.child('lib') + if not os.path.isdir(lib): + raise RuntimeError('No lib/ in %r' % self.inst) + self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } + + self.proc_bts = self.launch_process(keepalive, OsmoBtsVirtual.BIN_BTS, '-r', '1', + '-c', os.path.abspath(self.config_file), + '-i', self.bsc.addr()) + self.suite_run.poll() + +# vim: expandtab tabstop=4 shiftwidth=4 + diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index e71f4cd..4f48dc4 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -29,7 +29,7 @@ from . import schema from . import modem from . import osmo_nitb -from . import bts_sysmo, bts_osmotrx, bts_octphy, bts_nanobts +from . import bts_sysmo, bts_osmotrx, bts_osmovirtual, bts_octphy, bts_nanobts from .util import is_dict, is_list @@ -102,6 +102,7 @@ 'osmo-bts-sysmo': bts_sysmo.SysmoBts, 'osmo-bts-trx': bts_osmotrx.OsmoBtsTrx, 'osmo-bts-octphy': bts_octphy.OsmoBtsOctphy, + 'osmo-bts-virtual': bts_osmovirtual.OsmoBtsVirtual, 'nanobts': bts_nanobts.NanoBts, } diff --git a/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl new file mode 100644 index 0000000..be4f50c --- /dev/null +++ b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl @@ -0,0 +1,48 @@ +! Configuration rendered by osmo-gsm-tester +log stderr + logging color 1 + logging print extended-timestamp 1 + logging print category 1 + logging level abis debug + logging level oml debug + logging level pag debug + logging level rll debug + logging level rr debug + logging level rsl debug + logging level l1c info + logging level l1p error + logging level trx info + ! Level required by ready_for_pcu(): pcu info + logging level pcu info +! +line vty + bind ${osmo_bts_virtual.addr} +ctrl + bind ${osmo_bts_virtual.addr} +! +phy 0 + instance 0 +bts 0 + band ${osmo_bts_virtual.band} + ipa unit-id ${osmo_bts_virtual.ipa_unit_id} 0 + oml remote-ip ${osmo_bts_virtual.oml_remote_ip} + pcu-socket ${osmo_bts_virtual.pcu_socket_path} + gsmtap-sapi bcch + gsmtap-sapi ccch + gsmtap-sapi rach + gsmtap-sapi agch + gsmtap-sapi pch + gsmtap-sapi sdcch + gsmtap-sapi tch/f + gsmtap-sapi tch/h + gsmtap-sapi pacch + gsmtap-sapi pdtch + gsmtap-sapi ptcch + gsmtap-sapi cbch + gsmtap-sapi sacch + trx 0 + power-ramp max-initial 23000 mdBm + power-ramp step-size 2000 mdB + power-ramp step-interval 1 + ms-power-control dsp + phy 0 instance 0 diff --git a/suites/nitb_netreg_mass/suite.conf b/suites/nitb_netreg_mass/suite.conf index bfb23cd..94ec603 100644 --- a/suites/nitb_netreg_mass/suite.conf +++ b/suites/nitb_netreg_mass/suite.conf @@ -2,7 +2,7 @@ ip_address: - times: 1 bts: - - times: 1 + - type: osmo-bts-virtual defaults: timeout: 40s -- To view, visit https://gerrit.osmocom.org/12209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 Gerrit-Change-Number: 12209 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 12:16:02 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 13 Dec 2018 12:16:02 +0000 Subject: Change in docker-playground[master]: MSC: use config file for mncc path In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12277 ) Change subject: MSC: use config file for mncc path ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I689cfb3bad09b76859ef7e42c1312c636eebe637 Gerrit-Change-Number: 12277 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 13 Dec 2018 12:16:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 12:18:24 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 12:18:24 +0000 Subject: Change in python/osmo-python-tests[master]: scripts/*.py: mark as executable Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12294 Change subject: scripts/*.py: mark as executable ...................................................................... scripts/*.py: mark as executable osmo-mgw's configure.ac won't find osmotestvty.py, unless it is executable. This allows passing its ./configure with placing the scripts dir of osmo-python-tests in PATH, instead of installing it. Change-Id: If6cefd32d0dc544093db08efc114db86b9bb18b0 --- M scripts/osmo_rate_ctr2csv.py M scripts/osmodumpdoc.py M scripts/osmotestconfig.py M scripts/osmotestvty.py 4 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/94/12294/1 diff --git a/scripts/osmo_rate_ctr2csv.py b/scripts/osmo_rate_ctr2csv.py old mode 100644 new mode 100755 diff --git a/scripts/osmodumpdoc.py b/scripts/osmodumpdoc.py old mode 100644 new mode 100755 diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py old mode 100644 new mode 100755 diff --git a/scripts/osmotestvty.py b/scripts/osmotestvty.py old mode 100644 new mode 100755 -- To view, visit https://gerrit.osmocom.org/12294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If6cefd32d0dc544093db08efc114db86b9bb18b0 Gerrit-Change-Number: 12294 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 12:29:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 12:29:17 +0000 Subject: Change in osmo-dev[master]: run.sh: run osmo-hlr with --db-upgrade Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12295 Change subject: run.sh: run osmo-hlr with --db-upgrade ...................................................................... run.sh: run osmo-hlr with --db-upgrade Do not stop if the DB needs to be upgraded. Change-Id: I74dd09698dd508fce047ce086a22a369ad9ee6a4 --- M net/tmpl_std/run.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/95/12295/1 diff --git a/net/tmpl_std/run.sh b/net/tmpl_std/run.sh index 829c236..f31330b 100755 --- a/net/tmpl_std/run.sh +++ b/net/tmpl_std/run.sh @@ -67,7 +67,7 @@ #mgw4bsc="gdb -ex run --args osmo-mgw -c osmo-mgw-for-bsc.cfg" #mgw4bsc="strace osmo-mgw -c osmo-mgw-for-bsc.cfg" mgw4bsc="osmo-mgw -c osmo-mgw-for-bsc.cfg" -hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr" +hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade" stp="osmo-stp" bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc.cfg" -- To view, visit https://gerrit.osmocom.org/12295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I74dd09698dd508fce047ce086a22a369ad9ee6a4 Gerrit-Change-Number: 12295 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 12:33:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 12:33:58 +0000 Subject: Change in osmo-dev[master]: run.sh: run osmo-hlr with --db-upgrade In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12295 ) Change subject: run.sh: run osmo-hlr with --db-upgrade ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I74dd09698dd508fce047ce086a22a369ad9ee6a4 Gerrit-Change-Number: 12295 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 12:33:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:01:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 13:01:28 +0000 Subject: Change in libosmocore[master]: stats.h: Fix build on MacOS In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12212 ) Change subject: stats.h: Fix build on MacOS ...................................................................... stats.h: Fix build on MacOS Otherwise struct osmo_stats_config is not defined and compiler fails. Related: OS#3722 Change-Id: I037c3ca141ecee2d457e0a881a56e32ee24cec4d --- M include/osmocom/core/stats.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/core/stats.h b/include/osmocom/core/stats.h index e4d46ba..e01016d 100644 --- a/include/osmocom/core/stats.h +++ b/include/osmocom/core/stats.h @@ -28,7 +28,7 @@ * embedded systems. We cannot use the autoconf-defined HAVE_... macros * here, as that only works at library compile time, not at application * compile time */ -#ifdef unix +#if defined(unix) || defined(__APPLE__) #include #include @@ -141,5 +141,5 @@ int osmo_stats_reporter_udp_open(struct osmo_stats_reporter *srep); int osmo_stats_reporter_udp_close(struct osmo_stats_reporter *srep); -#endif /* unix */ +#endif /* unix || __APPLE__ */ /*! @} */ -- To view, visit https://gerrit.osmocom.org/12212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I037c3ca141ecee2d457e0a881a56e32ee24cec4d Gerrit-Change-Number: 12212 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:41:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:41:22 +0000 Subject: Change in osmo-sysmon[master]: Add m4 missing files to fix build In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12283 ) Change subject: Add m4 missing files to fix build ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iabe3207fff8f076a3f4ddc81720bb7fdc671a46c Gerrit-Change-Number: 12283 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Dec 2018 13:41:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:41:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:41:42 +0000 Subject: Change in osmo-sysmon[master]: Move source code to src subdir In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12284 ) Change subject: Move source code to src subdir ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1aa2893e2b274f8d087a0d2f126486cd4afcbdfe Gerrit-Change-Number: 12284 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 13 Dec 2018 13:41:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:44:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:44:09 +0000 Subject: Change in osmo-sysmon[master]: Add cmdline option parsing support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12285 ) Change subject: Add cmdline option parsing support ...................................................................... Patch Set 1: Code-Review+2 I tend to agree with Max that daemonization doesn't make sense. But then, unless somebody explicitly uses that particular option, it doesn't hurt either. -- To view, visit https://gerrit.osmocom.org/12285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I742974bd1440b09b49d26703c13361dd1c41008b Gerrit-Change-Number: 12285 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 13:44:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:44:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:44:58 +0000 Subject: Change in osmo-sysmon[master]: Introduce systemd service file and install with autotools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12286 ) Change subject: Introduce systemd service file and install with autotools ...................................................................... Patch Set 2: Code-Review-1 I don't think a systemd service is going to be useful at this point, it would probably just be misleading to the user. -- To view, visit https://gerrit.osmocom.org/12286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4875b74bcf2b6232d915070b77fc202a03ef997 Gerrit-Change-Number: 12286 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 13:44:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:45:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:45:02 +0000 Subject: Change in osmo-sysmon[master]: Add m4 missing files to fix build In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12283 ) Change subject: Add m4 missing files to fix build ...................................................................... Add m4 missing files to fix build Same files are available in other osmocom projects, otherwise configure fails with "Please install autoconf-archive; re-run 'autoreconf -fi' for it to take effect.". Change-Id: Iabe3207fff8f076a3f4ddc81720bb7fdc671a46c --- M Makefile.am A m4/README A m4/ax_check_compile_flag.m4 3 files changed, 79 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 5eb1cfb..cdf67bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = doc +ACLOCAL_AMFLAGS = -I m4 + AM_CPPFLAGS = \ $(all_includes) \ -I$(top_srcdir) \ diff --git a/m4/README b/m4/README new file mode 100644 index 0000000..92eb30b --- /dev/null +++ b/m4/README @@ -0,0 +1,3 @@ +We want to avoid creating too many external build-time dependencies +like this one to autoconf-archive. This directory provides a local +copy of required m4 rules. diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 0000000..ca36397 --- /dev/null +++ b/m4/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 4 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS -- To view, visit https://gerrit.osmocom.org/12283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iabe3207fff8f076a3f4ddc81720bb7fdc671a46c Gerrit-Change-Number: 12283 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:45:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:45:03 +0000 Subject: Change in osmo-sysmon[master]: Move source code to src subdir In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12284 ) Change subject: Move source code to src subdir ...................................................................... Move source code to src subdir Change-Id: I1aa2893e2b274f8d087a0d2f126486cd4afcbdfe --- M Makefile.am M configure.ac A src/Makefile.am R src/osmo-ctrl-client.c R src/osysmon.h R src/osysmon_ctrl.c R src/osysmon_file.c R src/osysmon_main.c R src/osysmon_rtnl.c R src/osysmon_sysinfo.c R src/simple_ctrl.c R src/simple_ctrl.h R src/value_node.c R src/value_node.h 14 files changed, 56 insertions(+), 56 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index cdf67bf..a838715 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,58 +1,3 @@ -SUBDIRS = doc +SUBDIRS = doc src ACLOCAL_AMFLAGS = -I m4 - -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir) \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOVTY_CFLAGS) \ - $(LIBMNL_CFLAGS) \ - $(NULL) - -AM_LDFLAGS = \ - $(COVERAGE_LDFLAGS) \ - $(NULL) - -bin_PROGRAMS = \ - osmo-sysmon \ - osmo-ctrl-client \ - $(NULL) - -osmo_sysmon_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(LIBMNL_LIBS) \ - $(NULL) - -osmo_sysmon_SOURCES = \ - value_node.c \ - simple_ctrl.c \ - osysmon_ctrl.c \ - osysmon_sysinfo.c \ - osysmon_rtnl.c \ - osysmon_file.c \ - osysmon_main.c \ - $(NULL) - -osmo_ctrl_client_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - -osmo_ctrl_client_SOURCES = \ - simple_ctrl.c \ - osmo-ctrl-client.c \ - $(NULL) - -noinst_HEADERS = \ - osysmon.h \ - simple_ctrl.h \ - value_node.h \ - $(NULL) diff --git a/configure.ac b/configure.ac index 13082b7..734ac99 100644 --- a/configure.ac +++ b/configure.ac @@ -129,4 +129,5 @@ AC_OUTPUT( doc/Makefile doc/examples/Makefile + src/Makefile Makefile) diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..9ad5947 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,54 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBMNL_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + $(NULL) + +bin_PROGRAMS = \ + osmo-sysmon \ + osmo-ctrl-client \ + $(NULL) + +osmo_sysmon_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBMNL_LIBS) \ + $(NULL) + +osmo_sysmon_SOURCES = \ + value_node.c \ + simple_ctrl.c \ + osysmon_ctrl.c \ + osysmon_sysinfo.c \ + osysmon_rtnl.c \ + osysmon_file.c \ + osysmon_main.c \ + $(NULL) + +osmo_ctrl_client_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + +osmo_ctrl_client_SOURCES = \ + simple_ctrl.c \ + osmo-ctrl-client.c \ + $(NULL) + +noinst_HEADERS = \ + osysmon.h \ + simple_ctrl.h \ + value_node.h \ + $(NULL) diff --git a/osmo-ctrl-client.c b/src/osmo-ctrl-client.c similarity index 100% rename from osmo-ctrl-client.c rename to src/osmo-ctrl-client.c diff --git a/osysmon.h b/src/osysmon.h similarity index 100% rename from osysmon.h rename to src/osysmon.h diff --git a/osysmon_ctrl.c b/src/osysmon_ctrl.c similarity index 100% rename from osysmon_ctrl.c rename to src/osysmon_ctrl.c diff --git a/osysmon_file.c b/src/osysmon_file.c similarity index 100% rename from osysmon_file.c rename to src/osysmon_file.c diff --git a/osysmon_main.c b/src/osysmon_main.c similarity index 100% rename from osysmon_main.c rename to src/osysmon_main.c diff --git a/osysmon_rtnl.c b/src/osysmon_rtnl.c similarity index 100% rename from osysmon_rtnl.c rename to src/osysmon_rtnl.c diff --git a/osysmon_sysinfo.c b/src/osysmon_sysinfo.c similarity index 100% rename from osysmon_sysinfo.c rename to src/osysmon_sysinfo.c diff --git a/simple_ctrl.c b/src/simple_ctrl.c similarity index 100% rename from simple_ctrl.c rename to src/simple_ctrl.c diff --git a/simple_ctrl.h b/src/simple_ctrl.h similarity index 100% rename from simple_ctrl.h rename to src/simple_ctrl.h diff --git a/value_node.c b/src/value_node.c similarity index 100% rename from value_node.c rename to src/value_node.c diff --git a/value_node.h b/src/value_node.h similarity index 100% rename from value_node.h rename to src/value_node.h -- To view, visit https://gerrit.osmocom.org/12284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1aa2893e2b274f8d087a0d2f126486cd4afcbdfe Gerrit-Change-Number: 12284 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:46:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:46:07 +0000 Subject: Change in osmo-dev[master]: run.sh: run osmo-hlr with --db-upgrade In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12295 ) Change subject: run.sh: run osmo-hlr with --db-upgrade ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I74dd09698dd508fce047ce086a22a369ad9ee6a4 Gerrit-Change-Number: 12295 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 13:46:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:46:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:46:29 +0000 Subject: Change in python/osmo-python-tests[master]: scripts/*.py: mark as executable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12294 ) Change subject: scripts/*.py: mark as executable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If6cefd32d0dc544093db08efc114db86b9bb18b0 Gerrit-Change-Number: 12294 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Dec 2018 13:46:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:46:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:46:31 +0000 Subject: Change in python/osmo-python-tests[master]: scripts/*.py: mark as executable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12294 ) Change subject: scripts/*.py: mark as executable ...................................................................... scripts/*.py: mark as executable osmo-mgw's configure.ac won't find osmotestvty.py, unless it is executable. This allows passing its ./configure with placing the scripts dir of osmo-python-tests in PATH, instead of installing it. Change-Id: If6cefd32d0dc544093db08efc114db86b9bb18b0 --- M scripts/osmo_rate_ctr2csv.py M scripts/osmodumpdoc.py M scripts/osmotestconfig.py M scripts/osmotestvty.py 4 files changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/scripts/osmo_rate_ctr2csv.py b/scripts/osmo_rate_ctr2csv.py old mode 100644 new mode 100755 diff --git a/scripts/osmodumpdoc.py b/scripts/osmodumpdoc.py old mode 100644 new mode 100755 diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py old mode 100644 new mode 100755 diff --git a/scripts/osmotestvty.py b/scripts/osmotestvty.py old mode 100644 new mode 100755 -- To view, visit https://gerrit.osmocom.org/12294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If6cefd32d0dc544093db08efc114db86b9bb18b0 Gerrit-Change-Number: 12294 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:47:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:47:22 +0000 Subject: Change in docker-playground[master]: MSC: use config file for mncc path In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12277 ) Change subject: MSC: use config file for mncc path ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I689cfb3bad09b76859ef7e42c1312c636eebe637 Gerrit-Change-Number: 12277 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 13 Dec 2018 13:47:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:51:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:51:30 +0000 Subject: Change in osmo-msc[master]: require 'ipa-name' option to be set via config file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12293 ) Change subject: require 'ipa-name' option to be set via config file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6cff91793e646e0396e8f1bc87d0f52709e5f12a Gerrit-Change-Number: 12293 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Thu, 13 Dec 2018 13:51:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:51:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:51:31 +0000 Subject: Change in osmo-msc[master]: require 'ipa-name' option to be set via config file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12293 ) Change subject: require 'ipa-name' option to be set via config file ...................................................................... require 'ipa-name' option to be set via config file The 'ipa-name' option can now only be set via the configuration file because changing the IPA name at run-time conflicts with active GSUP connections and routes configured in the HLR. The osmo-msc program must be restarted if its IPA name needs to change. Change-Id: I6cff91793e646e0396e8f1bc87d0f52709e5f12a Related: OS#3355 --- M include/osmocom/msc/vty.h M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c 3 files changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/msc/vty.h b/include/osmocom/msc/vty.h index 6a55df7..60a36d7 100644 --- a/include/osmocom/msc/vty.h +++ b/include/osmocom/msc/vty.h @@ -31,4 +31,6 @@ struct gsm_network *gsmnet_from_vty(struct vty *vty); +extern bool msc_parsing_config_file; + #endif diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 06e1139..87adc82 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -466,6 +466,12 @@ "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. " "The default is 'MSC-00-00-00-00-00-00'.\n") { + if (!msc_parsing_config_file) { + vty_out(vty, "The IPA name cannot be changed at run-time; " + "It can only be set in the configuraton file.%s", VTY_NEWLINE); + return CMD_WARNING; + } + gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]); return CMD_SUCCESS; } diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 8500b97..ce6ae38 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -24,6 +24,7 @@ * */ +#include #include #include #include @@ -514,6 +515,8 @@ extern void *tall_call_ctx; extern void *tall_trans_ctx; +bool msc_parsing_config_file = false; + int main(int argc, char **argv) { int rc; @@ -566,7 +569,9 @@ return -1; #endif + msc_parsing_config_file = true; rc = vty_read_config_file(msc_cmdline_config.config_file, NULL); + msc_parsing_config_file = false; if (rc < 0) { LOGP(DMSC, LOGL_FATAL, "Failed to parse the config file: '%s'\n", msc_cmdline_config.config_file); -- To view, visit https://gerrit.osmocom.org/12293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6cff91793e646e0396e8f1bc87d0f52709e5f12a Gerrit-Change-Number: 12293 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:55:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:55:52 +0000 Subject: Change in osmo-trx[master]: Timeval: passed() returns true if time is equal In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12279 ) Change subject: Timeval: passed() returns true if time is equal ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96a9d26657f85447609693bc6932d218d354b84a Gerrit-Change-Number: 12279 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Dec 2018 13:55:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:57:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:57:37 +0000 Subject: Change in osmo-trx[master]: Timeval: Move implementation to use clock_gettime and timespec In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12280 ) Change subject: Timeval: Move implementation to use clock_gettime and timespec ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2286998c5eefbf3c3dfb105c223daec7a1083803 Gerrit-Change-Number: 12280 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Dec 2018 13:57:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:58:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:58:04 +0000 Subject: Change in osmo-trx[master]: Timeval: Move to osmo_clock_gettime In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12281 ) Change subject: Timeval: Move to osmo_clock_gettime ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24da3e1136c5396062662be1d10b07b4d97cfc2e Gerrit-Change-Number: 12281 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Dec 2018 13:58:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:58:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:58:23 +0000 Subject: Change in osmo-trx[master]: TimevalTest: Make test deterministic with fake time In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12282 ) Change subject: TimevalTest: Make test deterministic with fake time ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I74e577a0142fb6d1ef3630e02aff9910b191bff9 Gerrit-Change-Number: 12282 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 13 Dec 2018 13:58:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:58:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:58:25 +0000 Subject: Change in osmo-trx[master]: Timeval: passed() returns true if time is equal In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12279 ) Change subject: Timeval: passed() returns true if time is equal ...................................................................... Timeval: passed() returns true if time is equal Change-Id: I96a9d26657f85447609693bc6932d218d354b84a --- M CommonLibs/Timeval.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/Timeval.cpp b/CommonLibs/Timeval.cpp index 50ce05d..991e241 100644 --- a/CommonLibs/Timeval.cpp +++ b/CommonLibs/Timeval.cpp @@ -57,7 +57,7 @@ Timeval nowTime; if (nowTime.mTimeval.tv_sec < mTimeval.tv_sec) return false; if (nowTime.mTimeval.tv_sec > mTimeval.tv_sec) return true; - if (nowTime.mTimeval.tv_usec > mTimeval.tv_usec) return true; + if (nowTime.mTimeval.tv_usec >= mTimeval.tv_usec) return true; return false; } -- To view, visit https://gerrit.osmocom.org/12279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I96a9d26657f85447609693bc6932d218d354b84a Gerrit-Change-Number: 12279 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:58:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:58:25 +0000 Subject: Change in osmo-trx[master]: Timeval: Move implementation to use clock_gettime and timespec In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12280 ) Change subject: Timeval: Move implementation to use clock_gettime and timespec ...................................................................... Timeval: Move implementation to use clock_gettime and timespec According to gettimeofday manual: "Applications should use the clock_gettime() function instead of the obsolescent gettimeofday() function." Furthermore, it may be desirable in the future to use other clocks such as monotonic. Change-Id: I2286998c5eefbf3c3dfb105c223daec7a1083803 --- M CommonLibs/Timeval.cpp M CommonLibs/Timeval.h 2 files changed, 28 insertions(+), 28 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/Timeval.cpp b/CommonLibs/Timeval.cpp index 991e241..21072fc 100644 --- a/CommonLibs/Timeval.cpp +++ b/CommonLibs/Timeval.cpp @@ -34,36 +34,33 @@ now(); unsigned sec = offset/1000; unsigned msec = offset%1000; - mTimeval.tv_usec += msec*1000; - mTimeval.tv_sec += sec; - if (mTimeval.tv_usec>1000000) { - mTimeval.tv_usec -= 1000000; - mTimeval.tv_sec += 1; + mTimespec.tv_nsec += msec*1000*1000; + mTimespec.tv_sec += sec; + if (mTimespec.tv_nsec > 1000*1000*1000) { + mTimespec.tv_nsec -= 1000*1000*1000; + mTimespec.tv_sec += 1; } } struct timespec Timeval::timespec() const { - struct timespec retVal; - retVal.tv_sec = mTimeval.tv_sec; - retVal.tv_nsec = 1000 * (long)mTimeval.tv_usec; - return retVal; + return mTimespec; } bool Timeval::passed() const { Timeval nowTime; - if (nowTime.mTimeval.tv_sec < mTimeval.tv_sec) return false; - if (nowTime.mTimeval.tv_sec > mTimeval.tv_sec) return true; - if (nowTime.mTimeval.tv_usec >= mTimeval.tv_usec) return true; + if (nowTime.mTimespec.tv_sec < mTimespec.tv_sec) return false; + if (nowTime.mTimespec.tv_sec > mTimespec.tv_sec) return true; + if (nowTime.mTimespec.tv_nsec >= mTimespec.tv_nsec) return true; return false; } double Timeval::seconds() const { - return ((double)mTimeval.tv_sec) + 1e-6*((double)mTimeval.tv_usec); + return ((double)mTimespec.tv_sec) + 1e-9*((double)mTimespec.tv_nsec); } @@ -72,8 +69,8 @@ { // 2^31 milliseconds is just over 4 years. int32_t deltaS = other.sec() - sec(); - int32_t deltaUs = other.usec() - usec(); - return 1000*deltaS + deltaUs/1000; + int32_t deltaNs = other.nsec() - nsec(); + return 1000*deltaS + deltaNs/1000000; } @@ -89,7 +86,7 @@ ostream& operator<<(ostream& os, const struct timespec& ts) { - os << ts.tv_sec << "," << ts.tv_nsec; + os << ts.tv_sec << "," << ts.tv_nsec/1000; return os; } diff --git a/CommonLibs/Timeval.h b/CommonLibs/Timeval.h index c497864..b780af1 100644 --- a/CommonLibs/Timeval.h +++ b/CommonLibs/Timeval.h @@ -42,12 +42,12 @@ private: - struct timeval mTimeval; + struct timespec mTimespec; public: - /** Set the value to gettimeofday. */ - void now() { gettimeofday(&mTimeval,NULL); } + /** Set the value to current time. */ + void now() { clock_gettime(CLOCK_REALTIME, &mTimespec); } /** Set the value to gettimeofday plus an offset. */ void future(unsigned ms); @@ -55,16 +55,18 @@ //@{ Timeval(unsigned sec, unsigned usec) { - mTimeval.tv_sec = sec; - mTimeval.tv_usec = usec; + mTimespec.tv_sec = sec; + mTimespec.tv_nsec = usec*1000; } Timeval(const struct timeval& wTimeval) - :mTimeval(wTimeval) - {} + { + mTimespec.tv_sec = wTimeval.tv_sec; + mTimespec.tv_nsec = wTimeval.tv_sec*1000; + } /** - Create a Timeval offset into the future. + Create a Timespec offset into the future. @param offset milliseconds */ Timeval(unsigned offset=0) { future(offset); } @@ -76,8 +78,9 @@ /** Return total seconds. */ double seconds() const; - uint32_t sec() const { return mTimeval.tv_sec; } - uint32_t usec() const { return mTimeval.tv_usec; } + uint32_t sec() const { return mTimespec.tv_sec; } + uint32_t usec() const { return mTimespec.tv_nsec / 1000; } + uint32_t nsec() const { return mTimespec.tv_nsec; } /** Return differnce from other (other-self), in ms. */ long delta(const Timeval& other) const; @@ -88,11 +91,11 @@ /** Remaining time in ms. */ long remaining() const { return -elapsed(); } - /** Return true if the time has passed, as per gettimeofday. */ + /** Return true if the time has passed, as per clock_gettime(CLOCK_REALTIME). */ bool passed() const; /** Add a given number of minutes to the time. */ - void addMinutes(unsigned minutes) { mTimeval.tv_sec += minutes*60; } + void addMinutes(unsigned minutes) { mTimespec.tv_sec += minutes*60; } }; -- To view, visit https://gerrit.osmocom.org/12280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2286998c5eefbf3c3dfb105c223daec7a1083803 Gerrit-Change-Number: 12280 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:58:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:58:26 +0000 Subject: Change in osmo-trx[master]: Timeval: Move to osmo_clock_gettime In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12281 ) Change subject: Timeval: Move to osmo_clock_gettime ...................................................................... Timeval: Move to osmo_clock_gettime Change-Id: I24da3e1136c5396062662be1d10b07b4d97cfc2e --- M CommonLibs/Timeval.cpp M CommonLibs/Timeval.h 2 files changed, 10 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/Timeval.cpp b/CommonLibs/Timeval.cpp index 21072fc..fd1bcda 100644 --- a/CommonLibs/Timeval.cpp +++ b/CommonLibs/Timeval.cpp @@ -27,8 +27,17 @@ #include "Timeval.h" +extern "C" { +#include +} + using namespace std; +void Timeval::now() +{ + osmo_clock_gettime(CLOCK_REALTIME, &mTimespec); +} + void Timeval::future(unsigned offset) { now(); diff --git a/CommonLibs/Timeval.h b/CommonLibs/Timeval.h index b780af1..7c6a6f6 100644 --- a/CommonLibs/Timeval.h +++ b/CommonLibs/Timeval.h @@ -47,7 +47,7 @@ public: /** Set the value to current time. */ - void now() { clock_gettime(CLOCK_REALTIME, &mTimespec); } + void now(); /** Set the value to gettimeofday plus an offset. */ void future(unsigned ms); -- To view, visit https://gerrit.osmocom.org/12281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I24da3e1136c5396062662be1d10b07b4d97cfc2e Gerrit-Change-Number: 12281 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 13:58:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 13:58:26 +0000 Subject: Change in osmo-trx[master]: TimevalTest: Make test deterministic with fake time In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12282 ) Change subject: TimevalTest: Make test deterministic with fake time ...................................................................... TimevalTest: Make test deterministic with fake time Change-Id: I74e577a0142fb6d1ef3630e02aff9910b191bff9 --- M tests/CommonLibs/TimevalTest.cpp 1 file changed, 18 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/CommonLibs/TimevalTest.cpp b/tests/CommonLibs/TimevalTest.cpp index 61a92c9..b822982 100644 --- a/tests/CommonLibs/TimevalTest.cpp +++ b/tests/CommonLibs/TimevalTest.cpp @@ -31,34 +31,45 @@ #include #include +extern "C" { +#include +} + using namespace std; int main(int argc, char *argv[]) { - long last_remaining = 10000; + + osmo_clock_override_enable(CLOCK_REALTIME, true); + + struct timespec *clk = osmo_clock_override_gettimespec(CLOCK_REALTIME); + clk->tv_sec = 0; + clk->tv_nsec = 1000; + + long last_remaining = 10000; /*10 sec */ Timeval then(last_remaining); assert(then.elapsed() == -last_remaining); cerr << then << " elapsed: " << then.elapsed() << endl; /* Check that last_remaining parameter affects setting time in the future */ - usleep(10000); + osmo_clock_override_add(CLOCK_REALTIME, 0, 10*1000*1000); double increased_time_secs = Timeval().seconds(); - assert(increased_time_secs <= then.seconds()); + assert(increased_time_secs < then.seconds()); struct timespec invariant_time = then.timespec(); int loops = 0; while (!then.passed()) { struct timespec tspecnow = then.timespec(); - cerr << "now: " << Timeval().seconds() << " then: " << then << " remaining: " << then.remaining() << endl; + cerr << "["<< loops << "] now: " << Timeval().seconds() << " then: " << then << " remaining: " << then.remaining() << endl; assert(last_remaining >= then.remaining()); assert(tspecnow.tv_sec == invariant_time.tv_sec && tspecnow.tv_nsec == invariant_time.tv_nsec); - usleep(500000); + osmo_clock_override_add(CLOCK_REALTIME, 0, 500000*1000); loops++; } cerr << "now: " << Timeval() << " then: " << then << " remaining: " << then.remaining() << endl; - assert(then.remaining() <= 0); - assert(loops >= 18); + assert(then.remaining() == -10); + assert(loops == 20); printf("Done\n"); } -- To view, visit https://gerrit.osmocom.org/12282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I74e577a0142fb6d1ef3630e02aff9910b191bff9 Gerrit-Change-Number: 12282 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 14:02:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 14:02:28 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Add comments documenting TA + MS power control ... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12287 ) Change subject: osmo-bts-trx/loops.c: Add comments documenting TA + MS power control loop ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12287/1/src/osmo-bts-trx/loops.c File src/osmo-bts-trx/loops.c: https://gerrit.osmocom.org/#/c/12287/1/src/osmo-bts-trx/loops.c at 64 PS1, Line 64: if (arfcn >= 512 && arfcn <= 885) { > Not directly related, but: this code looks like a good candidate to be a separate function and perha [?] this entire file looks like it needs to be rewritten, and probably moved to common. -- To view, visit https://gerrit.osmocom.org/12287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iafea07eb751ed85d29b214576bb0d31ea919cd72 Gerrit-Change-Number: 12287 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 14:02:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 14:02:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 14:02:36 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Add comments documenting TA + MS power control ... In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12287 to look at the new patch set (#2). Change subject: osmo-bts-trx/loops.c: Add comments documenting TA + MS power control loop ...................................................................... osmo-bts-trx/loops.c: Add comments documenting TA + MS power control loop The loops.c code is not very easily understood, so let's add some comments to it. As can be seen, there are functions of integer type which always return 0, and whose callers don't check for the return value. This will be adressed in subsequent patches. Change-Id: Iafea07eb751ed85d29b214576bb0d31ea919cd72 Related: OS#1622, OS#1851 --- M src/osmo-bts-trx/loops.c 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/12287/2 -- To view, visit https://gerrit.osmocom.org/12287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iafea07eb751ed85d29b214576bb0d31ea919cd72 Gerrit-Change-Number: 12287 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 14:02:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 14:02:36 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Use lchan name based logging In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12289 to look at the new patch set (#2). Change subject: osmo-bts-trx/loops.c: Use lchan name based logging ...................................................................... osmo-bts-trx/loops.c: Use lchan name based logging The loops.c code dates back to ancient times when we printed the TRX number and the raw channel number to identify a logical channel. We meanwhile have gsm_lchan_name() and should use it to log messages related to this lchan in a common format. This commit introduces the LOGPLCHAN() helper macro [similar to osmo-bsc], and uses it from loops.c. As a result, some functions don't need a chan_nr argument anymore, while some need to add a new lchan argument. Change-Id: I6976dd7444c26b1f52741bc367b0311ebbef1718 Related: OS#1622, OS#1851 --- M include/osmo-bts/gsm_data.h M src/osmo-bts-trx/loops.c 2 files changed, 38 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/12289/2 -- To view, visit https://gerrit.osmocom.org/12289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6976dd7444c26b1f52741bc367b0311ebbef1718 Gerrit-Change-Number: 12289 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 14:02:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 14:02:50 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Add comments documenting TA + MS power control ... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12287 ) Change subject: osmo-bts-trx/loops.c: Add comments documenting TA + MS power control loop ...................................................................... Patch Set 2: Code-Review+2 paus comments are adressed. -- To view, visit https://gerrit.osmocom.org/12287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iafea07eb751ed85d29b214576bb0d31ea919cd72 Gerrit-Change-Number: 12287 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 14:02:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 14:03:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 14:03:05 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Use lchan name based logging In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12289 ) Change subject: osmo-bts-trx/loops.c: Use lchan name based logging ...................................................................... Patch Set 2: Code-Review+2 re-adding +2 from Pau after rebase -- To view, visit https://gerrit.osmocom.org/12289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6976dd7444c26b1f52741bc367b0311ebbef1718 Gerrit-Change-Number: 12289 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 14:03:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 14:07:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 13 Dec 2018 14:07:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: add test to try two LU from different BSCs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9204 ) Change subject: MSC_Tests: add test to try two LU from different BSCs ...................................................................... Patch Set 5: (2 comments) https://gerrit.osmocom.org/#/c/9204/5/library/BSSMAP_Emulation.ttcn File library/BSSMAP_Emulation.ttcn: https://gerrit.osmocom.org/#/c/9204/5/library/BSSMAP_Emulation.ttcn at 54 PS5, Line 54: port BSSMAPEM_PROC_PT BSSAP_PROC_1; > I think with BTS we have an array of them? Is that possible with component ports? (arrays potentiall [?] unfortunately ports are separate concepts/objects in TTCN-3 from data types. Only variables can form lists or arrays, but not ports :( In terms of naming I would personally request to use BSSAP1/BSSAP_PROC1 without underscore as this resembles how we handle it in other situations, like e.g. RSL_Emulation.ttcn with RSL/RSL1 and RSL_PROC/RSL_PROC1. https://gerrit.osmocom.org/#/c/9204/5/msc/BSC_ConnectionHandler.ttcn File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/#/c/9204/5/msc/BSC_ConnectionHandler.ttcn at 53 PS5, Line 53: type record of BSC_ConnHdlrBscPars BSC_ConnHdlrBscParsTable; > ah, there's an array of BSCs here yes, because the BSC_ConnHdlrBscPars is a data type, of which you can form records/sets/lists/arrays. Ports however are separate objects that are declared in the component. -- To view, visit https://gerrit.osmocom.org/9204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib3eabf8537066f43faed8fb983d9e1f4092ec515 Gerrit-Change-Number: 9204 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 13 Dec 2018 14:07:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 14:33:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 14:33:22 +0000 Subject: Change in osmo-sysmon[master]: Add cmdline option parsing support In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12285 ) Change subject: Add cmdline option parsing support ...................................................................... Add cmdline option parsing support Change-Id: I742974bd1440b09b49d26703c13361dd1c41008b --- M src/osysmon_main.c 1 file changed, 95 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved Objections: Max: I would prefer this is not merged as is diff --git a/src/osysmon_main.c b/src/osysmon_main.c index 5983212..486ee8f 100644 --- a/src/osysmon_main.c +++ b/src/osysmon_main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "config.h" #include "osysmon.h" @@ -69,8 +70,6 @@ .is_config_node = osysmon_is_config_node, }; - -static const char *config_file = "osmo-sysmon.cfg"; struct osysmon_state *g_oss; @@ -110,6 +109,88 @@ } } +static void print_usage() +{ + printf("Usage: osmo-sysmon\n"); +} + +static void print_help() +{ + printf(" -h --help This text.\n"); + printf(" -c --config-file filename The config file to use.\n"); + printf(" -d option --debug=DRLL:DCC:DMM:DRR:DRSL:DNM Enable debugging.\n"); + printf(" -D --daemonize Fork the process into a background daemon.\n"); + printf(" -s --disable-color Do not print ANSI colors in the log\n"); + printf(" -T --timestamp Prefix every log line with a timestamp.\n"); + printf(" -e --log-level number Set a global loglevel.\n"); + printf(" -V --version Print the version of OsmoHLR.\n"); +} + +static struct { + const char *config_file; + bool daemonize; +} cmdline_opts = { + .config_file = "osmo-sysmon.cfg", + .daemonize = false, +}; + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_index = 0, c; + static struct option long_options[] = { + {"help", 0, 0, 'h'}, + {"config-file", 1, 0, 'c'}, + {"debug", 1, 0, 'd'}, + {"daemonize", 0, 0, 'D'}, + {"disable-color", 0, 0, 's'}, + {"log-level", 1, 0, 'e'}, + {"timestamp", 0, 0, 'T'}, + {"version", 0, 0, 'V' }, + {0, 0, 0, 0} + }; + + c = getopt_long(argc, argv, "hc:d:Dse:TV", + long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 'h': + print_usage(); + print_help(); + exit(0); + case 'c': + cmdline_opts.config_file = optarg; + break; + case 'd': + log_parse_category_mask(osmo_stderr_target, optarg); + break; + case 'D': + cmdline_opts.daemonize = 1; + break; + case 's': + log_set_use_color(osmo_stderr_target, 0); + break; + case 'e': + log_set_log_level(osmo_stderr_target, atoi(optarg)); + break; + case 'T': + log_set_print_timestamp(osmo_stderr_target, 1); + break; + case 'V': + print_version(1); + exit(0); + break; + default: + /* catch unknown options *as well as* missing arguments. */ + fprintf(stderr, "Error in command line options. Exiting.\n"); + exit(-1); + break; + } + } +} + int main(int argc, char **argv) { int rc; @@ -122,14 +203,16 @@ INIT_LLIST_HEAD(&g_oss->files); vty_init(&vty_info); + handle_options(argc, argv); osysmon_sysinfo_init(); osysmon_ctrl_init(); osysmon_rtnl_init(); osysmon_file_init(); - rc = vty_read_config_file(config_file, NULL); + rc = vty_read_config_file(cmdline_opts.config_file, NULL); if (rc < 0) { - fprintf(stderr, "Failed to parse the config file %s\n", config_file); + fprintf(stderr, "Failed to parse the config file %s\n", + cmdline_opts.config_file); exit(2); } @@ -137,6 +220,14 @@ signal(SIGUSR2, &signal_handler); osmo_init_ignore_signals(); + if (cmdline_opts.daemonize) { + rc = osmo_daemonize(); + if (rc < 0) { + perror("Error during daemonize"); + exit(1); + } + } + while (1) { struct value_node *root = value_node_add(g_oss, NULL, "root", NULL); osysmon_sysinfo_poll(root); -- To view, visit https://gerrit.osmocom.org/12285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I742974bd1440b09b49d26703c13361dd1c41008b Gerrit-Change-Number: 12285 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:05:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 15:05:46 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12271/1/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12271/1/tests/gsm0808/gsm0808_test.c at 40 PS1, Line 40: #define VERIFY(msg, data, len) \ > I would rather change this to: [?] Unfortunately I haven't found a way to do this with spatch. Feel free to add corrected variant of .spatch if you know how. -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 13 Dec 2018 15:05:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:12:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 15:12:54 +0000 Subject: Change in osmo-sysmon[master]: Introduce systemd service file and install with autotools In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12286 ) Change subject: Introduce systemd service file and install with autotools ...................................................................... Patch Set 2: Code-Review-1 Is it enabled by default in OE? If so than it might interfere with normal testing/use so I propose to abandon this altogether or move to WIP until we actually have the hypothetical use case described by Pau. -- To view, visit https://gerrit.osmocom.org/12286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4875b74bcf2b6232d915070b77fc202a03ef997 Gerrit-Change-Number: 12286 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 15:12:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:26:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 15:26:37 +0000 Subject: Change in docker-playground[master]: MSC: use config file for mncc path In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12277 ) Change subject: MSC: use config file for mncc path ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I689cfb3bad09b76859ef7e42c1312c636eebe637 Gerrit-Change-Number: 12277 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 13 Dec 2018 15:26:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:31:50 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 15:31:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: match default expectation with config Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12296 Change subject: MSC: match default expectation with config ...................................................................... MSC: match default expectation with config In MSC_Tests.default we expect /tmp/mncc.sock as MNCC socket path - let's match this expectation with osmo-msc.cfg to make sure that tests work out of the box without the need to use specific command-line option. Change-Id: I540645ef4b1e08d05b89251f074af84a516e7a88 --- M msc/osmo-msc.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/12296/1 diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg index 3f9e192..ddac4cd 100644 --- a/msc/osmo-msc.cfg +++ b/msc/osmo-msc.cfg @@ -73,6 +73,7 @@ cs7-instance-iu 0 mgw remote-ip 127.0.0.1 emergency-call route-to-msisdn 112 + mncc external /tmp/mncc.sock mncc-int default-codec tch-f fr default-codec tch-h hr -- To view, visit https://gerrit.osmocom.org/12296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I540645ef4b1e08d05b89251f074af84a516e7a88 Gerrit-Change-Number: 12296 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:36:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 15:36:53 +0000 Subject: Change in osmo-sip-connector[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12159 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I1169c1c6d99628d2cbed67cac3ed675d778597b0 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 213cc7a..4e70535 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-sip-connector.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-sip-connector.service endif -- To view, visit https://gerrit.osmocom.org/12159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1169c1c6d99628d2cbed67cac3ed675d778597b0 Gerrit-Change-Number: 12159 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:36:58 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 15:36:58 +0000 Subject: Change in osmo-pcap[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12171 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I2fed90915f57bbb054a26bacecf8417d6f3ba5ce --- M contrib/systemd/Makefile.am 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 5b41c52..2966a63 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,8 +1,11 @@ +EXTRA_DIST = \ + osmo-pcap-client.service \ + osmo-pcap-server.service + if HAVE_SYSTEMD SYSTEMD_SERVICES = \ osmo-pcap-client.service \ osmo-pcap-server.service -EXTRA_DIST = $(SYSTEMD_SERVICES) systemdsystemunit_DATA = $(SYSTEMD_SERVICES) endif -- To view, visit https://gerrit.osmocom.org/12171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2fed90915f57bbb054a26bacecf8417d6f3ba5ce Gerrit-Change-Number: 12171 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:37:03 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 15:37:03 +0000 Subject: Change in osmo-hlr[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12168 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: Ic164403189510f3b20ff7906df09c78550735591 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index 520e720..eb33b4a 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-hlr.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-hlr.service endif -- To view, visit https://gerrit.osmocom.org/12168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic164403189510f3b20ff7906df09c78550735591 Gerrit-Change-Number: 12168 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:37:21 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 15:37:21 +0000 Subject: Change in osmo-ggsn[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12160 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: Ibd348eac3adca88663bd510172efbe4ec0bf3599 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index e6ad299..fbb553f 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-ggsn.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-ggsn.service endif -- To view, visit https://gerrit.osmocom.org/12160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibd348eac3adca88663bd510172efbe4ec0bf3599 Gerrit-Change-Number: 12160 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:37:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 15:37:26 +0000 Subject: Change in osmo-mgw[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12166 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: I5014d98e06e033d04be45585b34458c90b1ced00 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index c0d95ff..340cd90 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-mgw.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-mgw.service endif -- To view, visit https://gerrit.osmocom.org/12166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5014d98e06e033d04be45585b34458c90b1ced00 Gerrit-Change-Number: 12166 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:37:31 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 15:37:31 +0000 Subject: Change in libosmo-sccp[master]: contrib: fix makedistcheck with disabled systemd In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12163 ) Change subject: contrib: fix makedistcheck with disabled systemd ...................................................................... contrib: fix makedistcheck with disabled systemd EXTRA_DIST files need to be distributed, no matter if the systemd option is configured or not. Change-Id: Ib848aa5ce03f45d4f8182a4e77b0130ccb261635 --- M contrib/systemd/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index e7d846f..38c1ea3 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,5 +1,6 @@ -if HAVE_SYSTEMD EXTRA_DIST = osmo-stp.service + +if HAVE_SYSTEMD systemdsystemunit_DATA = \ osmo-stp.service endif -- To view, visit https://gerrit.osmocom.org/12163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib848aa5ce03f45d4f8182a4e77b0130ccb261635 Gerrit-Change-Number: 12163 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:38:36 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 15:38:36 +0000 Subject: Change in sandbox[master]: What about -1 vote counting? In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12218 ) Change subject: What about -1 vote counting? ...................................................................... Abandoned +3 voting was reverted, social contract it is. -- To view, visit https://gerrit.osmocom.org/12218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ieab13e41e5a8c438653cfb5d058da3e588bc5603 Gerrit-Change-Number: 12218 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:39:31 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 13 Dec 2018 15:39:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: match default expectation with config In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12296 ) Change subject: MSC: match default expectation with config ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I540645ef4b1e08d05b89251f074af84a516e7a88 Gerrit-Change-Number: 12296 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 13 Dec 2018 15:39:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:39:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 15:39:38 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c at 1454 PS3, Line 1454: parsing_config_file = true; Why initializing it here instead of where it's declared? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 13 Dec 2018 15:39:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 15:56:02 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 13 Dec 2018 15:56:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Tear down all RTP flows to avoid race condition on tear down Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/12297 Change subject: mgw: Tear down all RTP flows to avoid race condition on tear down ...................................................................... mgw: Tear down all RTP flows to avoid race condition on tear down When stopping the test TC_two_crcx_and_unsolicited_rtp the unsolicited RTP stream is not stopped. As a result it could happen that between tearing down the other flows and stopping the test an unsolicited RTP packet is sent to a closed socket. The resulting ICMP destination unreachable packet translates to a "Connection refused" error on the sending socket and fails the test. Avoid this by making sure the unsolicited RTP sender is stopped before stopping the test. Change-Id: Ied839596589609e75fa487046a85db48991e4c73 --- M mgw/MGCP_Test.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/12297/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index e1ebc26..9adeb2a 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1211,6 +1211,8 @@ f_sleep(0.5); + /* Stop transmitting packets and tear down the flows */ + f_rtpem_mode(RTPEM[2], RTPEM_MODE_NONE); f_flow_delete(RTPEM[0]); f_flow_delete(RTPEM[1], ep, call_id); -- To view, visit https://gerrit.osmocom.org/12297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ied839596589609e75fa487046a85db48991e4c73 Gerrit-Change-Number: 12297 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:02:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 16:02:45 +0000 Subject: Change in osmo-sysmon[master]: Introduce systemd service file and install with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12286 ) Change subject: Introduce systemd service file and install with autotools ...................................................................... Patch Set 2: > Is it enabled by default in OE? If so than it might interfere with > normal testing/use so I propose to abandon this altogether or move > to WIP until we actually have the hypothetical use case described > by Pau. It's easy to configur the recipe to not enable the systemd file in OE, but fine, let's keep it out for now. -- To view, visit https://gerrit.osmocom.org/12286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4875b74bcf2b6232d915070b77fc202a03ef997 Gerrit-Change-Number: 12286 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 16:02:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:03:21 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 16:03:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: adjust gsup log level to error Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12298 Change subject: MSC: adjust gsup log level to error ...................................................................... MSC: adjust gsup log level to error The HLR emulation is active only for short time during each test so we got lots of useless "gsup_client.c:73 GSUP connecting to 127.0.0.1:4222" messages due to continuous attempts to reconnect to HLR. Let's use error log level to obtain relevant errors (if any). Change-Id: If79db99ceb7a9d4e2ec8d8b375aa628c4088c65c --- M msc/osmo-msc.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/12298/1 diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg index ddac4cd..79d509e 100644 --- a/msc/osmo-msc.cfg +++ b/msc/osmo-msc.cfg @@ -34,7 +34,7 @@ logging level lctrl info logging level lgtp notice logging level lstats notice - logging level lgsup notice + logging level lgsup error logging level loap notice logging level lss7 notice logging level lsccp notice -- To view, visit https://gerrit.osmocom.org/12298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If79db99ceb7a9d4e2ec8d8b375aa628c4088c65c Gerrit-Change-Number: 12298 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:17:59 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 13 Dec 2018 16:17:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: match default expectation with config In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12296 ) Change subject: MSC: match default expectation with config ...................................................................... Patch Set 1: Code-Review+1 > Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I540645ef4b1e08d05b89251f074af84a516e7a88 Gerrit-Change-Number: 12296 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 13 Dec 2018 16:17:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:22:06 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 16:22:06 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Patch Set 24: (1 comment) https://gerrit.osmocom.org/#/c/11827/23/tests/gsm29205/gsm29205_test.c File tests/gsm29205/gsm29205_test.c: https://gerrit.osmocom.org/#/c/11827/23/tests/gsm29205/gsm29205_test.c at 69 PS23, Line 69: abort(); > Same problem as pointed out by Pau in https://gerrit.osmocom.org/c/libosmocore/+/12020 [?] Done -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 24 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 13 Dec 2018 16:22:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:36:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 16:36:47 +0000 Subject: Change in meta-telephony[201705]: Introduce recipe liboping 1.10.0 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12299 Change subject: Introduce recipe liboping 1.10.0 ...................................................................... Introduce recipe liboping 1.10.0 It is a requirement for osmo-sysmon (to be added in follow-up patches). Change-Id: I98ffbf39870b309da0ccdde81047d4c124633ad4 --- A recipes-support/liboping/liboping_1.10.0.bb 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/99/12299/1 diff --git a/recipes-support/liboping/liboping_1.10.0.bb b/recipes-support/liboping/liboping_1.10.0.bb new file mode 100644 index 0000000..4c4dc90 --- /dev/null +++ b/recipes-support/liboping/liboping_1.10.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "C library to generate ICMP echo requests, better known as 'ping packets'" +HOMEPAGE = "https://noping.cc/" +SECTION = "libs" +LICENSE = "LGPLv2.1+" + +SRC_URI = "https://noping.cc/files/liboping-${PV}.tar.gz" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[md5sum] = "3a11b18a92b651225da10108242f71a4" +SRC_URI[sha256sum] = "c206b05743d0730814be3115b48abd0b00016677525153c78730da307aba0846" + +EXTRA_OECONF += "--without-ncurses --without-perl-bindings" + +inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/12299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I98ffbf39870b309da0ccdde81047d4c124633ad4 Gerrit-Change-Number: 12299 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:36:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 16:36:47 +0000 Subject: Change in meta-telephony[201705]: Introduce recipe for osmo-sysmon Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12300 Change subject: Introduce recipe for osmo-sysmon ...................................................................... Introduce recipe for osmo-sysmon Change-Id: I6e1da3a930e04d17ba0461874d60e6f204bc5b45 --- A recipes-osmocom/osmo-sysmon/osmo-sysmon.inc A recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb 2 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/00/12300/1 diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc b/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc new file mode 100644 index 0000000..1469438 --- /dev/null +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "Osmocom System Monitoring daemon" +HOMEPAGE = "https://osmocom.org/projects/osmo-sysmon" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libtalloc libosmocore libmnl liboping" + +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" + +inherit autotools pkgconfig + +PACKAGES =+ "osmo-ctrl-client" + +FILES_osmo-ctrl-client = " \ + ${bindir}/osmo-ctrl-client \ + " + +CONFFILES_osmo-sysmon = "\ + ${sysconfdir}/osmocom/osmo-sysmon.cfg \ + " diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb new file mode 100644 index 0000000..a9cd8d3 --- /dev/null +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "3b25774db5b584e926dab2534d93314f910f62b6" +SRC_URI = "git://git.osmocom.org/osmo-sysmon.git;protocol=git" +PV = "0.0.1+gitr${SRCPV}" +PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/12300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I6e1da3a930e04d17ba0461874d60e6f204bc5b45 Gerrit-Change-Number: 12300 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:38:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 16:38:09 +0000 Subject: Change in meta-telephony[201705]: Introduce recipe for osmo-sysmon In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12300 ) Change subject: Introduce recipe for osmo-sysmon ...................................................................... Patch Set 1: I made osmo-sysmon already depend on liboping hoping its use will be introduced soon (it still doesn't use it) and this way we don't need to create all this later. -- To view, visit https://gerrit.osmocom.org/12300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I6e1da3a930e04d17ba0461874d60e6f204bc5b45 Gerrit-Change-Number: 12300 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 16:38:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:40:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 16:40:23 +0000 Subject: Change in meta-telephony[201705]: Introduce recipe liboping 1.10.0 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12299 ) Change subject: Introduce recipe liboping 1.10.0 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I98ffbf39870b309da0ccdde81047d4c124633ad4 Gerrit-Change-Number: 12299 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 16:40:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:40:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 16:40:27 +0000 Subject: Change in meta-telephony[201705]: Introduce recipe for osmo-sysmon In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12300 ) Change subject: Introduce recipe for osmo-sysmon ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I6e1da3a930e04d17ba0461874d60e6f204bc5b45 Gerrit-Change-Number: 12300 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 16:40:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:40:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 16:40:49 +0000 Subject: Change in meta-telephony[201705]: Introduce recipe for osmo-sysmon In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12300 ) Change subject: Introduce recipe for osmo-sysmon ...................................................................... Patch Set 1: TODO after merge -> rebase laforge/nightly on top of 201705 -- To view, visit https://gerrit.osmocom.org/12300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I6e1da3a930e04d17ba0461874d60e6f204bc5b45 Gerrit-Change-Number: 12300 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 16:40:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:47:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 16:47:49 +0000 Subject: Change in meta-telephony[201705]: Introduce recipe liboping 1.10.0 In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12299 ) Change subject: Introduce recipe liboping 1.10.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I98ffbf39870b309da0ccdde81047d4c124633ad4 Gerrit-Change-Number: 12299 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 16:47:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:51:42 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 13 Dec 2018 16:51:42 +0000 Subject: Change in meta-telephony[201705]: Introduce recipe for osmo-sysmon In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12300 ) Change subject: Introduce recipe for osmo-sysmon ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I6e1da3a930e04d17ba0461874d60e6f204bc5b45 Gerrit-Change-Number: 12300 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 16:51:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:53:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 16:53:49 +0000 Subject: Change in meta-telephony[201705]: Introduce recipe liboping 1.10.0 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12299 ) Change subject: Introduce recipe liboping 1.10.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I98ffbf39870b309da0ccdde81047d4c124633ad4 Gerrit-Change-Number: 12299 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 16:53:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:53:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 16:53:50 +0000 Subject: Change in meta-telephony[201705]: Introduce recipe liboping 1.10.0 In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12299 ) Change subject: Introduce recipe liboping 1.10.0 ...................................................................... Introduce recipe liboping 1.10.0 It is a requirement for osmo-sysmon (to be added in follow-up patches). Change-Id: I98ffbf39870b309da0ccdde81047d4c124633ad4 --- A recipes-support/liboping/liboping_1.10.0.bb 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified Max: Looks good to me, but someone else must approve diff --git a/recipes-support/liboping/liboping_1.10.0.bb b/recipes-support/liboping/liboping_1.10.0.bb new file mode 100644 index 0000000..4c4dc90 --- /dev/null +++ b/recipes-support/liboping/liboping_1.10.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "C library to generate ICMP echo requests, better known as 'ping packets'" +HOMEPAGE = "https://noping.cc/" +SECTION = "libs" +LICENSE = "LGPLv2.1+" + +SRC_URI = "https://noping.cc/files/liboping-${PV}.tar.gz" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[md5sum] = "3a11b18a92b651225da10108242f71a4" +SRC_URI[sha256sum] = "c206b05743d0730814be3115b48abd0b00016677525153c78730da307aba0846" + +EXTRA_OECONF += "--without-ncurses --without-perl-bindings" + +inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/12299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I98ffbf39870b309da0ccdde81047d4c124633ad4 Gerrit-Change-Number: 12299 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:53:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 16:53:52 +0000 Subject: Change in meta-telephony[201705]: Introduce recipe for osmo-sysmon In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12300 ) Change subject: Introduce recipe for osmo-sysmon ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I6e1da3a930e04d17ba0461874d60e6f204bc5b45 Gerrit-Change-Number: 12300 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 13 Dec 2018 16:53:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 16:53:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 13 Dec 2018 16:53:54 +0000 Subject: Change in meta-telephony[201705]: Introduce recipe for osmo-sysmon In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12300 ) Change subject: Introduce recipe for osmo-sysmon ...................................................................... Introduce recipe for osmo-sysmon Change-Id: I6e1da3a930e04d17ba0461874d60e6f204bc5b45 --- A recipes-osmocom/osmo-sysmon/osmo-sysmon.inc A recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb 2 files changed, 27 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified Max: Looks good to me, but someone else must approve diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc b/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc new file mode 100644 index 0000000..1469438 --- /dev/null +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "Osmocom System Monitoring daemon" +HOMEPAGE = "https://osmocom.org/projects/osmo-sysmon" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libtalloc libosmocore libmnl liboping" + +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" + +inherit autotools pkgconfig + +PACKAGES =+ "osmo-ctrl-client" + +FILES_osmo-ctrl-client = " \ + ${bindir}/osmo-ctrl-client \ + " + +CONFFILES_osmo-sysmon = "\ + ${sysconfdir}/osmocom/osmo-sysmon.cfg \ + " diff --git a/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb new file mode 100644 index 0000000..a9cd8d3 --- /dev/null +++ b/recipes-osmocom/osmo-sysmon/osmo-sysmon_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "3b25774db5b584e926dab2534d93314f910f62b6" +SRC_URI = "git://git.osmocom.org/osmo-sysmon.git;protocol=git" +PV = "0.0.1+gitr${SRCPV}" +PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/12300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I6e1da3a930e04d17ba0461874d60e6f204bc5b45 Gerrit-Change-Number: 12300 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Dec 13 20:01:42 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Dec 2018 20:01:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c12babcc8da6_4e3bbea67c100727@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 181s] ./Transceiver52M/device/lms/LMSDevice.cpp:198: undefined reference to `LMS_VCTCXORead' [ 181s] ./Transceiver52M/device/lms/LMSDevice.cpp:201: undefined reference to `LMS_VCTCXOWrite' [ 181s] collect2: error: ld returned 1 exit status [ 181s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 181s] make[4]: *** [LMSDeviceTest] Error 1 [ 181s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 181s] Makefile:401: recipe for target 'all-recursive' failed [ 181s] make[3]: *** [all-recursive] Error 1 [ 181s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 181s] Makefile:516: recipe for target 'all-recursive' failed [ 181s] make[2]: *** [all-recursive] Error 1 [ 181s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 181s] Makefile:447: recipe for target 'all' failed [ 181s] make[1]: *** [all] Error 2 [ 181s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 181s] dh_auto_build: make -j1 returned exit code 2 [ 181s] debian/rules:6: recipe for target 'build' failed [ 181s] make: *** [build] Error 2 [ 181s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 181s] [ 181s] lamb06 failed "build osmo-trx_0.4.0.121.25185.dsc" at Thu Dec 13 20:01:35 UTC 2018. [ 181s] [ 181s] ### VM INTERACTION START ### [ 184s] [ 171.817348] sysrq: SysRq : Power Off [ 184s] [ 171.825260] reboot: Power down [ 184s] ### VM INTERACTION END ### [ 184s] [ 184s] lamb06 failed "build osmo-trx_0.4.0.121.25185.dsc" at Thu Dec 13 20:01:38 UTC 2018. [ 184s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 13 20:01:42 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Dec 2018 20:01:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c12babd47015_4e3bbea67c100873@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 163s] /usr/src/packages/BUILD/Transceiver52M/device/lms/LMSDevice.cpp:241: undefined reference to `LMS_Calibrate' [ 163s] /usr/src/packages/BUILD/Transceiver52M/device/lms/LMSDevice.cpp:234: undefined reference to `LMS_SetLPFBW' [ 163s] collect2: error: ld returned 1 exit status [ 163s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 163s] make[4]: *** [LMSDeviceTest] Error 1 [ 163s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 163s] Makefile:401: recipe for target 'all-recursive' failed [ 163s] make[3]: *** [all-recursive] Error 1 [ 163s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 163s] Makefile:516: recipe for target 'all-recursive' failed [ 163s] make[2]: *** [all-recursive] Error 1 [ 163s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 163s] Makefile:447: recipe for target 'all' failed [ 163s] make[1]: *** [all] Error 2 [ 163s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 163s] dh_auto_build: make -j1 returned exit code 2 [ 163s] debian/rules:6: recipe for target 'build' failed [ 163s] make: *** [build] Error 2 [ 163s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 163s] [ 163s] lamb17 failed "build osmo-trx_0.4.0.121.25185.dsc" at Thu Dec 13 20:01:25 UTC 2018. [ 163s] [ 163s] ### VM INTERACTION START ### [ 166s] [ 155.398854] sysrq: SysRq : Power Off [ 166s] [ 155.405392] reboot: Power down [ 166s] ### VM INTERACTION END ### [ 166s] [ 166s] lamb17 failed "build osmo-trx_0.4.0.121.25185.dsc" at Thu Dec 13 20:01:29 UTC 2018. [ 166s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 13 20:01:42 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Dec 2018 20:01:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5c12babc3333f_4e3bbea67c10066@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 253s] ./Transceiver52M/device/lms/LMSDevice.cpp:198: undefined reference to `LMS_VCTCXORead' [ 253s] ./Transceiver52M/device/lms/LMSDevice.cpp:201: undefined reference to `LMS_VCTCXOWrite' [ 253s] collect2: error: ld returned 1 exit status [ 253s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 253s] make[4]: *** [LMSDeviceTest] Error 1 [ 253s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 253s] Makefile:401: recipe for target 'all-recursive' failed [ 253s] make[3]: *** [all-recursive] Error 1 [ 253s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 253s] Makefile:516: recipe for target 'all-recursive' failed [ 253s] make[2]: *** [all-recursive] Error 1 [ 253s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 253s] Makefile:447: recipe for target 'all' failed [ 253s] make[1]: *** [all] Error 2 [ 253s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 253s] dh_auto_build: make -j1 returned exit code 2 [ 253s] debian/rules:6: recipe for target 'build' failed [ 253s] make: *** [build] Error 2 [ 253s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 254s] [ 254s] morla3 failed "build osmo-trx_0.4.0.121.25185.dsc" at Thu Dec 13 20:01:31 UTC 2018. [ 254s] [ 254s] ### VM INTERACTION START ### [ 257s] [ 242.503287] sysrq: SysRq : Power Off [ 257s] [ 242.555927] reboot: Power down [ 257s] ### VM INTERACTION END ### [ 257s] [ 257s] morla3 failed "build osmo-trx_0.4.0.121.25185.dsc" at Thu Dec 13 20:01:35 UTC 2018. [ 257s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 13 20:03:26 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Dec 2018 20:03:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c12bb16b4550_4e3bbea67c10107d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 211s] ./Transceiver52M/device/lms/LMSDevice.cpp:198: undefined reference to `LMS_VCTCXORead' [ 211s] ./Transceiver52M/device/lms/LMSDevice.cpp:201: undefined reference to `LMS_VCTCXOWrite' [ 211s] collect2: error: ld returned 1 exit status [ 211s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 211s] make[4]: *** [LMSDeviceTest] Error 1 [ 211s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 211s] Makefile:401: recipe for target 'all-recursive' failed [ 211s] make[3]: *** [all-recursive] Error 1 [ 211s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 211s] Makefile:516: recipe for target 'all-recursive' failed [ 211s] make[2]: *** [all-recursive] Error 1 [ 211s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 211s] Makefile:447: recipe for target 'all' failed [ 211s] make[1]: *** [all] Error 2 [ 211s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 211s] dh_auto_build: make -j1 returned exit code 2 [ 211s] debian/rules:6: recipe for target 'build' failed [ 211s] make: *** [build] Error 2 [ 211s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 211s] [ 211s] lamb04 failed "build osmo-trx_0.4.0.121.25185.dsc" at Thu Dec 13 20:03:15 UTC 2018. [ 211s] [ 211s] ### VM INTERACTION START ### [ 214s] [ 201.141939] sysrq: SysRq : Power Off [ 214s] [ 201.147366] reboot: Power down [ 214s] ### VM INTERACTION END ### [ 214s] [ 214s] lamb04 failed "build osmo-trx_0.4.0.121.25185.dsc" at Thu Dec 13 20:03:19 UTC 2018. [ 214s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 13 20:06:01 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Dec 2018 20:06:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c12bbac96ca2_4e3bbea67c101158@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 165s] /usr/src/packages/BUILD/Transceiver52M/device/lms/LMSDevice.cpp:234: undefined reference to `LMS_SetLPFBW' [ 165s] collect2: error: ld returned 1 exit status [ 165s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 165s] make[4]: *** [LMSDeviceTest] Error 1 [ 165s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 165s] Makefile:401: recipe for target 'all-recursive' failed [ 165s] make[3]: *** [all-recursive] Error 1 [ 165s] make[3]: Leaving directory '/usr/src/packages/BUILD/t[ 154.764350] serial8250: too much work for irq4 [ 165s] ests' [ 165s] Makefile:516: recipe for target 'all-recursive' failed [ 165s] make[2]: *** [all-recursive] Error 1 [ 165s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 165s] Makefile:447: recipe for target 'all' failed [ 165s] make[1]: *** [all] Error 2 [ 165s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 165s] dh_auto_build: make -j1 returned exit code 2 [ 165s] debian/rules:6: recipe for target 'build' failed [ 165s] make: *** [build] Error 2 [ 165s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 165s] [ 165s] lamb15 failed "build osmo-trx_0.4.0.121.25185.dsc" at Thu Dec 13 20:05:56 UTC 2018. [ 165s] [ 165s] ### VM INTERACTION START ### [ 168s] [ 157.926765] sysrq: SysRq : Power Off [ 168s] [ 157.933875] reboot: Power down [ 168s] ### VM INTERACTION END ### [ 168s] [ 168s] lamb15 failed "build osmo-trx_0.4.0.121.25185.dsc" at Thu Dec 13 20:05:59 UTC 2018. [ 168s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 13 20:10:18 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 13 Dec 2018 20:10:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5c12bcb81a68a_4e3bbea67c1017fd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 276s] ./Transceiver52M/device/lms/LMSDevice.cpp:198: undefined reference to `LMS_VCTCXORead' [ 276s] ./Transceiver52M/device/lms/LMSDevice.cpp:201: undefined reference to `LMS_VCTCXOWrite' [ 276s] collect2: error: ld returned 1 exit status [ 276s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 276s] make[4]: *** [LMSDeviceTest] Error 1 [ 276s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 276s] Makefile:401: recipe for target 'all-recursive' failed [ 276s] make[3]: *** [all-recursive] Error 1 [ 276s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 276s] Makefile:516: recipe for target 'all-recursive' failed [ 276s] make[2]: *** [all-recursive] Error 1 [ 276s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 276s] Makefile:447: recipe for target 'all' failed [ 276s] make[1]: *** [all] Error 2 [ 276s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 276s] dh_auto_build: make -j1 returned exit code 2 [ 276s] debian/rules:6: recipe for target 'build' failed [ 276s] make: *** [build] Error 2 [ 276s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 276s] [ 276s] cloud117 failed "build osmo-trx_0.4.0.121.25185.dsc" at Thu Dec 13 20:10:09 UTC 2018. [ 276s] [ 276s] ### VM INTERACTION START ### [ 279s] [ 254.875855] sysrq: SysRq : Power Off [ 279s] [ 254.881053] reboot: Power down [ 281s] ### VM INTERACTION END ### [ 281s] [ 281s] cloud117 failed "build osmo-trx_0.4.0.121.25185.dsc" at Thu Dec 13 20:10:14 UTC 2018. [ 281s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Dec 13 21:41:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 13 Dec 2018 21:41:20 +0000 Subject: Change in sandbox[master]: z Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12301 Change subject: z ...................................................................... z Change-Id: Ibf086ec487d8731f776739fd3c7c2d1cb83b6ce7 --- A z 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/sandbox refs/changes/01/12301/1 diff --git a/z b/z new file mode 100644 index 0000000..b680253 --- /dev/null +++ b/z @@ -0,0 +1 @@ +z -- To view, visit https://gerrit.osmocom.org/12301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf086ec487d8731f776739fd3c7c2d1cb83b6ce7 Gerrit-Change-Number: 12301 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 21:42:45 2018 From: gerrit-no-reply at lists.osmocom.org (neels_test_user) Date: Thu, 13 Dec 2018 21:42:45 +0000 Subject: Change in sandbox[master]: z In-Reply-To: References: Message-ID: neels_test_user has posted comments on this change. ( https://gerrit.osmocom.org/12301 ) Change subject: z ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf086ec487d8731f776739fd3c7c2d1cb83b6ce7 Gerrit-Change-Number: 12301 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: neels_test_user Gerrit-Comment-Date: Thu, 13 Dec 2018 21:42:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 13 21:42:50 2018 From: gerrit-no-reply at lists.osmocom.org (neels_test_user) Date: Thu, 13 Dec 2018 21:42:50 +0000 Subject: Change in sandbox[master]: z In-Reply-To: References: Message-ID: neels_test_user has posted comments on this change. ( https://gerrit.osmocom.org/12301 ) Change subject: z ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf086ec487d8731f776739fd3c7c2d1cb83b6ce7 Gerrit-Change-Number: 12301 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: neels_test_user Gerrit-Comment-Date: Thu, 13 Dec 2018 21:42:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 00:26:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 00:26:14 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11069 to look at the new patch set (#11). Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages ...................................................................... GSUP/SMS: introduce MO-/MT-FORWARD-SM messages According to 3GPP TS 29.002, there are two services: - MAP-MO-FORWARD-SHORT-MESSAGE (see 12.2), - MAP-MT-FORWARD-SHORT-MESSAGE (see 12.9), which are used to forward MO/MT short messages. This change replicates both services as GSUP messages: - OSMO_GSUP_MSGT_MO_FORWARD_SM_*, - OSMO_GSUP_MSGT_MT_FORWARD_SM_*. Please note, that only the 'must-have' IEs are introduced by this change, in particular the following: - OSMO_GSUP_SM_RP_MR_IE (see note below), - OSMO_GSUP_SM_RP_DA_IE (see 7.6.8.1), - OSMO_GSUP_SM_RP_OA_IE (see 7.6.8.2), - OSMO_GSUP_SM_RP_UI_IE (see 7.6.8.4), - OSMO_GSUP_SM_RP_MMS_IE (see 7.6.8.7), - OSMO_GSUP_SM_RP_CAUSE_IE (see GSM TS 04.11, 8.2.5.4), where both SM_RP_DA and SM_RP_OA IEs basically contain a single nested TV of the following format: - T: identity type (see 'osmo_gsup_sms_sm_rp_oda_t'), - V: encoded identity itself (optional). According to GSM TS 04.11, every single message on the SM-RL has an unique message reference (see 8.2.3), that is used to link an RP-ACK or RP-ERROR message to the associated (preceding) RP-DATA or RP-SMMA message transfer attempt. In case of TCAP/MAP, this message reference is being mapped to the Invoke ID. But since GSUP has no 'Invoke ID' IE, and it is not required for other applications (other than SMS), this change introduces a special 'SM_RP_MR' IE that doesn't exist in MAP. Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Related Change-Id: (docs) Ie0150756c33c1352bc4eb49421824542c711175c Related Change-Id: (TTCN) Ibf49474a81235096c032ea21f217170f523bd94e Related: OS#3587 --- M TODO-RELEASE M include/Makefile.am M include/osmocom/gsm/gsup.h A include/osmocom/gsm/gsup_sms.h M src/gsm/Makefile.am M src/gsm/gsup.c A src/gsm/gsup_sms.c M src/gsm/libosmogsm.map M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 11 files changed, 527 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/11069/11 -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 11 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 00:26:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 00:26:14 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message In-Reply-To: References: Message-ID: Hello Stefan Sperling, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11751 to look at the new patch set (#6). Change subject: GSUP/SMS: introduce READY-FOR-SM message ...................................................................... GSUP/SMS: introduce READY-FOR-SM message According to 3GPP TS 29.002, section 12.4, MAP-READY-FOR-SM is used between the MSC and VLR as well as between the VLR and the HLR to indicate that a subscriber has memory available for SMS. This change replicates this service in GSUP as READY_FOR_SM_*. The only mandatory IE for this service (excluding Invoke ID) is 'Alert Reason' that is replicated by OSMO_GSUP_SM_ALERT_RSN_IE. Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Related Change-Id: (docs) I549b6c8840a1e86caac09e77fb8bc5042d939e62 Related Change-Id: (TTCN) If2256607527ecfcb10285583332fb8b0515d7c78 Related: OS#3587 --- M include/osmocom/gsm/gsup.h M include/osmocom/gsm/gsup_sms.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 6 files changed, 46 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/51/11751/6 -- To view, visit https://gerrit.osmocom.org/11751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Gerrit-Change-Number: 11751 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 00:26:39 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 00:26:39 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages ...................................................................... Patch Set 10: (23 comments) https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup.h File include/osmocom/gsm/gsup.h: https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup.h at 235 PS10, Line 235: * Please note that there is no SM-RP-MR in TCAP/MAP! SM-RP-MR > in doxygen this becomes [?] Done https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup.h at 237 PS10, Line 237: const uint8_t *sm_rp_mr; > oh wow, so we don't inline uint8_t[] then? hmm. ok. ok then... [?] Sorry, what is this comment / question about? Alignment? How is this comment related to this change? https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup_sms.h File include/osmocom/gsm/gsup_sms.h: https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup_sms.h at 17 PS10, Line 17: OSMO_GSUP_SMS_SM_RP_ODA_NONE = 0x00, > OSMO_GSUP_SMS is the gsup-sub-type SMS [?] Harald is correct here, so ignored. https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup_sms.h at 25 PS10, Line 25: /* Forward declarations (to avoid mutual include) */ > yes, that's what they are, and I think all C programmers should be aware of that concept? Done https://gerrit.osmocom.org/#/c/11069/10/include/osmocom/gsm/gsup_sms.h at 29 PS10, Line 29: /* SM-RP-DA IE coding functions */ > a) I see that in the function name; unless you also explain "SM", "RP" or "DA", you might as well dr [?] Removed https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup.c File src/gsm/gsup.c: https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup.c at 569 PS10, Line 569: int idx, rc; > (rather place each var on its own line) Ignored. Why not? https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup.c at 668 PS10, Line 668: sizeof(u8), gsup_msg->sm_rp_mr); > (either line up with '(' or use a single tab as indent) I actually followed the style of msgb_tlv_put() statements above. We can unify the alignment in a separate path. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c File src/gsm/gsup_sms.c: https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 33 PS10, Line 33: * SMS (Short Message Service) extensions for Osmocom GSUP > please please use punctuation to end the summary line. Done https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 35 PS10, Line 35: > (I think we usually write in one line [?] Agree, fixed. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 37 PS10, Line 37: * Encode SM-RP-DA IE (see 7.6.8.1), Destination Address > please please use punctuation to end the summary line. Done https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 43 PS10, Line 43: const struct osmo_gsup_message *gsup_msg) > (I guess this fits on a 120 wide line?) Not critical, ignored. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 53 PS10, Line 53: /*! Special case for noSM-RP-DA and noSM-RP-OA */ > i doubt code inline doxygen makes sense. [?] Copy-pasted comment. Fixed, thanks! https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 55 PS10, Line 55: msgb_tv_put > I don't think we should introduce anything but TLV in GSUP. [?] I was actually abusing this function in order to put TL of the final TLTLV. Anyway, this doesn't make sense anymore, please see the new patch. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 62 PS10, Line 62: "(type=0x%02x)!\n", gsup_msg->sm_rp_da_type); > (also looks like comfortable fit for 120 width, at least for the char constant) Not critical, ignored. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 74 PS10, Line 74: ie_len = msg->tail + 1; /* To be calculated later */ > max recently added API for this, see msgb_tl_put() Good to know, thanks! https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 82 PS10, Line 82: *ie_len = msg->tail - (ie_len + 1); > I'm sure we have examples of nested IEs in other cases / protocol layers (like TS 12. [?] Done https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 88 PS10, Line 88: * Decode SM-RP-DA IE (see 7.6.8.1), Destination Address > . Done https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 125 PS10, Line 125: /*! Special case for noSM-RP-DA and noSM-RP-OA */ > . Copy pasted comment. Thanks, fixed! https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 142 PS10, Line 142: gsup_msg->sm_rp_da_len = id_len; > you are failing to check that the inner len does not surpass the outer TLV. [?] Done https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 147 PS10, Line 147: /*! : * Encode SM-RP-OA IE (see 7.6.8.2), Originating Address Fixed too. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 163 PS10, Line 163: /*! Special case for noSM-RP-DA and noSM-RP-OA */ > . Copy pasted comment. Thanks, fixed! https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 197 PS10, Line 197: /*! : * Decode SM-RP-OA IE (see 7.6.8.2), Originating Address Fixed too. https://gerrit.osmocom.org/#/c/11069/10/src/gsm/gsup_sms.c at 234 PS10, Line 234: /*! Fixed. -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 10 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 00:26:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 00:30:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 00:30:44 +0000 Subject: Change in libosmocore[master]: gsm0480: fix copy-pasted note for gsm0480_gen_return_error() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11988 ) Change subject: gsm0480: fix copy-pasted note for gsm0480_gen_return_error() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1c7116d368c2029b9f524cb74ffa316e282ec83 Gerrit-Change-Number: 11988 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 00:30:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 00:31:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 00:31:06 +0000 Subject: Change in libosmocore[master]: gsm0480: fix copy-pasted note for gsm0480_gen_return_error() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11988 ) Change subject: gsm0480: fix copy-pasted note for gsm0480_gen_return_error() ...................................................................... gsm0480: fix copy-pasted note for gsm0480_gen_return_error() InvokeID is mandatory for ReturnError component. Change-Id: Ie1c7116d368c2029b9f524cb74ffa316e282ec83 --- M src/gsm/gsm0480.c 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 021db62..fab2087 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -847,9 +847,6 @@ * \param[in] invoke_id InvokeID of the request * \param[in] error_code Error code (section 4.5) * \return message buffer containing the Reject component - * - * Note: if InvokeID is not available, e.g. when message parsing failed, any incorrect vlue - * can be passed (0x00 > x > 0xff), so the universal NULL-tag (see table 3.6) will be used instead. */ struct msgb *gsm0480_gen_return_error(uint8_t invoke_id, uint8_t error_code) { -- To view, visit https://gerrit.osmocom.org/11988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie1c7116d368c2029b9f524cb74ffa316e282ec83 Gerrit-Change-Number: 11988 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 00:55:52 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 00:55:52 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11837 to look at the new patch set (#5). Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... chapters/gsup.adoc: document READY-FOR-SM message Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Related Change-Id: (core) Ic37f3b2114b8095cfce22977e67133b9103942e3 Related Change-Id: (TTCN) If2256607527ecfcb10285583332fb8b0515d7c78 Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 75 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/37/11837/5 -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 00:56:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 00:56:22 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 00:56:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 01:30:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 01:30:20 +0000 Subject: Change in osmo-hlr[master]: gsupclient: add osmo_gsup_msg_enc_send() In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11989 to look at the new patch set (#3). Change subject: gsupclient: add osmo_gsup_msg_enc_send() ...................................................................... gsupclient: add osmo_gsup_msg_enc_send() Several parts of OsmoMSC (e.g. GSM 04.11, 09.11, etc.) are dealing with GSUP message encoding and sending towards OsmoHLR. In order to avoid code duplication, let's have a shared function here. Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f --- M include/osmocom/gsupclient/gsup_client.h M src/gsupclient/gsup_client.c 2 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/89/11989/3 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 10:55:43 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 14 Dec 2018 10:55:43 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: configurable retrieval of IMEI, IMEISV Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12302 Change subject: msc_vty.c: configurable retrieval of IMEI, IMEISV ...................................................................... msc_vty.c: configurable retrieval of IMEI, IMEISV Make these options configurable: * check-imei-rqd * retrieve-imeisv-early * retrieve-imeisv-ciphered Related: OS#3189 Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 --- M src/libmsc/msc_vty.c 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12302/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 87adc82..9973412 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -432,6 +432,32 @@ return CMD_SUCCESS; } +DEFUN(cfg_msc_check_imei_rqd, cfg_msc_check_imei_rqd_cmd, + "check-imei-rqd (0|1)", + "Send each IMEI to the EIR to ask if it is permitted or not. The EIR is implemented as part of osmo-hlr, " + "and can optionally save the IMEI in the HLR.\n" + "0 = do not send IMEIs to the EIR\n" + "1 = send each IMEI to the EIR\n") +{ + gsmnet->vlr->cfg.check_imei_rqd = atoi(argv[0]) ? true : false; + return CMD_SUCCESS; +} + +DEFUN(cfg_msc_retrieve_imeisv_early, cfg_msc_retrieve_imeisv_early_cmd, + "retrieve-imeisv-early (0|1)", + "") // FIXME +{ + gsmnet->vlr->cfg.retrieve_imeisv_early = atoi(argv[0]) ? true : false; + return CMD_SUCCESS; +} +DEFUN(cfg_msc_retrieve_imeisv_ciphered, cfg_msc_retrieve_imeisv_ciphered_cmd, + "retrieve-imeisv-ciphered (0|1)", + "") // FIXME +{ + gsmnet->vlr->cfg.retrieve_imeisv_ciphered = atoi(argv[0]) ? true : false; + return CMD_SUCCESS; +} + DEFUN(cfg_msc_paging_response_timer, cfg_msc_paging_response_timer_cmd, "paging response-timer (default|<1-65535>)", "Configure Paging\n" @@ -500,6 +526,15 @@ if (gsmnet->vlr->cfg.auth_reuse_old_sets_on_error) vty_out(vty, " auth-tuple-reuse-on-error 1%s", VTY_NEWLINE); + if (gsmnet->vlr->cfg.check_imei_rqd) + vty_out(vty, " check-imei-rqd 1 %s", + VTY_NEWLINE); + if (gsmnet->vlr->cfg.retrieve_imeisv_early) + vty_out(vty, " retrieve-imeisv-early 1%s", + VTY_NEWLINE); + if (gsmnet->vlr->cfg.retrieve_imeisv_ciphered) + vty_out(vty, " retrieve-imeisv-ciphered 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); @@ -1500,6 +1535,9 @@ install_element(MSC_NODE, &cfg_msc_no_assign_tmsi_cmd); install_element(MSC_NODE, &cfg_msc_auth_tuple_max_reuse_count_cmd); install_element(MSC_NODE, &cfg_msc_auth_tuple_reuse_on_error_cmd); + install_element(MSC_NODE, &cfg_msc_check_imei_rqd_cmd); + install_element(MSC_NODE, &cfg_msc_retrieve_imeisv_early_cmd); + install_element(MSC_NODE, &cfg_msc_retrieve_imeisv_ciphered_cmd); install_element(MSC_NODE, &cfg_msc_cs7_instance_a_cmd); install_element(MSC_NODE, &cfg_msc_cs7_instance_iu_cmd); install_element(MSC_NODE, &cfg_msc_paging_response_timer_cmd); -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 10:59:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 14 Dec 2018 10:59:20 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: configurable retrieval of IMEI, IMEISV In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12302 ) Change subject: msc_vty.c: configurable retrieval of IMEI, IMEISV ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c at 448 PS1, Line 448: "" Can somebody suggest a good description here? I could not find the part that describes retrieving the IMEISV early in the MAP spec 29.002. https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c at 455 PS1, Line 455: "" same here -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 14 Dec 2018 10:59:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 11:25:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 14 Dec 2018 11:25:57 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: configurable retrieval of IMEI, IMEISV In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12302 ) Change subject: msc_vty.c: configurable retrieval of IMEI, IMEISV ...................................................................... Patch Set 1: (osmotestvty.py runs through locally for me) -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 14 Dec 2018 11:25:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 11:46:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 14 Dec 2018 11:46:41 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c at 1454 PS3, Line 1454: parsing_config_file = true; > Why initializing it here instead of where it's declared? At present what you suggest would of course be equivalent, but code evolves over time. If we set the flag to true during program init already, then the flag's effect might change if calls into the VTY code made during program startup are ever changed in the future. This flag should only be set while vty_read_ocnfig_file is running, so setting it before and after calling this function makes that very explicit. Should I add a comment which mentions this? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 11:46:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:09:58 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 14 Dec 2018 12:09:58 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: configurable retrieval of IMEI, IMEISV In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12302 ) Change subject: msc_vty.c: configurable retrieval of IMEI, IMEISV ...................................................................... Patch Set 1: > Patch Set 1: > > (osmotestvty.py runs through locally for me) With --enable-external-tests, 'make check' fails locally for me with your patch applied. I suspect the reason is this: Documentation error (missing docs): Documentation error (missing docs): -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 12:09:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:16:28 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 14 Dec 2018 12:16:28 +0000 Subject: Change in osmo-hlr[master]: gsupclient: add osmo_gsup_msg_enc_send() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: add osmo_gsup_msg_enc_send() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 12:16:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:18:54 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 14 Dec 2018 12:18:54 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: configurable retrieval of IMEI, IMEISV In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12302 ) Change subject: msc_vty.c: configurable retrieval of IMEI, IMEISV ...................................................................... Patch Set 1: Thanks Stefan! Okay, then the failure is expected, as the documentation strings still need to be filled out (see earlier comments here). -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 12:18:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:20:24 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 14 Dec 2018 12:20:24 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Patch Set 5: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11837/5/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11837/5/common/chapters/gsup.adoc at 664 PS5, Line 664: corresponding MAP service is *MAP-READY-FOR-SM*. See 3GPP TS 29.002, In this section, *MAP-READY-FOR-SM* is highlighted (surrounded by asterisks), but in the other sections above it is written as just MAP-READY-FOR-SM without asterisks. Should this be made consistent? -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 12:20:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:22:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 12:22:23 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/11837/5/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11837/5/common/chapters/gsup.adoc at 664 PS5, Line 664: corresponding MAP service is *MAP-READY-FOR-SM*. See 3GPP TS 29.002, > In this section, *MAP-READY-FOR-SM* is highlighted (surrounded by asterisks), but in the other secti [?] Oh, nice catch! Thanks! -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 12:22:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:23:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 12:23:59 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Hello Stefan Sperling, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11837 to look at the new patch set (#6). Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... chapters/gsup.adoc: document READY-FOR-SM message Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Related Change-Id: (core) Ic37f3b2114b8095cfce22977e67133b9103942e3 Related Change-Id: (TTCN) If2256607527ecfcb10285583332fb8b0515d7c78 Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/37/11837/6 -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:27:38 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 14 Dec 2018 12:27:38 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 5: (3 comments) https://gerrit.osmocom.org/#/c/11836/5/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11836/5/common/chapters/gsup.adoc at 1093 PS5, Line 1093: relay sub-layer protocol. It can be either of the following: "Either" implies that there are only two options. Since there are three options listed below, this should say "any of the following" instead of "either of the following". https://gerrit.osmocom.org/#/c/11836/5/common/chapters/gsup.adoc at 1106 PS5, Line 1106: relay sub-layer protocol. It can be either of the following: Here, "either" is fine :) https://gerrit.osmocom.org/#/c/11836/5/common/chapters/gsup.adoc at 1168 PS5, Line 1168: should keep RAN the connection open. See 3GPP TS 29.002, section 7.6.8.7. I'm having trouble understanding this part: "the network should keep RAN the connection open" Did you mean to write "the network should keep the RAN connection open" instead? Or something else? -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 12:27:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:32:51 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 14 Dec 2018 12:32:51 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11751 ) Change subject: GSUP/SMS: introduce READY-FOR-SM message ...................................................................... Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11751/6/src/gsm/gsup.c File src/gsm/gsup.c: https://gerrit.osmocom.org/#/c/11751/6/src/gsm/gsup.c at 710 PS6, Line 710: if ((u8 = gsup_msg->sm_alert_rsn)) { This check for non-zero means OSMO_GSUP_SMS_SM_ALERT_RSN_NONE won't ever be sent. I assume this is intended, and ALERT_RSN_NONE is never part of a valid wire-protocol message? -- To view, visit https://gerrit.osmocom.org/11751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Gerrit-Change-Number: 11751 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 12:32:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:32:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 12:32:54 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Patch Set 24: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 24 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 12:32:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:33:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Dec 2018 12:33:30 +0000 Subject: Change in osmo-trx[master]: lms: Fix build against LimeSuite > 18.10 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12303 Change subject: lms: Fix build against LimeSuite > 18.10 ...................................................................... lms: Fix build against LimeSuite > 18.10 LimeSuite dc124e4e2ed9b549b142410af172f0592f9f0c23 > 18.10 broke API compatibility. OS#3729 Change-Id: Idf500a5b39a857233f728c6a4316c00a99374556 --- M Transceiver52M/device/lms/LMSDevice.cpp M configure.ac 2 files changed, 34 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/03/12303/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 270bd4a..b004308 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -41,6 +41,24 @@ #define LMS_MIN_BW_SUPPORTED 2.5e6 /* 2.5mHz, minimum supported by LMS */ #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED) +static int compat_LMS_VCTCXORead(lms_device_t *dev, uint16_t *val, bool memory) +{ +#if HAVE_LMS_VCTCXO_EEPROM_SAVING + return LMS_VCTCXORead(dev, val, memory); +#else + return LMS_VCTCXORead(dev, val); +#endif +} + +static int compat_LMS_VCTCXOWrite(lms_device_t *dev, uint16_t val, bool memory) +{ +#if HAVE_LMS_VCTCXO_EEPROM_SAVING + return LMS_VCTCXOWrite(dev, val, memory); +#else + return LMS_VCTCXOWrite(dev, val); +#endif +} + LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths): @@ -195,10 +213,10 @@ case REF_INTERNAL: LOGC(DDEV, INFO) << "Setting Internal clock reference"; /* Ugly API: Selecting clock source implicit by writing to VCTCXO DAC ?!? */ - if (LMS_VCTCXORead(m_lms_dev, &dac_val) < 0) + if (compat_LMS_VCTCXORead(m_lms_dev, &dac_val, false) < 0) goto out_close; LOGC(DDEV, INFO) << "Setting VCTCXO to " << dac_val; - if (LMS_VCTCXOWrite(m_lms_dev, dac_val) < 0) + if (compat_LMS_VCTCXOWrite(m_lms_dev, dac_val, false) < 0) goto out_close; break; case REF_EXTERNAL: diff --git a/configure.ac b/configure.ac index 2e036ba..37b70fa 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,20 @@ AS_IF([test "x$with_lms" = "xyes"], [ PKG_CHECK_MODULES(LMS, LimeSuite) + + # LimeSuite dc124e4e2ed9b549b142410af172f0592f9f0c23 > 18.10 broke API compatibility: + _cflags_save=$CFLAGS + CFLAGS="$CFLAGS $LMS_CFLAGS" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[LMS_VCTCXOWrite(NULL, 0, false); LMS_VCTCXORead(NULL, 0, false);]] + )], + [AC_DEFINE([HAVE_LMS_VCTCXO_EEPROM_SAVING], [1], + [LMS_VCTCXO* requires memory parameter])], + [AC_DEFINE([HAVE_LMS_VCTCXO_EEPROM_SAVING], [0], + [LMS_VCTCXO* has no memory parameter])]) + CFLAGS=$_cflags_save ]) AS_IF([test "x$with_uhd" != "xno"],[ -- To view, visit https://gerrit.osmocom.org/12303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idf500a5b39a857233f728c6a4316c00a99374556 Gerrit-Change-Number: 12303 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:33:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 12:33:55 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 18: Code-Review+2 Will merge at the end of the day unless some objections will be raised. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 18 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 12:33:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:36:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 14 Dec 2018 12:36:44 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11751 ) Change subject: GSUP/SMS: introduce READY-FOR-SM message ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/11751/6/src/gsm/gsup.c File src/gsm/gsup.c: https://gerrit.osmocom.org/#/c/11751/6/src/gsm/gsup.c at 710 PS6, Line 710: if ((u8 = gsup_msg->sm_alert_rsn)) { > This check for non-zero means OSMO_GSUP_SMS_SM_ALERT_RSN_NONE won't ever be sent. [?] A follow-up suggestion: If, as I expect, this is intended, then we could explicitly write this check like this: if ((u8 = gsup_msg->sm_alert_rsn) != OSMO_GSUP_SMS_SM_ALERT_RSN_NONE) { -- To view, visit https://gerrit.osmocom.org/11751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Gerrit-Change-Number: 11751 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 12:36:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:38:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Dec 2018 12:38:44 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 18: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 18 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 12:38:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:40:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Dec 2018 12:40:09 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Patch Set 24: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 24 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 12:40:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:51:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 12:51:07 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11751 ) Change subject: GSUP/SMS: introduce READY-FOR-SM message ...................................................................... Patch Set 6: (2 comments) https://gerrit.osmocom.org/#/c/11751/6/src/gsm/gsup.c File src/gsm/gsup.c: https://gerrit.osmocom.org/#/c/11751/6/src/gsm/gsup.c at 710 PS6, Line 710: if ((u8 = gsup_msg->sm_alert_rsn)) { > A follow-up suggestion: [?] Well, this approach is quite common, look at: - gsup_msg->cause, - gsup_msg->cancel_type, where this check is also done implicitly. Any benefits of checking this explicitly? https://gerrit.osmocom.org/#/c/11751/6/src/gsm/gsup.c at 710 PS6, Line 710: if ((u8 = gsup_msg->sm_alert_rsn)) { > This check for non-zero means OSMO_GSUP_SMS_SM_ALERT_RSN_NONE won't ever be sent. [?] Yes, correct. The current GSUP API in libosmocore is ugly, because we have a single structure for all kinds of messages. This is why we have to introduce such special values. -- To view, visit https://gerrit.osmocom.org/11751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Gerrit-Change-Number: 11751 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 12:51:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:51:12 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 12:51:12 +0000 Subject: Change in osmo-hlr[master]: gsupclient: add osmo_gsup_msg_enc_send() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: add osmo_gsup_msg_enc_send() ...................................................................... Patch Set 3: Code-Review-1 (2 comments) Please double check. https://gerrit.osmocom.org/#/c/11989/3/src/gsupclient/gsup_client.c File src/gsupclient/gsup_client.c: https://gerrit.osmocom.org/#/c/11989/3/src/gsupclient/gsup_client.c at 369 PS3, Line 369: struct osmo_gsup_message *gsup_msg) Why this isn't const? What modifies it? https://gerrit.osmocom.org/#/c/11989/3/src/gsupclient/gsup_client.c at 380 PS3, Line 380: rc = osmo_gsup_encode(gsup_msgb, gsup_msg); gsup_msg is const in here according to osmo_gsup_encode() type signature. -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 12:51:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:52:57 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 12:52:57 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_trx.py: drop meaningless warnings In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12291 ) Change subject: trx_toolkit/ctrl_if_trx.py: drop meaningless warnings ...................................................................... Patch Set 2: (1 comment) Could you clarify in commit message if RESET was introduced or why removing this TODO is the right thing. https://gerrit.osmocom.org/#/c/12291/2/src/target/trx_toolkit/ctrl_if_trx.py File src/target/trx_toolkit/ctrl_if_trx.py: https://gerrit.osmocom.org/#/c/12291/2/src/target/trx_toolkit/ctrl_if_trx.py at a126 PS2, Line 126: That's rather puzzling TODO in here. -- To view, visit https://gerrit.osmocom.org/12291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a69ebceed5aa724093e6d1b23faad8c16705055 Gerrit-Change-Number: 12291 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Fri, 14 Dec 2018 12:52:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:54:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 12:54:55 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12236 ) Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... Patch Set 2: Do you need to update some .adoc or .msc as well or this isn't documented? -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Max Gerrit-Comment-Date: Fri, 14 Dec 2018 12:54:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:54:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 14 Dec 2018 12:54:57 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages ...................................................................... Patch Set 11: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/11069/11/src/gsm/gsup.c File src/gsm/gsup.c: https://gerrit.osmocom.org/#/c/11069/11/src/gsm/gsup.c at 668 PS11, Line 668: sizeof(u8), gsup_msg->sm_rp_mr); Use sizeof(*gsup_msg->sm_rp_mr) here? https://gerrit.osmocom.org/#/c/11069/11/src/gsm/gsup.c at 694 PS11, Line 694: sizeof(u8), gsup_msg->sm_rp_mms); Use sizeof(*gsup_msg->sm_rp_mms)? https://gerrit.osmocom.org/#/c/11069/11/src/gsm/gsup.c at 699 PS11, Line 699: sizeof(u8), gsup_msg->sm_rp_cause); Use sizeof(*gsup_msg->sm_rp_cause)? -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 11 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 12:54:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:57:24 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 12:57:24 +0000 Subject: Change in osmo-msc[master]: tweak comment to indicate sub_pres_vlr fsm as dead code In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12234 ) Change subject: tweak comment to indicate sub_pres_vlr fsm as dead code ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12234/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12234/3//COMMIT_MSG at 18 PS3, Line 18: this models some FSM definition from 3GPP specs, and we have a couple other It would be better to add actual spec reference here as well as in the comment. -- To view, visit https://gerrit.osmocom.org/12234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I198d442e9ed288f37c7d4e5ec87b82dc53114e99 Gerrit-Change-Number: 12234 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Dec 2018 12:57:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 12:59:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 12:59:55 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11992 ) Change subject: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions ...................................................................... Patch Set 7: Is this some named timer from the spec or it's just smth which makes sense in practice? -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Fri, 14 Dec 2018 12:59:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:01:48 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 13:01:48 +0000 Subject: Change in osmo-hlr[master]: gsupclient: add osmo_gsup_msg_enc_send() In-Reply-To: References: Message-ID: Hello Stefan Sperling, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11989 to look at the new patch set (#4). Change subject: gsupclient: add osmo_gsup_msg_enc_send() ...................................................................... gsupclient: add osmo_gsup_msg_enc_send() Several parts of OsmoMSC (e.g. GSM 04.11, 09.11, etc.) are dealing with GSUP message encoding and sending towards OsmoHLR. In order to avoid code duplication, let's have a shared function here. Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f --- M include/osmocom/gsupclient/gsup_client.h M src/gsupclient/gsup_client.c 2 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/89/11989/4 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:02:08 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 13:02:08 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11787/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11787/3//COMMIT_MSG at 7 PS3, Line 7: add/clean big-endian packed structs (struct_endianess.py) Please add exact call to struct_endianess.py you've used to make this change to make this reproducible. Also, please clarify if any manual editing was necessary or it's purely automated code change. -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Dec 2018 13:02:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:05:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 13:05:29 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11992 ) Change subject: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions ...................................................................... Patch Set 7: > Is this some named timer from the spec or it's just smth which > makes sense in practice? Second. No such timer in the specs. -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Fri, 14 Dec 2018 13:05:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:07:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 13:07:38 +0000 Subject: Change in osmo-hlr[master]: gsupclient: add osmo_gsup_msg_enc_send() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: add osmo_gsup_msg_enc_send() ...................................................................... Patch Set 4: Code-Review-1 (3 comments) Sorry, haven't noticed those earlier. https://gerrit.osmocom.org/#/c/11989/4/src/gsupclient/gsup_client.c File src/gsupclient/gsup_client.c: https://gerrit.osmocom.org/#/c/11989/4/src/gsupclient/gsup_client.c at 366 PS4, Line 366: * \returns 0 in case of success, otherwise errno Errno is positive and we return negative I believe - better state that explicitly. https://gerrit.osmocom.org/#/c/11989/4/src/gsupclient/gsup_client.c at 381 PS4, Line 381: if (rc) { I think it's better to explicitly check rc < 0 in here to make reading code easier. https://gerrit.osmocom.org/#/c/11989/4/src/gsupclient/gsup_client.c at 387 PS4, Line 387: if (rc) { And here too. -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 13:07:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:14:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 13:14:49 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11992 ) Change subject: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions ...................................................................... Patch Set 7: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/11992/7/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/#/c/11992/7/include/osmocom/msc/gsm_data.h at 188 PS7, Line 188: int ncss_guard_timeout; Why do you use int in here? https://gerrit.osmocom.org/#/c/11992/7/src/libmsc/gsm_09_11.c File src/libmsc/gsm_09_11.c: https://gerrit.osmocom.org/#/c/11992/7/src/libmsc/gsm_09_11.c at 141 PS7, Line 141: /* Init self-destruction timer */ That sounds ominous - I like it :) https://gerrit.osmocom.org/#/c/11992/7/src/libmsc/gsm_09_11.c at 477 PS7, Line 477: if (net->ncss_guard_timeout > 0) { Seems like we always check ncss_guard_timeout > 0 https://gerrit.osmocom.org/#/c/11992/7/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/11992/7/src/libmsc/msc_vty.c at 382 PS7, Line 382: "guard timer value (sec.), or 0 to disable\n") So ncss_guard_timeout is always positive and fit into uint8_t. -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 13:14:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:15:16 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 13:15:16 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Max has removed a vote on this change. Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Removed Code-Review+2 by Max -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 24 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:15:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 13:15:25 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Max has removed a vote on this change. Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Removed Code-Review+2 by Max -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 18 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:15:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 13:15:40 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... LCLS, TS 29.205: add GCR routines Add functions to encode and decode Global Call Reference as per 3GPP TS 29.205 Table B 2.1.9.1 add corresponding tests. Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Related: OS#2487 --- M include/Makefile.am M include/osmocom/gsm/gsm0808_utils.h A include/osmocom/gsm/gsm29205.h M src/gsm/Makefile.am A src/gsm/gsm29205.c M src/gsm/libosmogsm.map M tests/Makefile.am A tests/gsm29205/gsm29205_test.c A tests/gsm29205/gsm29205_test.ok M tests/testsuite.at 10 files changed, 263 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/Makefile.am b/include/Makefile.am index 366fd70..ccf9e10 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -86,6 +86,7 @@ osmocom/coding/gsm0503_interleaving.h \ osmocom/coding/gsm0503_coding.h \ osmocom/gsm/gsm0808.h \ + osmocom/gsm/gsm29205.h \ osmocom/gsm/gsm0808_utils.h \ osmocom/gsm/gsm23003.h \ osmocom/gsm/gsm29118.h \ diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 90ff677..5d5803b 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -62,7 +62,7 @@ struct osmo_lcls { enum gsm0808_lcls_config config; /**< ?3.2.2.116 Configuration */ enum gsm0808_lcls_control control; /**< ?3.2.2.117 Connection Status Control */ - struct gsm29205_gcr *gcr; /**< ?3.2.2.115 Global Call Reference */ + struct osmo_gcr_parsed *gcr; /**< ?3.2.2.115 Global Call Reference */ bool corr_needed; /**< ?3.2.2.118 Correlation-Not-Needed */ }; diff --git a/include/osmocom/gsm/gsm29205.h b/include/osmocom/gsm/gsm29205.h new file mode 100644 index 0000000..0c3c153 --- /dev/null +++ b/include/osmocom/gsm/gsm29205.h @@ -0,0 +1,41 @@ +/*! \defgroup gsm29205 3GPP TS 29.205 + * @{ + * \file gsm29205.h */ +/* + * (C) 2018 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU 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. + * + */ + +#pragma once + +#include + +#include + +#define OSMO_GCR_MIN_LEN 13 + +/*! Parsed representation of Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1. */ +struct osmo_gcr_parsed { + uint8_t net[5]; /** Network ID, ITU-T Q.1902.3 */ + uint8_t net_len; /** length (3-5 octets) of gsm29205_gcr#net */ + uint16_t node; /** Node ID */ + uint8_t cr[5]; /** Call Reference ID */ +}; + +uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g); +int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len); diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index e28ea33..ccb38ad 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -24,7 +24,7 @@ gsm_utils.c rsl.c gsm48.c gsm48_ie.c gsm0808.c sysinfo.c \ gprs_cipher_core.c gprs_rlc.c gsm0480.c abis_nm.c gsm0502.c \ gsm0411_utils.c gsm0411_smc.c gsm0411_smr.c gsm0414.c \ - lapd_core.c lapdm.c kasumi.c gsm_04_08_gprs.c \ + lapd_core.c lapdm.c kasumi.c gsm29205.c gsm_04_08_gprs.c \ auth_core.c auth_comp128v1.c auth_comp128v23.c \ auth_milenage.c milenage/aes-encblock.c gea.c \ milenage/aes-internal.c milenage/aes-internal-enc.c \ diff --git a/src/gsm/gsm29205.c b/src/gsm/gsm29205.c new file mode 100644 index 0000000..0ef29b7 --- /dev/null +++ b/src/gsm/gsm29205.c @@ -0,0 +1,93 @@ +/* + * (C) 2018 by sysmocom - s.f.m.c. GmbH + * 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. + * + */ + +#include +#include +#include +#include +#include + +#include + +/*! \addtogroup gsm29205 + * @{ + * \file gsm29205.c + * Functions related to 3GPP TS 29.205, primarily message generation/encoding. + */ + +/*! Create Global Call Reference. + * \param[out] msg Message Buffer for appending IE + * \param[in] g Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1 + * \returns number of bytes added to \a msg */ +uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g) +{ + uint8_t buf[2]; + + if (!g) + return 0; + + if (g->net_len < 3 || g->net_len > 5) + return 0; + + msgb_lv_put(msg, g->net_len, g->net); + + osmo_store16be(g->node, &buf); + msgb_lv_put(msg, 2, buf); + + msgb_lv_put(msg, 5, g->cr); + + /* Length: LV(Net) + LV(Node) + LV(CRef) - see 3GPP TS ?3.2.2.115 */ + return (g->net_len + 1) + (2 + 1) + (5 + 1); +} + +/*! Decode Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1. + * \param[out] gcr Caller-provided memory to store Global Call Reference + * \param[in] elem IE value to be decoded + * \param[in] len Length of \a elem in bytes + * \returns number of bytes parsed; negative on error */ +int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len) +{ + uint16_t parsed = 1; /* account for length byte right away */ + + if (len < 13) + return -EBADMSG; + + gcr->net_len = elem[0]; + if (gcr->net_len < 3 || gcr->net_len > 5) + return -EINVAL; + + memcpy(gcr->net, elem + parsed, gcr->net_len); + /* +1 for ignored Node ID length field */ + parsed += (gcr->net_len + 1); + + gcr->node = osmo_load16be(elem + parsed); + parsed += 2; + + if (elem[parsed] != 5) /* see Table B 2.1.9.2 */ + return -ENOENT; + + parsed++; + + memcpy(gcr->cr, elem + parsed, 5); + + return parsed + 5; +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index dc4e0a6..e85ed6d 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -235,6 +235,9 @@ gsm29118_create_release_req; gsm29118_create_service_abort_req; +osmo_enc_gcr; +osmo_dec_gcr; + gsm0858_rsl_ul_meas_enc; gsm338_get_sms_alphabet; diff --git a/tests/Makefile.am b/tests/Makefile.am index 18d4bb4..028abc2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,7 +24,7 @@ abis/abis_test endian/endian_test sercomm/sercomm_test \ prbs/prbs_test gsm23003/gsm23003_test \ codec/codec_ecu_fr_test timer/clk_override_test \ - oap/oap_client_test \ + oap/oap_client_test gsm29205/gsm29205_test \ logging/logging_vty_test \ $(NULL) @@ -104,6 +104,9 @@ gsm0808_gsm0808_test_SOURCES = gsm0808/gsm0808_test.c gsm0808_gsm0808_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gsm29205_gsm29205_test_SOURCES = gsm29205/gsm29205_test.c +gsm29205_gsm29205_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la + gsm0408_gsm0408_test_SOURCES = gsm0408/gsm0408_test.c gsm0408_gsm0408_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la @@ -272,7 +275,7 @@ osmo-auc-gen/osmo-auc-gen_test.err \ conv/conv_gsm0503_test.ok endian/endian_test.ok \ sercomm/sercomm_test.ok prbs/prbs_test.ok \ - gsm23003/gsm23003_test.ok \ + gsm29205/gsm29205_test.ok gsm23003/gsm23003_test.ok \ timer/clk_override_test.ok \ oap/oap_client_test.ok oap/oap_client_test.err diff --git a/tests/gsm29205/gsm29205_test.c b/tests/gsm29205/gsm29205_test.c new file mode 100644 index 0000000..5add1b1 --- /dev/null +++ b/tests/gsm29205/gsm29205_test.c @@ -0,0 +1,107 @@ +/* + * (C) 2018 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU 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 + +static void test_gcr() +{ + static const uint8_t res[] = { + 0x03, /* .net_len */ + 0x51, 0x52, 0x53, /* .net */ + 0x02, /* .node length */ + 0xde, 0xad, /* .node */ + 0x05, /* length of Call. Ref. */ + 0x41, 0x42, 0x43, 0x44, 0x45 /* .cr - Call. Ref. */ + }; + uint8_t len; + struct msgb *msg; + struct osmo_gcr_parsed p = { 0 }, g = { + .net_len = 3, + .net = { 0x51, 0x52, 0x53 }, + .node = 0xDEAD, + .cr = { 0x41, 0x42, 0x43, 0x44, 0x45 } + }; + int rc; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "global call reference"); + if (!msg) + return; + + len = osmo_enc_gcr(msg, &g); + printf("Testing Global Call Reference encoder...\n\t%d bytes added: %s\n", + len, len == ARRAY_SIZE(res) ? "OK" : "FAIL"); + + if (!msgb_eq_data_print(msg, res, ARRAY_SIZE(res))) + abort(); + + rc = osmo_dec_gcr(&p, msgb_data(msg), msgb_length(msg)); + if (rc < 0) { + printf("decoding failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); + abort(); + } + + if (p.net_len != g.net_len) { + printf("Network ID length parsed wrong: %u != %u\n", p.net_len, g.net_len); + abort(); + } + + if (p.node != g.node) { + printf("Node ID parsed wrong: 0x%X != 0x%X\n", p.node, g.node); + abort(); + } + + if (memcmp(p.net, g.net, g.net_len) != 0) { + printf("Network ID parsed wrong: %s\n", osmo_hexdump(p.net, p.net_len)); + abort(); + } + + if (memcmp(p.cr, g.cr, 5) != 0) { + printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(p.cr, 5)); + abort(); + } + + printf("\tdecoded %d bytes: %s\n", rc, rc == len ? "OK" : "FAIL"); + msgb_free(msg); +} + +int main(int argc, char **argv) +{ + osmo_init_logging2(talloc_named_const(NULL, 0, "gsm29205 test"), NULL); + + printf("Testing 3GPP TS 29.205 routines...\n"); + + test_gcr(); + + printf("Done.\n"); + + return EXIT_SUCCESS; +} diff --git a/tests/gsm29205/gsm29205_test.ok b/tests/gsm29205/gsm29205_test.ok new file mode 100644 index 0000000..bddd88a --- /dev/null +++ b/tests/gsm29205/gsm29205_test.ok @@ -0,0 +1,5 @@ +Testing 3GPP TS 29.205 routines... +Testing Global Call Reference encoder... + 13 bytes added: OK + decoded 13 bytes: OK +Done. diff --git a/tests/testsuite.at b/tests/testsuite.at index a1cf98a..6aaaa78 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -132,6 +132,12 @@ AT_CHECK([$abs_top_builddir/tests/gsm0808/gsm0808_test], [0], [expout], [ignore]) AT_CLEANUP +AT_SETUP([gsm29205]) +AT_KEYWORDS([gsm29205]) +cat $abs_srcdir/gsm29205/gsm29205_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/gsm29205/gsm29205_test], [0], [expout], [ignore]) +AT_CLEANUP + AT_SETUP([gsm0408]) AT_KEYWORDS([gsm0408]) cat $abs_srcdir/gsm0408/gsm0408_test.ok > expout -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 25 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:15:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 13:15:41 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... LCLS, TS 48.008: add GCR IE encoding/decoding * add functions to encode Global Call. Ref. from TS 29.205 as 3GPP TS 48.008 ?3.2.2.115 information element * add corresponding tests Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 123 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 5d5803b..22050b5 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -82,6 +83,10 @@ const struct sockaddr_storage *ss); int gsm0808_dec_aoip_trasp_addr(struct sockaddr_storage *ss, const uint8_t *elem, uint8_t len); + +uint8_t gsm0808_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g); +int gsm0808_dec_gcr(struct osmo_gcr_parsed *g, const struct tlv_parsed *tp); + uint8_t gsm0808_enc_speech_codec(struct msgb *msg, const struct gsm0808_speech_codec *sc); int gsm0808_dec_speech_codec(struct gsm0808_speech_codec *sc, diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 38a8664..a04adde 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -508,6 +508,41 @@ return (int)(elem - old_elem); } +/*! Create BSSMAP Global Call Reference, 3GPP TS 48.008 ?3.2.2.115. + * \param[out] msg Message Buffer for appending IE + * \param[in] g Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1 + * \returns number of bytes added to \a msg or 0 on error */ +uint8_t gsm0808_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g) +{ + uint8_t enc, *len = msgb_tl_put(msg, GSM0808_IE_GLOBAL_CALL_REF); + + enc = osmo_enc_gcr(msg, g); + if (!enc) + return 0; + + *len = enc; + return enc + 2; /* type (1 byte) + length (1 byte) */ +} + +/*! Decode BSSMAP Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1. + * \param[out] gcr Caller-provided memory to store Global Call Reference + * \param[in] elem IE value to be decoded + * \param[in] len Length of \a elem in bytes + * \returns number of bytes parsed; negative on error */ +int gsm0808_dec_gcr(struct osmo_gcr_parsed *gcr, const struct tlv_parsed *tp) +{ + int ret; + const uint8_t *buf = TLVP_VAL_MINLEN(tp, GSM0808_IE_GLOBAL_CALL_REF, OSMO_GCR_MIN_LEN); + if (!buf) + return -EINVAL; + + ret = osmo_dec_gcr(gcr, buf, TLVP_LEN(tp, GSM0808_IE_GLOBAL_CALL_REF)); + if (ret < 0) + return -ENOENT; + + return 2 + ret; +} + /*! Encode TS 08.08 Encryption Information IE * \param[out] msg Message Buffer to which IE is to be appended * \param[in] ei Encryption Information to be encoded diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index e85ed6d..94ae76a 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -219,6 +219,8 @@ gsm0808_lcls_config_names; gsm0808_lcls_control_names; gsm0808_lcls_status_names; +gsm0808_enc_gcr; +gsm0808_dec_gcr; gsm29118_msgb_alloc; gsm29118_create_alert_req; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 63b8720..f0f3165 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include #include @@ -597,6 +599,75 @@ msgb_free(in_msg); } +static void test_enc_dec_gcr() +{ + static const uint8_t res[] = { + GSM0808_IE_GLOBAL_CALL_REF, + 0x0d, /* GCR length */ + 0x03, /* .net_len */ + 0xf1, 0xf2, 0xf3, /* .net */ + 0x02, /* .node length */ + 0xde, 0xad, /* .node */ + 0x05, /* length of Call. Ref. */ + 0x41, 0x42, 0x43, 0x44, 0x45 /* .cr - Call. Ref. */ + }; + uint8_t len; + struct msgb *msg; + struct osmo_gcr_parsed p = { 0 }, g = { + .net_len = 3, + .net = { 0xf1, 0xf2, 0xf3 }, + .node = 0xDEAD, + .cr = { 0x41, 0x42, 0x43, 0x44, 0x45 }, + }; + int rc; + struct tlv_parsed tp; + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "global call reference"); + if (!msg) + return; + + len = gsm0808_enc_gcr(msg, &g); + printf("Testing Global Call Reference IE encoder...\n\t%d bytes added: %s\n", + len, len == ARRAY_SIZE(res) ? "OK" : "FAIL"); + + if (!msgb_eq_data_print(msg, res, ARRAY_SIZE(res))) + abort(); + + rc = osmo_bssap_tlv_parse(&tp, msgb_data(msg), msgb_length(msg)); + if (rc < 0) { + printf("parsing failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); + abort(); + } + + rc = gsm0808_dec_gcr(&p, &tp); + if (rc < 0) { + printf("decoding failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); + abort(); + } + + if (p.net_len != g.net_len) { + printf("Network ID length parsed wrong: %u != %u\n", p.net_len, g.net_len); + abort(); + } + + if (p.node != g.node) { + printf("Node ID parsed wrong: 0x%X != 0x%X\n", p.node, g.node); + abort(); + } + + if (memcmp(p.net, g.net, g.net_len) != 0) { + printf("Network ID parsed wrong: %s\n", osmo_hexdump(p.net, p.net_len)); + abort(); + } + + if (memcmp(p.cr, g.cr, 5) != 0) { + printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(p.cr, 5)); + abort(); + } + + printf("\tdecoded %d bytes: %s\n", rc, rc == len ? "OK" : "FAIL"); + msgb_free(msg); +} + static void test_enc_dec_aoip_trasp_addr_v4() { struct sockaddr_storage enc_addr; @@ -1790,6 +1861,10 @@ int main(int argc, char **argv) { + void *ctx = talloc_named_const(NULL, 0, "gsm0808 test"); + msgb_talloc_ctx_init(ctx, 0); + osmo_init_logging2(ctx, NULL); + printf("Testing generation of GSM0808 messages\n"); test_gsm0808_enc_cause(); test_create_layer3(); @@ -1813,6 +1888,9 @@ test_create_paging(); test_create_dtap(); test_prepend_dtap(); + + test_enc_dec_gcr(); + test_enc_dec_aoip_trasp_addr_v4(); test_enc_dec_aoip_trasp_addr_v6(); test_gsm0808_enc_dec_speech_codec(); diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index e5833d0..d5857e3 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -22,6 +22,9 @@ Testing creating Paging Request Testing creating DTAP Testing prepend DTAP +Testing Global Call Reference IE encoder... + 15 bytes added: OK + decoded 15 bytes: OK test_gsm0808_enc_dec_cell_id_list_lac: encoded: 1a 07 05 01 24 ab cd 56 78 (rc = 9) ------- test_cell_id_list_add cell_id_list == CGI[0]:{} -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 19 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:15:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 13:15:41 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass2() In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass2() ...................................................................... LCLS: add gsm0808_create_ass2() It allows setting additional assignment parameters explicitly. Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Related: OS#2487 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 133 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index e3fb6ad..79d89e5 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -64,6 +64,12 @@ const struct sockaddr_storage *ss, const struct gsm0808_speech_codec_list *scl, const uint32_t *ci); +struct msgb *gsm0808_create_ass2(const struct gsm0808_channel_type *ct, + const uint16_t *cic, + const struct sockaddr_storage *ss, + const struct gsm0808_speech_codec_list *scl, + const uint32_t *ci, + const uint8_t *kc, const struct osmo_lcls *lcls); struct msgb *gsm0808_create_ass_compl(uint8_t rr_cause, uint8_t chosen_channel, uint8_t encr_alg_id, uint8_t speech_mode, const struct sockaddr_storage *ss, diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index e951ab1..69da57d 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -425,18 +425,22 @@ return msg; } -/*! Create BSSMAP Assignment Request message, 3GPP TS 48.008 ?3.2.1.1 +/*! Create BSSMAP Assignment Request message, 3GPP TS 48.008 ?3.2.1.1. + * This is identical to gsm0808_create_ass(), but adds KC and LCLS IEs. * \param[in] ct Channel Type * \param[in] cic Circuit Identity Code (Classic A only) * \param[in] ss Socket Address of MSC-side RTP socket (AoIP only) * \param[in] scl Speech Codec List (AoIP only) * \param[in] ci Call Identifier (Optional), ?3.2.2.105 + * \param[in] kc Kc128 ciphering key (Optional, A5/4), ?3.2.2.109 + * \param[in] lcls Optional LCLS parameters * \returns callee-allocated msgb with BSSMAP Assignment Request message */ -struct msgb *gsm0808_create_ass(const struct gsm0808_channel_type *ct, - const uint16_t *cic, - const struct sockaddr_storage *ss, - const struct gsm0808_speech_codec_list *scl, - const uint32_t *ci) +struct msgb *gsm0808_create_ass2(const struct gsm0808_channel_type *ct, + const uint16_t *cic, + const struct sockaddr_storage *ss, + const struct gsm0808_speech_codec_list *scl, + const uint32_t *ci, + const uint8_t *kc, const struct osmo_lcls *lcls) { /* See also: 3GPP TS 48.008 3.2.1.1 ASSIGNMENT REQUEST */ struct msgb *msg; @@ -481,6 +485,27 @@ (uint8_t *) & ci_sw); } + if (kc) + msgb_tv_fixed_put(msg, GSM0808_IE_KC_128, 16, kc); + + if (lcls) { + /* LCLS: ?3.2.2.115 Global Call Reference */ + if (lcls->gcr) + gsm0808_enc_gcr(msg, lcls->gcr); + + /* LCLS: ?3.2.2.116 Configuration */ + if (lcls->config != GSM0808_LCLS_CFG_NA) + msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, lcls->config); + + /* LCLS: ?3.2.2.117 Connection Status Control */ + if (lcls->control != GSM0808_LCLS_CSC_NA) + msgb_tv_put(msg, GSM0808_IE_LCLS_CONN_STATUS_CTRL, lcls->control); + + /* LCLS: ?3.2.2.118 Correlation-Not-Needed */ + if (!lcls->corr_needed) + msgb_v_put(msg, GSM0808_IE_LCLS_CORR_NOT_NEEDED); + } + /* push the bssmap header */ msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); @@ -488,6 +513,22 @@ return msg; } +/*! Create BSSMAP Assignment Request message, 3GPP TS 48.008 ?3.2.1.1. + * \param[in] ct Channel Type + * \param[in] cic Circuit Identity Code (Classic A only) + * \param[in] ss Socket Address of MSC-side RTP socket (AoIP only) + * \param[in] scl Speech Codec List (AoIP only) + * \param[in] ci Call Identifier (Optional), ?3.2.2.105 + * \returns callee-allocated msgb with BSSMAP Assignment Request message */ +struct msgb *gsm0808_create_ass(const struct gsm0808_channel_type *ct, + const uint16_t *cic, + const struct sockaddr_storage *ss, + const struct gsm0808_speech_codec_list *scl, + const uint32_t *ci) +{ + return gsm0808_create_ass2(ct, cic, ss, scl, ci, NULL, NULL); +} + /*! Create BSSMAP Assignment Completed message * \param[in] rr_cause GSM 04.08 RR Cause value * \param[in] chosen_channel Chosen Channel diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 94ae76a..959d182 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -150,6 +150,7 @@ gsm0808_cause_name; gsm0808_cause_class_name; gsm0808_create_ass; +gsm0808_create_ass2; gsm0808_create_assignment_completed; gsm0808_create_ass_compl; gsm0808_create_assignment_failure; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index f0f3165..46169ea 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -415,6 +415,83 @@ msgb_free(msg); } +static void test_create_ass2() +{ + static const uint8_t res[] = { + BSSAP_MSG_BSS_MANAGEMENT, + 0x45, + BSS_MAP_MSG_ASSIGMENT_RQST, + GSM0808_IE_CHANNEL_TYPE, + 0x04, 0x01, 0x0b, 0x91, 0x15, 0x01, 0x00, 0x04, + GSM0808_IE_AOIP_TRASP_ADDR, + 0x06, + 0xac, 0x0c, 0x65, 0x0d, /* IPv4 */ + 0x02, 0x9a, + GSM0808_IE_SPEECH_CODEC_LIST, + 0x07, + GSM0808_SCT_FR3 | 0x50, + 0xef, 0xcd, + GSM0808_SCT_FR2 | 0xa0, + 0x9f, + GSM0808_SCT_CSD | 0x90, + 0xc0, + GSM0808_IE_CALL_ID, + 0xde, 0xad, 0xfa, 0xce, /* CallID */ + 0x83, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, /* Kc */ + GSM0808_IE_GLOBAL_CALL_REF, 0x0d, /* GCR, length */ + 0x03, 0x44, 0x44, 0x44, /* GCR, Net ID */ + 0x02, 0xfe, 0xed, /* GCR, Node ID */ + 0x05, 0x41, 0x41, 0x41, 0x41, 0x41, /* GCR, Call ref. ID */ + GSM0808_IE_LCLS_CONFIG, GSM0808_LCLS_CFG_BOTH_WAY, + GSM0808_IE_LCLS_CONN_STATUS_CTRL, GSM0808_LCLS_CSC_CONNECT, + GSM0808_IE_LCLS_CORR_NOT_NEEDED, + }; + struct msgb *msg; + struct gsm0808_channel_type ct; + uint16_t cic = 4; + struct sockaddr_storage ss; + struct sockaddr_in sin; + struct gsm0808_speech_codec_list sc_list; + uint32_t call_id = 0xDEADFACE; + struct osmo_gcr_parsed gcr = { .net_len = 3, .node = 0xFEED }; + uint8_t Kc[16]; + struct osmo_lcls lcls = { + .config = GSM0808_LCLS_CFG_BOTH_WAY, + .control = GSM0808_LCLS_CSC_CONNECT, + .gcr = &gcr, + .corr_needed = false + }; + + memset(gcr.cr, 'A', 5); + memset(gcr.net, 'D', gcr.net_len); + memset(Kc, 'E', 16); + + memset(&ct, 0, sizeof(ct)); + ct.ch_indctr = GSM0808_CHAN_SPEECH; + ct.ch_rate_type = GSM0808_SPEECH_HALF_PREF; + ct.perm_spch[0] = GSM0808_PERM_FR2; + ct.perm_spch[1] = GSM0808_PERM_HR2; + ct.perm_spch_len = 2; + + memset(&sin, 0, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_port = htons(666); + inet_aton("172.12.101.13", &sin.sin_addr); /* IPv4 */ + + memset(&ss, 0, sizeof(ss)); + memcpy(&ss, &sin, sizeof(sin)); + + setup_codec_list(&sc_list); + + printf("Testing creating Assignment Request with Kc and LCLS\n"); + + msg = gsm0808_create_ass2(&ct, &cic, &ss, &sc_list, &call_id, Kc, &lcls); + if (!msgb_eq_l3_data_print(msg, res, ARRAY_SIZE(res))) + abort(); + + msgb_free(msg); +} + static void test_create_ass_compl() { static const uint8_t res1[] = { @@ -1880,6 +1957,7 @@ test_create_cm_u(); test_create_sapi_reject(); test_create_ass(); + test_create_ass2(); test_create_ass_compl(); test_create_ass_compl_aoip(); test_create_ass_fail(); diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index d5857e3..8e6d262 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -14,6 +14,7 @@ Testing creating CM U Testing creating SAPI Reject Testing creating Assignment Request +Testing creating Assignment Request with Kc and LCLS Testing creating Assignment Complete Testing creating Assignment Complete (AoIP) Testing creating Assignment Failure -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 30 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:15:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 13:15:44 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 5: (9 comments) https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc at 509 PS4, Line 509: Direction: MSC / SGSN => SMSC (via HLR) > (a nicer term is "via", not "through" ... [?] Done https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc at 541 PS4, Line 541: MO short message delivery. The corresponding MAP service is > I still think it is really irritating to explain the same abbreviations over and over. [?] Done https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc at 578 PS4, Line 578: see 3GPP TS 29.002, section 12.9. > MT from glossary Done https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc at 579 PS4, Line 579: > and I still don't like this. [?] Done https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc at 1122 PS4, Line 1122: |=== > I don't like the "nested" in here. See https://gerrit.osmocom. [?] Done https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc at 1139 PS4, Line 1139: |=== > "Special"? What does it mean? If it has no meaning, does it even need encoding? Keep apart the inner [?] Done https://gerrit.osmocom.org/#/c/11836/4/common/chapters/gsup.adoc at 1143 PS4, Line 1143: > This is also "Special"? Rather just say what it means, or that it is reserved for purpose X = must n [?] Done https://gerrit.osmocom.org/#/c/11836/5/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11836/5/common/chapters/gsup.adoc at 1093 PS5, Line 1093: relay sub-layer protocol. It can be either of the following: > "Either" implies that there are only two options. "Either" is used in the specs., see 7.6.8.1. I'll change anyway. https://gerrit.osmocom.org/#/c/11836/5/common/chapters/gsup.adoc at 1168 PS5, Line 1168: should keep RAN the connection open. See 3GPP TS 29.002, section 7.6.8.7. > I'm having trouble understanding this part: [?] You're right. Thanks. -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Fri, 14 Dec 2018 13:15:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:17:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 13:17:38 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11836 to look at the new patch set (#6). Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... chapters/gsup.adoc: document MO-/MT-forwardSM messages Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Related Change-Id: (core) Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Related Change-Id: (TTCN) Ibf49474a81235096c032ea21f217170f523bd94e Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 214 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/36/11836/6 -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:17:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 13:17:38 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Hello Stefan Sperling, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11837 to look at the new patch set (#7). Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... chapters/gsup.adoc: document READY-FOR-SM message Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Related Change-Id: (core) Ic37f3b2114b8095cfce22977e67133b9103942e3 Related Change-Id: (TTCN) If2256607527ecfcb10285583332fb8b0515d7c78 Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/37/11837/7 -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:21:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 13:21:10 +0000 Subject: Change in osmo-hlr[master]: gsupclient: add osmo_gsup_msg_enc_send() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: add osmo_gsup_msg_enc_send() ...................................................................... Patch Set 4: (3 comments) https://gerrit.osmocom.org/#/c/11989/4/src/gsupclient/gsup_client.c File src/gsupclient/gsup_client.c: https://gerrit.osmocom.org/#/c/11989/4/src/gsupclient/gsup_client.c at 366 PS4, Line 366: * \returns 0 in case of success, otherwise errno > Errno is positive and we return negative I believe - better state that explicitly. Ok. https://gerrit.osmocom.org/#/c/11989/4/src/gsupclient/gsup_client.c at 381 PS4, Line 381: if (rc) { > to make reading code easier. Easier? I don't think the current version is complicated. https://gerrit.osmocom.org/#/c/11989/4/src/gsupclient/gsup_client.c at 387 PS4, Line 387: if (rc) { > And here too. And here too. It's a common practice to expect 0 and nothing else. -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 13:21:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:22:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 13:22:08 +0000 Subject: Change in osmo-hlr[master]: gsupclient: add osmo_gsup_msg_enc_send() In-Reply-To: References: Message-ID: Hello Stefan Sperling, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11989 to look at the new patch set (#5). Change subject: gsupclient: add osmo_gsup_msg_enc_send() ...................................................................... gsupclient: add osmo_gsup_msg_enc_send() Several parts of OsmoMSC (e.g. GSM 04.11, 09.11, etc.) are dealing with GSUP message encoding and sending towards OsmoHLR. In order to avoid code duplication, let's have a shared function here. Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f --- M include/osmocom/gsupclient/gsup_client.h M src/gsupclient/gsup_client.c 2 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/89/11989/5 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:34:46 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 13:34:46 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11992 ) Change subject: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions ...................................................................... Patch Set 7: (3 comments) https://gerrit.osmocom.org/#/c/11992/7/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/#/c/11992/7/include/osmocom/msc/gsm_data.h at 188 PS7, Line 188: int ncss_guard_timeout; > Why do you use int in here? Same as mncc_guard_timeout. Integer is expected by libosmocore: void osmo_timer_schedule(struct osmo_timer_list *timer, int seconds, int microseconds); We can change it in a separate change. Not critical. https://gerrit.osmocom.org/#/c/11992/7/src/libmsc/gsm_09_11.c File src/libmsc/gsm_09_11.c: https://gerrit.osmocom.org/#/c/11992/7/src/libmsc/gsm_09_11.c at 477 PS7, Line 477: if (net->ncss_guard_timeout > 0) { > Seems like we always check ncss_guard_timeout > 0 Because it's optional. What's wrong with that? https://gerrit.osmocom.org/#/c/11992/7/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/11992/7/src/libmsc/msc_vty.c at 382 PS7, Line 382: "guard timer value (sec.), or 0 to disable\n") > So ncss_guard_timeout is always positive and fit into uint8_t. Please see my comment above. -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 13:34:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 13:47:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 13:47:10 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11991 ) Change subject: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE ...................................................................... Patch Set 4: > yeah, rather add an updated libosmocore api as in earlier comment Ideally, the new API should allow to specify optional Cause IE... I have no time to fight with libosmocore's GSM 04.80 API anymore. I was working on SS/USSD timeout feature just for fun. If anyone really needs this feature to be merged soon, feel free to dive into the freakish libosmocore's GSM 04.80 API. -- To view, visit https://gerrit.osmocom.org/11991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I89727354385b40e18732e8fd1d6c93f4463ade37 Gerrit-Change-Number: 11991 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 13:47:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 14:01:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 14:01:12 +0000 Subject: Change in osmo-trx[master]: lms: Fix build against LimeSuite > 18.10 In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12303 ) Change subject: lms: Fix build against LimeSuite > 18.10 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf500a5b39a857233f728c6a4316c00a99374556 Gerrit-Change-Number: 12303 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 14:01:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 14:22:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 14:22:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: actualize both GSUP_SM_RP_{DA|OA} Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12304 Change subject: library/GSUP_Types.ttcn: actualize both GSUP_SM_RP_{DA|OA} ...................................................................... library/GSUP_Types.ttcn: actualize both GSUP_SM_RP_{DA|OA} Both GSUP_SM_RP_{DA|OA} IE definitions have been merged before the reference implementation in libosmocore. Recently it was decided to use the following structure: IEI | IE length | ID type | ID encoded data (optional) instead of: IEI | IE length | ID type | ID length | ID encoded data (optional) so, let's remove ID length from both definitions. Change-Id: I001cec53a80028ff153db3d8b0318b298f2bd8c2 --- M library/GSUP_Types.ttcn 1 file changed, 2 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/12304/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index d16b4a5..6cc6dde 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -701,10 +701,8 @@ type record GSUP_SM_RP_DA { GSUP_SM_RP_ODA_IdType id_type, - uint8_t id_len, GSUP_SM_RP_DA_ID id_enc optional -} with { variant (id_len) "LENGTHTO(id_enc)" - variant (id_enc) "CROSSTAG( +} with { variant (id_enc) "CROSSTAG( imsi, id_type = OSMO_GSUP_SM_RP_ODA_ID_IMSI; msisdn, id_type = OSMO_GSUP_SM_RP_ODA_ID_MSISDN; smsc_addr, id_type = OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR; @@ -714,45 +712,37 @@ template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_IMSI(hexstring imsi) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_IMSI, - id_len := 0, /* overwritten */ id_enc := { imsi := imsi } } template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_IMSI(template hexstring imsi) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_IMSI, - id_len := ?, id_enc := { imsi := imsi } } template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_MSISDN(hexstring msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, - id_len := 0, /* overwritten */ id_enc := { msisdn := msisdn } } template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_MSISDN(template hexstring msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, - id_len := ?, id_enc := { msisdn := msisdn } } template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_SMSC_ADDR(hexstring smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, - id_len := 0, /* overwritten */ id_enc := { smsc_addr := smsc_addr } } template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_SMSC_ADDR(template hexstring smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, - id_len := ?, id_enc := { smsc_addr := smsc_addr } } template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_NULL := { id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL, - id_len := 0, /* overwritten */ id_enc := omit } template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_NULL := { id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL, - id_len := ?, id_enc := omit } @@ -784,10 +774,8 @@ type record GSUP_SM_RP_OA { GSUP_SM_RP_ODA_IdType id_type, - uint8_t id_len, GSUP_SM_RP_OA_ID id_enc optional -} with { variant (id_len) "LENGTHTO(id_enc)" - variant (id_enc) "CROSSTAG( +} with { variant (id_enc) "CROSSTAG( msisdn, id_type = OSMO_GSUP_SM_RP_ODA_ID_MSISDN; smsc_addr, id_type = OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR; /* FIXME: how to handle noSM-RP-OA? */ @@ -796,34 +784,28 @@ template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_MSISDN(hexstring msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, - id_len := 0, /* overwritten */ id_enc := { msisdn := msisdn } } template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_MSISDN(template hexstring msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, - id_len := ?, id_enc := { msisdn := msisdn } } template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_SMSC_ADDR(hexstring smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, - id_len := 0, /* overwritten */ id_enc := { smsc_addr := smsc_addr } } template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_SMSC_ADDR(template hexstring smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, - id_len := ?, id_enc := { smsc_addr := smsc_addr } } template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_NULL := { id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL, - id_len := 0, /* overwritten */ id_enc := omit } template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_NULL := { id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL, - id_len := ?, id_enc := omit } -- To view, visit https://gerrit.osmocom.org/12304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I001cec53a80028ff153db3d8b0318b298f2bd8c2 Gerrit-Change-Number: 12304 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 14:23:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 14 Dec 2018 14:23:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11924 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11924/4/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11924/4/msc/MSC_Tests.ttcn at 2158 PS4, Line 2158: sm_rp_da := valueof(ts_GSUP_SM_RP_DA_MSISDN(g_pars.msisdn)), > I still had reservations about OA,DA encoding in that libosmocore patch... Done, see https://gerrit.osmocom.org/#/c/osmo-ttcn3-hacks/+/12304/. -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Fri, 14 Dec 2018 14:23:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 14:29:43 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 14:29:43 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11992 ) Change subject: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/11992/7/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/#/c/11992/7/include/osmocom/msc/gsm_data.h at 188 PS7, Line 188: int ncss_guard_timeout; > Same as mncc_guard_timeout. Integer is expected by libosmocore: [?] If that's the only reason than it's better to use uint8_t (which can be casted to int without any issues) to keep it consistent with vty code. -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 14:29:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 14:35:28 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 14 Dec 2018 14:35:28 +0000 Subject: Change in osmo-trx[master]: lms: Fix build against LimeSuite > 18.10 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12303 ) Change subject: lms: Fix build against LimeSuite > 18.10 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf500a5b39a857233f728c6a4316c00a99374556 Gerrit-Change-Number: 12303 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 14 Dec 2018 14:35:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Dec 14 15:10:12 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 14 Dec 2018 15:10:12 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#339?= Message-ID: <1021380677.0.1544800212583.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.10 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Dec 14 15:12:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 15:12:14 +0000 Subject: Change in osmo-sysmon[master]: ctrl: make config structure public Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12316 Change subject: ctrl: make config structure public ...................................................................... ctrl: make config structure public Moving configuration data from anonymous struct into shared header as a preparation for ctrl logging improvements in follow-up patches. Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Related: SYS#2655 --- M src/osysmon_ctrl.c M src/simple_ctrl.h 2 files changed, 26 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/16/12316/1 diff --git a/src/osysmon_ctrl.c b/src/osysmon_ctrl.c index 25c2b4c..097e24c 100644 --- a/src/osysmon_ctrl.c +++ b/src/osysmon_ctrl.c @@ -38,14 +38,7 @@ struct ctrl_client { /* links to osysmon.ctrl_clients */ struct llist_head list; - struct { - /* name of this CTRL client */ - const char *name; - /* remote host/IP */ - const char *remote_host; - /* remote CTRL port */ - uint16_t remote_port; - } cfg; + struct ctrl_cfg *cfg; struct simple_ctrl_handle *sch; /* list of ctrl_client_get_var objects */ struct llist_head get_vars; @@ -69,7 +62,7 @@ { struct ctrl_client *cc; llist_for_each_entry(cc, &os->ctrl_clients, list) { - if (!strcmp(name, cc->cfg.name)) + if (!strcmp(name, cc->cfg->name)) return cc; } return NULL; @@ -86,9 +79,14 @@ cc = talloc_zero(os, struct ctrl_client); if (!cc) return NULL; - cc->cfg.name = talloc_strdup(cc, name); - cc->cfg.remote_host = talloc_strdup(cc, host); - cc->cfg.remote_port = port; + + cc->cfg = talloc_zero(cc, struct ctrl_cfg); + if (!cc->cfg) + return NULL; + + cc->cfg->name = talloc_strdup(cc, name); + cc->cfg->remote_host = talloc_strdup(cc, host); + cc->cfg->remote_port = port; INIT_LLIST_HEAD(&cc->get_vars); llist_add_tail(&cc->list, &os->ctrl_clients); /* FIXME */ @@ -163,10 +161,10 @@ struct ctrl_client *cc; cc = ctrl_client_find(g_oss, argv[0]); if (cc) { - if ((strcmp(cc->cfg.remote_host, argv[1])) || - (cc->cfg.remote_port != atoi(argv[2]))) { + if ((strcmp(cc->cfg->remote_host, argv[1])) || + (cc->cfg->remote_port != atoi(argv[2]))) { vty_out(vty, "Client %s has different IP/port, please remove it first%s", - cc->cfg.name, VTY_NEWLINE); + cc->cfg->name, VTY_NEWLINE); return CMD_WARNING; } } else @@ -222,8 +220,8 @@ static void write_one_ctrl_client(struct vty *vty, struct ctrl_client *cc) { struct ctrl_client_get_var *ccgv; - vty_out(vty, "ctrl-client %s %s %u%s", cc->cfg.name, - cc->cfg.remote_host, cc->cfg.remote_port, VTY_NEWLINE); + vty_out(vty, "ctrl-client %s %s %u%s", cc->cfg->name, + cc->cfg->remote_host, cc->cfg->remote_port, VTY_NEWLINE); llist_for_each_entry(ccgv, &cc->get_vars, list) { vty_out(vty, " get-variable %s%s", ccgv->cfg.name, VTY_NEWLINE); if (ccgv->cfg.display_name) @@ -266,11 +264,11 @@ static int ctrl_client_poll(struct ctrl_client *cc, struct value_node *parent) { struct ctrl_client_get_var *ccgv; - struct value_node *vn_clnt = value_node_add(parent, parent, cc->cfg.name, NULL); + struct value_node *vn_clnt = value_node_add(parent, parent, cc->cfg->name, NULL); /* attempt to re-connect */ if (!cc->sch) - cc->sch = simple_ctrl_open(cc, cc->cfg.remote_host, cc->cfg.remote_port, 1000); + cc->sch = simple_ctrl_open(cc, cc->cfg->remote_host, cc->cfg->remote_port, 1000); /* abort, if that failed */ if (!cc->sch) { return -1; diff --git a/src/simple_ctrl.h b/src/simple_ctrl.h index 81a759d..f5aa770 100644 --- a/src/simple_ctrl.h +++ b/src/simple_ctrl.h @@ -2,6 +2,15 @@ #include +struct ctrl_cfg { + /* name of this CTRL client */ + const char *name; + /* remote host/IP */ + const char *remote_host; + /* remote CTRL port */ + uint16_t remote_port; +}; + struct simple_ctrl_handle; struct simple_ctrl_handle *simple_ctrl_open(void *ctx, const char *host, uint16_t dport, -- To view, visit https://gerrit.osmocom.org/12316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Gerrit-Change-Number: 12316 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 15:12:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 15:12:15 +0000 Subject: Change in osmo-sysmon[master]: ctrl: pass config struct to all simple_ctrl_*() Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12317 Change subject: ctrl: pass config struct to all simple_ctrl_*() ...................................................................... ctrl: pass config struct to all simple_ctrl_*() Make basic logging-related information available to simple_ctrl_*() functions. Change-Id: I783dda27dfc5fd57401d971b2e970ede0efc7b2c Related: SYS#2655 --- M src/osmo-ctrl-client.c M src/osysmon_ctrl.c M src/simple_ctrl.c M src/simple_ctrl.h 4 files changed, 22 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/17/12317/1 diff --git a/src/osmo-ctrl-client.c b/src/osmo-ctrl-client.c index 83e9b7b..6a196eb 100644 --- a/src/osmo-ctrl-client.c +++ b/src/osmo-ctrl-client.c @@ -45,19 +45,18 @@ int main(int argc, char **argv) { struct simple_ctrl_handle *sch; - const char *host; - uint16_t port; + struct ctrl_cfg cfg = { .name = "osmo-ctrl-client" }; int rc; if (argc < 4) exit_help(); - host = argv[1]; - port = atoi(argv[2]); + cfg.remote_host = argv[1]; + cfg.remote_port = atoi(argv[2]); osmo_init_logging2(NULL, &log_info); - sch = simple_ctrl_open(NULL, host, port, 1000); + sch = simple_ctrl_open(NULL, &cfg, 1000); if (!sch) exit(1); @@ -65,20 +64,20 @@ char *val; if (argc < 5) exit_help(); - val = simple_ctrl_get(sch, argv[4]); + val = simple_ctrl_get(&cfg, sch, argv[4]); if (!val) exit(2); printf("%s\n", val); } else if (!strcmp(argv[3], "set")) { if (argc < 6) exit_help(); - rc = simple_ctrl_set(sch, argv[4], argv[5]); + rc = simple_ctrl_set(&cfg, sch, argv[4], argv[5]); if (rc < 0) exit(1); } else if (!strcmp(argv[3], "monitor")) { simple_ctrl_set_timeout(sch, 0); while (true) { - struct msgb *msg = simple_ctrl_receive(sch); + struct msgb *msg = simple_ctrl_receive(&cfg, sch); if (!msg) exit(1); printf("%s", (char *) msgb_l2(msg)); diff --git a/src/osysmon_ctrl.c b/src/osysmon_ctrl.c index 097e24c..bcab94c 100644 --- a/src/osysmon_ctrl.c +++ b/src/osysmon_ctrl.c @@ -268,14 +268,14 @@ /* attempt to re-connect */ if (!cc->sch) - cc->sch = simple_ctrl_open(cc, cc->cfg->remote_host, cc->cfg->remote_port, 1000); + cc->sch = simple_ctrl_open(cc, cc->cfg, 1000); /* abort, if that failed */ if (!cc->sch) { return -1; } llist_for_each_entry(ccgv, &cc->get_vars, list) { - char *value = simple_ctrl_get(cc->sch, ccgv->cfg.name); + char *value = simple_ctrl_get(cc->cfg, cc->sch, ccgv->cfg.name); /* FIXME: Distinguish between ERROR reply and * connection issues */ diff --git a/src/simple_ctrl.c b/src/simple_ctrl.c index 2261323..24d92b9 100644 --- a/src/simple_ctrl.c +++ b/src/simple_ctrl.c @@ -100,15 +100,14 @@ uint32_t tout_msec; }; -struct simple_ctrl_handle *simple_ctrl_open(void *ctx, const char *host, uint16_t dport, - uint32_t tout_msec) +struct simple_ctrl_handle *simple_ctrl_open(void *ctx, const struct ctrl_cfg *cfg, uint32_t tout_msec) { struct simple_ctrl_handle *sch; fd_set writeset; int off = 0; int rc, fd; - fd = osmo_sock_init(AF_INET, SOCK_STREAM, IPPROTO_TCP, host, dport, + fd = osmo_sock_init(AF_INET, SOCK_STREAM, IPPROTO_TCP, cfg->remote_host, cfg->remote_port, OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK); if (fd < 0) { fprintf(stderr, "CTRL: error connecting socket: %s\n", strerror(errno)); @@ -191,7 +190,7 @@ return resp; } -struct msgb *simple_ctrl_receive(struct simple_ctrl_handle *sch) +struct msgb *simple_ctrl_receive(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch) { struct msgb *resp; struct ipaccess_head *ih; @@ -241,7 +240,7 @@ } } -static struct msgb *simple_ctrl_xceive(struct simple_ctrl_handle *sch, struct msgb *msg) +static struct msgb *simple_ctrl_xceive(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch, struct msgb *msg) { int rc; @@ -250,10 +249,10 @@ return NULL; /* FIXME: ignore any TRAP */ - return simple_ctrl_receive(sch); + return simple_ctrl_receive(cfg, sch); } -char *simple_ctrl_get(struct simple_ctrl_handle *sch, const char *var) +char *simple_ctrl_get(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch, const char *var) { struct msgb *msg = msgb_alloc_headroom(512+8, 8, "CTRL GET"); struct msgb *resp; @@ -269,7 +268,7 @@ msgb_free(msg); return NULL; } - resp = simple_ctrl_xceive(sch, msg); + resp = simple_ctrl_xceive(cfg, sch, msg); if (!resp) return NULL; @@ -290,7 +289,7 @@ return NULL; } -int simple_ctrl_set(struct simple_ctrl_handle *sch, const char *var, const char *val) +int simple_ctrl_set(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch, const char *var, const char *val) { struct msgb *msg = msgb_alloc_headroom(512+8, 8, "CTRL SET"); struct msgb *resp; @@ -306,7 +305,7 @@ msgb_free(msg); return -1; } - resp = simple_ctrl_xceive(sch, msg); + resp = simple_ctrl_xceive(cfg, sch, msg); if (!resp) return -1; diff --git a/src/simple_ctrl.h b/src/simple_ctrl.h index f5aa770..b320fb8 100644 --- a/src/simple_ctrl.h +++ b/src/simple_ctrl.h @@ -13,13 +13,12 @@ struct simple_ctrl_handle; -struct simple_ctrl_handle *simple_ctrl_open(void *ctx, const char *host, uint16_t dport, - uint32_t tout_msec); +struct simple_ctrl_handle *simple_ctrl_open(void *ctx, const struct ctrl_cfg *cfg, uint32_t tout_msec); void simple_ctrl_close(struct simple_ctrl_handle *sch); void simple_ctrl_set_timeout(struct simple_ctrl_handle *sch, uint32_t tout_msec); -struct msgb *simple_ctrl_receive(struct simple_ctrl_handle *sch); +struct msgb *simple_ctrl_receive(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch); -char *simple_ctrl_get(struct simple_ctrl_handle *sch, const char *var); -int simple_ctrl_set(struct simple_ctrl_handle *sch, const char *var, const char *val); +char *simple_ctrl_get(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch, const char *var); +int simple_ctrl_set(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch, const char *var, const char *val); -- To view, visit https://gerrit.osmocom.org/12317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I783dda27dfc5fd57401d971b2e970ede0efc7b2c Gerrit-Change-Number: 12317 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 15:12:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 15:12:15 +0000 Subject: Change in osmo-sysmon[master]: ctrl: log host/port on errors Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12318 Change subject: ctrl: log host/port on errors ...................................................................... ctrl: log host/port on errors In case of multiple ctrl-client entries in .cfg file it's impossible to see which one is causing particular ctrl error. Fix this by introducing macro wrapper for stderr logging which always show host:port relevant to the error. Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Related: SYS#2655 --- M src/simple_ctrl.c 1 file changed, 18 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/18/12318/1 diff --git a/src/simple_ctrl.c b/src/simple_ctrl.c index 24d92b9..433f3bf 100644 --- a/src/simple_ctrl.c +++ b/src/simple_ctrl.c @@ -37,6 +37,8 @@ #include "simple_ctrl.h" +#define CTRL_ERR(c, fmt, args...) fprintf(stderr, "CTRL %s:%u error: " fmt "\n", c->remote_host, c->remote_port, ##args) + /*********************************************************************** * blocking I/O with timeout helpers ***********************************************************************/ @@ -110,7 +112,7 @@ fd = osmo_sock_init(AF_INET, SOCK_STREAM, IPPROTO_TCP, cfg->remote_host, cfg->remote_port, OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK); if (fd < 0) { - fprintf(stderr, "CTRL: error connecting socket: %s\n", strerror(errno)); + CTRL_ERR(cfg, "connecting socket: %s", strerror(errno)); return NULL; } @@ -119,17 +121,17 @@ FD_SET(fd, &writeset); rc = select(fd+1, NULL, &writeset, NULL, timeval_from_msec(tout_msec)); if (rc == 0) { - fprintf(stderr, "CTRL: timeout during connect\n"); + CTRL_ERR(cfg, "timeout during connect"); goto out_close; } if (rc < 0) { - fprintf(stderr, "CTRL: error connecting socket: %s\n", strerror(errno)); + CTRL_ERR(cfg, "error connecting socket: %s", strerror(errno)); goto out_close; } /* set FD blocking again */ if (ioctl(fd, FIONBIO, (unsigned char *)&off) < 0) { - fprintf(stderr, "CTRL: cannot set socket blocking: %s\n", strerror(errno)); + CTRL_ERR(cfg, "cannot set socket blocking: %s", strerror(errno)); goto out_close; } @@ -156,7 +158,7 @@ talloc_free(sch); } -static struct msgb *simple_ipa_receive(struct simple_ctrl_handle *sch) +static struct msgb *simple_ipa_receive(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch) { struct ipaccess_head hh; struct msgb *resp; @@ -164,10 +166,10 @@ rc = read_timeout(sch->fd, (uint8_t *) &hh, sizeof(hh), sch->tout_msec); if (rc < 0) { - fprintf(stderr, "CTRL: Error during read: %d\n", rc); + CTRL_ERR(cfg, "read(): %d", rc); return NULL; } else if (rc < sizeof(hh)) { - fprintf(stderr, "CTRL: ERROR: short read (header)\n"); + CTRL_ERR(cfg, "short read (header)"); return NULL; } len = ntohs(hh.len); @@ -181,7 +183,7 @@ resp->l2h = resp->tail; rc = read(sch->fd, resp->l2h, len); if (rc < len) { - fprintf(stderr, "CTRL: ERROR: short read (payload)\n"); + CTRL_ERR(cfg, "short read (payload)"); msgb_free(resp); return NULL; } @@ -199,7 +201,7 @@ /* loop until we've received a CTRL message */ while (true) { - resp = simple_ipa_receive(sch); + resp = simple_ipa_receive(cfg, sch); if (!resp) return NULL; @@ -213,13 +215,13 @@ *tmp = '\0'; return resp; } else { - fprintf(stderr, "unknown IPA message %s\n", msgb_hexdump(resp)); + CTRL_ERR(cfg, "unknown IPA message %s", msgb_hexdump(resp)); msgb_free(resp); } } } -static int simple_ctrl_send(struct simple_ctrl_handle *sch, struct msgb *msg) +static int simple_ctrl_send(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch, struct msgb *msg) { int rc; @@ -228,10 +230,10 @@ rc = write_timeout(sch->fd, msg->data, msg->len, sch->tout_msec); if (rc < 0) { - fprintf(stderr, "CTRL: Error during write: %d\n", rc); + CTRL_ERR(cfg, "write(): %d", rc); return rc; } else if (rc < msg->len) { - fprintf(stderr, "CTRL: ERROR: short write\n"); + CTRL_ERR(cfg, "short write"); msgb_free(msg); return -1; } else { @@ -244,7 +246,7 @@ { int rc; - rc = simple_ctrl_send(sch, msg); + rc = simple_ctrl_send(cfg, sch, msg); if (rc < 0) return NULL; @@ -282,7 +284,7 @@ free(rx_var); free(rx_val); } else { - fprintf(stderr, "CTRL: ERROR: GET(%s) results in '%s'\n", var, (char *)msgb_l2(resp)); + CTRL_ERR(cfg, "GET(%s) results in '%s'", var, (char *)msgb_l2(resp)); } msgb_free(resp); @@ -320,7 +322,7 @@ free(rx_var); } } else { - fprintf(stderr, "CTRL: ERROR: SET(%s=%s) results in '%s'\n", var, val, (char *) msgb_l2(resp)); + CTRL_ERR(cfg, "SET(%s=%s) results in '%s'", var, val, (char *) msgb_l2(resp)); } msgb_free(resp); -- To view, visit https://gerrit.osmocom.org/12318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Gerrit-Change-Number: 12318 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 15:12:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 14 Dec 2018 15:12:54 +0000 Subject: Change in osmo-trx[master]: lms: Fix build against LimeSuite > 18.10 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12303 ) Change subject: lms: Fix build against LimeSuite > 18.10 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf500a5b39a857233f728c6a4316c00a99374556 Gerrit-Change-Number: 12303 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 14 Dec 2018 15:12:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 15:12:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 14 Dec 2018 15:12:56 +0000 Subject: Change in osmo-trx[master]: lms: Fix build against LimeSuite > 18.10 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12303 ) Change subject: lms: Fix build against LimeSuite > 18.10 ...................................................................... lms: Fix build against LimeSuite > 18.10 LimeSuite dc124e4e2ed9b549b142410af172f0592f9f0c23 > 18.10 broke API compatibility. OS#3729 Change-Id: Idf500a5b39a857233f728c6a4316c00a99374556 --- M Transceiver52M/device/lms/LMSDevice.cpp M configure.ac 2 files changed, 34 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 270bd4a..b004308 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -41,6 +41,24 @@ #define LMS_MIN_BW_SUPPORTED 2.5e6 /* 2.5mHz, minimum supported by LMS */ #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED) +static int compat_LMS_VCTCXORead(lms_device_t *dev, uint16_t *val, bool memory) +{ +#if HAVE_LMS_VCTCXO_EEPROM_SAVING + return LMS_VCTCXORead(dev, val, memory); +#else + return LMS_VCTCXORead(dev, val); +#endif +} + +static int compat_LMS_VCTCXOWrite(lms_device_t *dev, uint16_t val, bool memory) +{ +#if HAVE_LMS_VCTCXO_EEPROM_SAVING + return LMS_VCTCXOWrite(dev, val, memory); +#else + return LMS_VCTCXOWrite(dev, val); +#endif +} + LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset, const std::vector& tx_paths, const std::vector& rx_paths): @@ -195,10 +213,10 @@ case REF_INTERNAL: LOGC(DDEV, INFO) << "Setting Internal clock reference"; /* Ugly API: Selecting clock source implicit by writing to VCTCXO DAC ?!? */ - if (LMS_VCTCXORead(m_lms_dev, &dac_val) < 0) + if (compat_LMS_VCTCXORead(m_lms_dev, &dac_val, false) < 0) goto out_close; LOGC(DDEV, INFO) << "Setting VCTCXO to " << dac_val; - if (LMS_VCTCXOWrite(m_lms_dev, dac_val) < 0) + if (compat_LMS_VCTCXOWrite(m_lms_dev, dac_val, false) < 0) goto out_close; break; case REF_EXTERNAL: diff --git a/configure.ac b/configure.ac index 2e036ba..37b70fa 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,20 @@ AS_IF([test "x$with_lms" = "xyes"], [ PKG_CHECK_MODULES(LMS, LimeSuite) + + # LimeSuite dc124e4e2ed9b549b142410af172f0592f9f0c23 > 18.10 broke API compatibility: + _cflags_save=$CFLAGS + CFLAGS="$CFLAGS $LMS_CFLAGS" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[LMS_VCTCXOWrite(NULL, 0, false); LMS_VCTCXORead(NULL, 0, false);]] + )], + [AC_DEFINE([HAVE_LMS_VCTCXO_EEPROM_SAVING], [1], + [LMS_VCTCXO* requires memory parameter])], + [AC_DEFINE([HAVE_LMS_VCTCXO_EEPROM_SAVING], [0], + [LMS_VCTCXO* has no memory parameter])]) + CFLAGS=$_cflags_save ]) AS_IF([test "x$with_uhd" != "xno"],[ -- To view, visit https://gerrit.osmocom.org/12303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idf500a5b39a857233f728c6a4316c00a99374556 Gerrit-Change-Number: 12303 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 15:15:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 14 Dec 2018 15:15:15 +0000 Subject: Change in osmo-sysmon[master]: ctrl: pass config struct to all simple_ctrl_*() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12317 ) Change subject: ctrl: pass config struct to all simple_ctrl_*() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12317/1/src/simple_ctrl.c File src/simple_ctrl.c: https://gerrit.osmocom.org/#/c/12317/1/src/simple_ctrl.c at 243 PS1, Line 243: const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch I'm sorry, but this is absolutely not an improvement to me. If you need the config from the handle, make the handle point to the config. Adding one extra argument to almost each function in the entire module is not an improvement. -- To view, visit https://gerrit.osmocom.org/12317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I783dda27dfc5fd57401d971b2e970ede0efc7b2c Gerrit-Change-Number: 12317 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 14 Dec 2018 15:15:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 15:17:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 14 Dec 2018 15:17:16 +0000 Subject: Change in osmo-sysmon[master]: ctrl: log host/port on errors In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12318 ) Change subject: ctrl: log host/port on errors ...................................................................... Patch Set 1: Code-Review-1 I feel this entire patchset breaks layering. The simple_ctrl_client doesnt have a configuration. the configuration is part of the main program. but now you're passing the configuration around everywhere, adding additional arguments to the functions, making them introspect somethin that's not theirs. -- To view, visit https://gerrit.osmocom.org/12318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Gerrit-Change-Number: 12318 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 14 Dec 2018 15:17:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 15:18:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 14 Dec 2018 15:18:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: actualize both GSUP_SM_RP_{DA|OA} In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12304 ) Change subject: library/GSUP_Types.ttcn: actualize both GSUP_SM_RP_{DA|OA} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I001cec53a80028ff153db3d8b0318b298f2bd8c2 Gerrit-Change-Number: 12304 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 14 Dec 2018 15:18:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 15:20:39 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 15:20:39 +0000 Subject: Change in osmo-sysmon[master]: ctrl: log host/port on errors In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12318 ) Change subject: ctrl: log host/port on errors ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-1 > > I feel this entire patchset breaks layering. The simple_ctrl_client doesnt have a configuration. the configuration is part of the main program. but now you're passing the configuration around everywhere, adding additional arguments to the functions, making them introspect somethin that's not theirs. What would be the right approach to make host:port available for logging than? -- To view, visit https://gerrit.osmocom.org/12318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Gerrit-Change-Number: 12318 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 14 Dec 2018 15:20:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 15:46:05 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 15:46:05 +0000 Subject: Change in osmo-sysmon[master]: Use absolute path for default config Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12319 Change subject: Use absolute path for default config ...................................................................... Use absolute path for default config Change-Id: I37c559af99872de9290335699e2118924ae2156a Related: SYS#2655 --- M src/osysmon_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/19/12319/1 diff --git a/src/osysmon_main.c b/src/osysmon_main.c index 486ee8f..caa25d8 100644 --- a/src/osysmon_main.c +++ b/src/osysmon_main.c @@ -130,7 +130,7 @@ const char *config_file; bool daemonize; } cmdline_opts = { - .config_file = "osmo-sysmon.cfg", + .config_file = "/etc/osmocom/osmo-sysmon.cfg", .daemonize = false, }; -- To view, visit https://gerrit.osmocom.org/12319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I37c559af99872de9290335699e2118924ae2156a Gerrit-Change-Number: 12319 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 15:55:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Dec 2018 15:55:43 +0000 Subject: Change in osmo-sysmon[master]: Use absolute path for default config In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12319 ) Change subject: Use absolute path for default config ...................................................................... Patch Set 1: Code-Review-1 As far as I can tell, in all repos we have default cfg_file as $CWD/*.cfg, so I'd rather keep same behavior for all osmocom projects. Another discussion is whether we want to move all osmocom projects to have /etc/osmocom/*.cfg by default. It'd then make sense to by default check first $CWD and if not found look for /etc/osmocom, to maintain it backwards-compatible. -- To view, visit https://gerrit.osmocom.org/12319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37c559af99872de9290335699e2118924ae2156a Gerrit-Change-Number: 12319 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Dec 2018 15:55:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 15:58:42 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 14 Dec 2018 15:58:42 +0000 Subject: Change in osmo-sysmon[master]: Use absolute path for default config In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12319 ) Change subject: Use absolute path for default config ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-1 > > As far as I can tell, in all repos we have default cfg_file as $CWD/*.cfg, so I'd rather keep same behavior for all osmocom projects. > > Another discussion is whether we want to move all osmocom projects to have /etc/osmocom/*.cfg by default. It'd then make sense to by default check first $CWD and if not found look for /etc/osmocom, to maintain it backwards-compatible. The plan is to use this as login shell and I'm not sure what's $CWD in this case so it's better to use absolute path. -- To view, visit https://gerrit.osmocom.org/12319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37c559af99872de9290335699e2118924ae2156a Gerrit-Change-Number: 12319 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Dec 2018 15:58:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 16:00:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Dec 2018 16:00:41 +0000 Subject: Change in osmo-sysmon[master]: Use absolute path for default config In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12319 ) Change subject: Use absolute path for default config ...................................................................... Patch Set 1: > > Patch Set 1: Code-Review-1 > > > > As far as I can tell, in all repos we have default cfg_file as > $CWD/*.cfg, so I'd rather keep same behavior for all osmocom > projects. > > > > Another discussion is whether we want to move all osmocom > projects to have /etc/osmocom/*.cfg by default. It'd then make > sense to by default check first $CWD and if not found look for > /etc/osmocom, to maintain it backwards-compatible. > > The plan is to use this as login shell and I'm not sure what's $CWD > in this case so it's better to use absolute path. Login shell has already been added through a script, so no issue with that. Let's keep the default file like in all other osmocom projects. -- To view, visit https://gerrit.osmocom.org/12319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37c559af99872de9290335699e2118924ae2156a Gerrit-Change-Number: 12319 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Dec 2018 16:00:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 16:38:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Dec 2018 16:38:13 +0000 Subject: Change in osmo-trx[master]: configure.ac: check boost only if USRP1 support is enabled In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12088 ) Change subject: configure.ac: check boost only if USRP1 support is enabled ...................................................................... Patch Set 1: ping for +2 -- To view, visit https://gerrit.osmocom.org/12088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4c3fa3ff58fd552d0cb4c4cf2033615d84c07c96 Gerrit-Change-Number: 12088 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 14 Dec 2018 16:38:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 16:38:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Dec 2018 16:38:21 +0000 Subject: Change in osmo-bsc[master]: Add VTY option to avoid sending empty Full BCCH Info for disabled SI In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12133 ) Change subject: Add VTY option to avoid sending empty Full BCCH Info for disabled SI ...................................................................... Patch Set 3: ping for +2 -- To view, visit https://gerrit.osmocom.org/12133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 Gerrit-Change-Number: 12133 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 16:38:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 16:38:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 14 Dec 2018 16:38:31 +0000 Subject: Change in osmo-bts[master]: rsl: Send PDCH ACT NACK if TCH chan is still active In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12180 ) Change subject: rsl: Send PDCH ACT NACK if TCH chan is still active ...................................................................... Patch Set 1: ping for +2 -- To view, visit https://gerrit.osmocom.org/12180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d Gerrit-Change-Number: 12180 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 14 Dec 2018 16:38:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Dec 14 20:00:06 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Dec 2018 20:00:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c140be4a8a50_2c2a9166801078a8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 223s] ../../Transceiver52M/device/lms/.libs/libdevice.a(LMSDevice.o): In function `compat_LMS_VCTCXOWrite': [ 223s] ./Transceiver52M/device/lms/LMSDevice.cpp:58: undefined reference to `LMS_VCTCXOWrite' [ 223s] collect2: error: ld returned 1 exit status [ 223s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 223s] make[4]: *** [LMSDeviceTest] Error 1 [ 223s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 223s] Makefile:401: recipe for target 'all-recursive' failed [ 223s] make[3]: *** [all-recursive] Error 1 [ 223s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 223s] Makefile:516: recipe for target 'all-recursive' failed [ 223s] make[2]: *** [all-recursive] Error 1 [ 223s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 223s] Makefile:447: recipe for target 'all' failed [ 223s] make[1]: *** [all] Error 2 [ 223s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 223s] dh_auto_build: make -j1 returned exit code 2 [ 223s] debian/rules:6: recipe for target 'build' failed [ 223s] make: *** [build] Error 2 [ 223s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 223s] [ 223s] lamb26 failed "build osmo-trx_0.4.0.122.03b1.dsc" at Fri Dec 14 19:59:48 UTC 2018. [ 223s] [ 223s] ### VM INTERACTION START ### [ 226s] [ 213.190271] sysrq: SysRq : Power Off [ 226s] [ 213.206949] reboot: Power down [ 227s] ### VM INTERACTION END ### [ 227s] [ 227s] lamb26 failed "build osmo-trx_0.4.0.122.03b1.dsc" at Fri Dec 14 19:59:52 UTC 2018. [ 227s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Dec 14 20:00:40 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Dec 2018 20:00:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c140c035cd4b_2c2a91668010799f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 188s] /usr/src/packages/BUILD/Transceiver52M/device/lms/LMSDevice.cpp:259: undefined reference to `LMS_Calibrate' [ 188s] /usr/src/packages/BUILD/Transceiver52M/device/lms/LMSDevice.cpp:252: undefined reference to `LMS_SetLPFBW' [ 188s] collect2: error: ld returned 1 exit status [ 188s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 188s] make[4]: *** [LMSDeviceTest] Error 1 [ 188s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 188s] Makefile:401: recipe for target 'all-recursive' failed [ 188s] make[3]: *** [all-recursive] Error 1 [ 188s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 188s] Makefile:516: recipe for target 'all-recursive' failed [ 188s] make[2]: *** [all-recursive] Error 1 [ 188s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 188s] Makefile:447: recipe for target 'all' failed [ 188s] make[1]: *** [all] Error 2 [ 188s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 188s] dh_auto_build: make -j1 returned exit code 2 [ 188s] debian/rules:6: recipe for target 'build' failed [ 188s] make: *** [build] Error 2 [ 188s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 188s] [ 188s] lamb12 failed "build osmo-trx_0.4.0.122.03b1.dsc" at Fri Dec 14 20:00:22 UTC 2018. [ 188s] [ 188s] ### VM INTERACTION START ### [ 191s] [ 179.137670] sysrq: SysRq : Power Off [ 191s] [ 179.158000] reboot: Power down [ 191s] ### VM INTERACTION END ### [ 191s] [ 191s] lamb12 failed "build osmo-trx_0.4.0.122.03b1.dsc" at Fri Dec 14 20:00:26 UTC 2018. [ 191s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Dec 14 20:01:32 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Dec 2018 20:01:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c140c22e2569_2c2a9166801080b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 282s] ../../Transceiver52M/device/lms/.libs/libdevice.a(LMSDevice.o): In function `compat_LMS_VCTCXOWrite': [ 282s] ./Transceiver52M/device/lms/LMSDevice.cpp:58: undefined reference to `LMS_VCTCXOWrite' [ 282s] collect2: error: ld returned 1 exit status [ 282s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 282s] make[4]: *** [LMSDeviceTest] Error 1 [ 282s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 282s] Makefile:401: recipe for target 'all-recursive' failed [ 282s] make[3]: *** [all-recursive] Error 1 [ 282s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 282s] Makefile:516: recipe for target 'all-recursive' failed [ 282s] make[2]: *** [all-recursive] Error 1 [ 282s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 282s] Makefile:447: recipe for target 'all' failed [ 282s] make[1]: *** [all] Error 2 [ 282s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 282s] dh_auto_build: make -j1 returned exit code 2 [ 282s] debian/rules:6: recipe for target 'build' failed [ 282s] make: *** [build] Error 2 [ 282s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 282s] [ 282s] lamb55 failed "build osmo-trx_0.4.0.122.03b1.dsc" at Fri Dec 14 20:01:21 UTC 2018. [ 282s] [ 282s] ### VM INTERACTION START ### [ 286s] [ 272.892957] sysrq: SysRq : Power Off [ 286s] [ 272.927186] reboot: Power down [ 286s] ### VM INTERACTION END ### [ 286s] [ 286s] lamb55 failed "build osmo-trx_0.4.0.122.03b1.dsc" at Fri Dec 14 20:01:25 UTC 2018. [ 286s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Dec 14 20:02:23 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Dec 2018 20:02:23 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5c140c5f763ca_2c2a916680108195@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 283s] ../../Transceiver52M/device/lms/.libs/libdevice.a(LMSDevice.o): In function `compat_LMS_VCTCXOWrite': [ 283s] ./Transceiver52M/device/lms/LMSDevice.cpp:58: undefined reference to `LMS_VCTCXOWrite' [ 283s] collect2: error: ld returned 1 exit status [ 283s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 283s] make[4]: *** [LMSDeviceTest] Error 1 [ 283s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 283s] Makefile:401: recipe for target 'all-recursive' failed [ 283s] make[3]: *** [all-recursive] Error 1 [ 283s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 283s] Makefile:516: recipe for target 'all-recursive' failed [ 283s] make[2]: *** [all-recursive] Error 1 [ 283s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 283s] Makefile:447: recipe for target 'all' failed [ 283s] make[1]: *** [all] Error 2 [ 283s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 283s] dh_auto_build: make -j1 returned exit code 2 [ 283s] debian/rules:6: recipe for target 'build' failed [ 283s] make: *** [build] Error 2 [ 283s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 283s] [ 283s] cloud108 failed "build osmo-trx_0.4.0.122.03b1.dsc" at Fri Dec 14 20:02:03 UTC 2018. [ 283s] [ 283s] ### VM INTERACTION START ### [ 286s] [ 263.267717] sysrq: SysRq : Power Off [ 286s] [ 263.284803] reboot: Power down [ 288s] ### VM INTERACTION END ### [ 289s] [ 289s] cloud108 failed "build osmo-trx_0.4.0.122.03b1.dsc" at Fri Dec 14 20:02:09 UTC 2018. [ 289s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Dec 14 20:02:57 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Dec 2018 20:02:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5c140c7ce7999_2c2a9166801083a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 255s] ../../Transceiver52M/device/lms/.libs/libdevice.a(LMSDevice.o): In function `compat_LMS_VCTCXOWrite': [ 255s] ./Transceiver52M/device/lms/LMSDevice.cpp:58: undefined reference to `LMS_VCTCXOWrite' [ 255s] collect2: error: ld returned 1 exit status [ 255s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 255s] make[4]: *** [LMSDeviceTest] Error 1 [ 255s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 255s] Makefile:401: recipe for target 'all-recursive' failed [ 255s] make[3]: *** [all-recursive] Error 1 [ 255s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 255s] Makefile:516: recipe for target 'all-recursive' failed [ 255s] make[2]: *** [all-recursive] Error 1 [ 255s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 255s] Makefile:447: recipe for target 'all' failed [ 255s] make[1]: *** [all] Error 2 [ 255s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 255s] dh_auto_build: make -j1 returned exit code 2 [ 255s] debian/rules:6: recipe for target 'build' failed [ 255s] make: *** [build] Error 2 [ 255s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 255s] [ 255s] morla3 failed "build osmo-trx_0.4.0.122.03b1.dsc" at Fri Dec 14 20:02:48 UTC 2018. [ 255s] [ 255s] ### VM INTERACTION START ### [ 258s] [ 244.166402] sysrq: SysRq : Power Off [ 258s] [ 244.219516] reboot: Power down [ 258s] ### VM INTERACTION END ### [ 259s] [ 259s] morla3 failed "build osmo-trx_0.4.0.122.03b1.dsc" at Fri Dec 14 20:02:53 UTC 2018. [ 259s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Dec 14 20:04:41 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 14 Dec 2018 20:04:41 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c140cf27342d_2c2a91668010846d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 162s] /usr/src/packages/BUILD/Transceiver52M/device/lms/LMSDevice.cpp:259: undefined reference to `LMS_Calibrate' [ 162s] /usr/src/packages/BUILD/Transceiver52M/device/lms/LMSDevice.cpp:252: undefined reference to `LMS_SetLPFBW' [ 162s] collect2: error: ld returned 1 exit status [ 162s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 162s] make[4]: *** [LMSDeviceTest] Error 1 [ 162s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 162s] Makefile:401: recipe for target 'all-recursive' failed [ 162s] make[3]: *** [all-recursive] Error 1 [ 162s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 162s] Makefile:516: recipe for target 'all-recursive' failed [ 162s] make[2]: *** [all-recursive] Error 1 [ 162s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 162s] Makefile:447: recipe for target 'all' failed [ 162s] make[1]: *** [all] Error 2 [ 162s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 162s] dh_auto_build: make -j1 returned exit code 2 [ 162s] debian/rules:6: recipe for target 'build' failed [ 162s] make: *** [build] Error 2 [ 162s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 162s] [ 162s] lamb67 failed "build osmo-trx_0.4.0.122.03b1.dsc" at Fri Dec 14 20:04:30 UTC 2018. [ 162s] [ 162s] ### VM INTERACTION START ### [ 165s] [ 155.193635] sysrq: SysRq : Power Off [ 165s] [ 155.200338] reboot: Power down [ 165s] ### VM INTERACTION END ### [ 165s] [ 165s] lamb67 failed "build osmo-trx_0.4.0.122.03b1.dsc" at Fri Dec 14 20:04:34 UTC 2018. [ 165s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Dec 14 20:05:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 14 Dec 2018 20:05:31 +0000 Subject: Change in osmo-trx[master]: configure.ac: check boost only if USRP1 support is enabled In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12088 ) Change subject: configure.ac: check boost only if USRP1 support is enabled ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4c3fa3ff58fd552d0cb4c4cf2033615d84c07c96 Gerrit-Change-Number: 12088 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 14 Dec 2018 20:05:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 20:05:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 14 Dec 2018 20:05:36 +0000 Subject: Change in osmo-trx[master]: configure.ac: check boost only if USRP1 support is enabled In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12088 ) Change subject: configure.ac: check boost only if USRP1 support is enabled ...................................................................... configure.ac: check boost only if USRP1 support is enabled boost is only used in USRPDevice class. It looks like it can be removed entirely quite easily, since only boost::shared_ptr is used for 2 variables. That's left for somebody with the device and willingness to test the changes. Change-Id: I4c3fa3ff58fd552d0cb4c4cf2033615d84c07c96 --- M configure.ac 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 37b70fa..2ce4462 100644 --- a/configure.ac +++ b/configure.ac @@ -155,6 +155,8 @@ ]) AS_IF([test "x$with_usrp1" = "xyes"], [ + AC_CHECK_HEADER([boost/config.hpp],[], + [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])]) PKG_CHECK_MODULES(USRP, usrp >= 3.3) ]) @@ -234,9 +236,6 @@ PKG_CHECK_MODULES(LIBUSB, libusb-1.0) PKG_CHECK_MODULES(FFTWF, fftw3f) -AC_CHECK_HEADER([boost/config.hpp],[], - [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])]) - # Generate manuals AC_ARG_ENABLE(manuals, [AS_HELP_STRING( -- To view, visit https://gerrit.osmocom.org/12088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4c3fa3ff58fd552d0cb4c4cf2033615d84c07c96 Gerrit-Change-Number: 12088 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 20:06:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 14 Dec 2018 20:06:35 +0000 Subject: Change in osmo-bsc[master]: Add VTY option to avoid sending empty Full BCCH Info for disabled SI In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12133 ) Change subject: Add VTY option to avoid sending empty Full BCCH Info for disabled SI ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 Gerrit-Change-Number: 12133 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 14 Dec 2018 20:06:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 14 20:06:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 14 Dec 2018 20:06:37 +0000 Subject: Change in osmo-bsc[master]: Add VTY option to avoid sending empty Full BCCH Info for disabled SI In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12133 ) Change subject: Add VTY option to avoid sending empty Full BCCH Info for disabled SI ...................................................................... Add VTY option to avoid sending empty Full BCCH Info for disabled SI According to 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION: "If the Full BCCH information element is not included this indicates that transmission of the indicated SYSTEM INFORMATION message shall be stopped." However, some ipaccess nanoBTS firmware versions are known to not support some SI elements and also to dislike receiving BCCH Information for those SI, even if received with empty BCCH Information meaning they should not be used. Upon receival of this kind of message, nanoBTS sends a Failure Report with following text: Type=processing failure, Severity=critical failure, Probable cause=Manufacturer specific values: Fatal software error, Additional Text=l2_bch.c:1149 **** ** l2_bch.c#1149:BCHbcchSItypeValid( prim_p->infoType ) ** IPA_SW_FATAL_ERROR ** In task "TRX Proc:L2_BCH" @ (325). **** This kind of issue only appears with some fw versions, since it's known to work fine in other ones, so let's not disable this kind of mesage by default on all BTs of type "nanobts". Instead, add a VTY command that allows disabling this kind of message in order to be able to operate those nanoBTS units. Fixes: OS#3707 Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_data.c 4 files changed, 50 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index e57da55..738bad3 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -981,6 +981,9 @@ /* offsets used while generating SI2quater */ size_t e_offset; size_t u_offset; + /* 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION. Some nanoBTS fail upon + * receival of empty SI disabling unsupported SI. see OS#3707. */ + bool si_unused_send_empty; /* ip.accesss Unit ID's have Site/BTS/TRX layout */ union { diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index 2f44b20..7d29d4f 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -173,12 +173,16 @@ for (n = 0; n < n_si; n++) { i = gen_si[n]; - /* if we don't currently have this SI, we send a zero-length - * RSL BCCH FILLING / SACCH FILLING * in order to deactivate - * the SI, in case it might have previously been active */ - if (!GSM_BTS_HAS_SI(bts, i)) - rc = rsl_si(trx, i, 0); - else + /* 3GPP TS 08.58 ?8.5.1 BCCH INFORMATION. If we don't currently + * have this SI, we send a zero-length RSL BCCH FILLING / + * SACCH FILLING in order to deactivate the SI, in case it + * might have previously been active */ + if (!GSM_BTS_HAS_SI(bts, i)) { + if (bts->si_unused_send_empty) + rc = rsl_si(trx, i, 0); + else + rc = 0; /* some nanoBTS fw don't like receiving empty unsupported SI */ + } else rc = rsl_si(trx, i, si_len[i]); if (rc < 0) return rc; diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 8c7d8e1..032305e 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -874,6 +874,8 @@ } vty_out(vty, " access-control-class-ramping-step-size %u%s", acc_ramp_get_step_size(&bts->acc_ramp), 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++) { if (bts->si_mode_static & (1 << i)) { vty_out(vty, " system-information %s mode static%s", @@ -3087,6 +3089,38 @@ return CMD_SUCCESS; } +DEFUN(cfg_bts_si_unused_send_empty, cfg_bts_si_unused_send_empty_cmd, + "system-information unused-send-empty", + SI_TEXT + "Send BCCH Info with empty 'Full BCCH Info' TLV to notify disabled SI. " + "Some nanoBTS fw versions are known to fail upon receival of these messages.\n") +{ + struct gsm_bts *bts = vty->index; + + bts->si_unused_send_empty = true; + + return CMD_SUCCESS; +} + +DEFUN(cfg_bts_no_si_unused_send_empty, cfg_bts_no_si_unused_send_empty_cmd, + "no system-information unused-send-empty", + NO_STR SI_TEXT + "Avoid sending BCCH Info with empty 'Full BCCH Info' TLV to notify disabled SI. " + "Some nanoBTS fw versions are known to fail upon receival of these messages.\n") +{ + struct gsm_bts *bts = vty->index; + + if (!is_ipaccess_bts(bts) || is_sysmobts_v2(bts)) { + vty_out(vty, "This command is only intended for ipaccess nanoBTS. See OS#3707.%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + bts->si_unused_send_empty = false; + + return CMD_SUCCESS; +} + DEFUN(cfg_bts_early_cm, cfg_bts_early_cm_cmd, "early-classmark-sending (allowed|forbidden)", "Early Classmark Sending\n" @@ -5132,6 +5166,8 @@ install_element(BTS_NODE, &cfg_bts_pag_free_cmd); install_element(BTS_NODE, &cfg_bts_si_mode_cmd); install_element(BTS_NODE, &cfg_bts_si_static_cmd); + install_element(BTS_NODE, &cfg_bts_si_unused_send_empty_cmd); + install_element(BTS_NODE, &cfg_bts_no_si_unused_send_empty_cmd); install_element(BTS_NODE, &cfg_bts_early_cm_cmd); install_element(BTS_NODE, &cfg_bts_early_cm_3g_cmd); install_element(BTS_NODE, &cfg_bts_neigh_mode_cmd); diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 0f76a27..7eee918 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -856,6 +856,7 @@ bts->gprs.ctrl_ack_type_use_block = true; /* use RLC/MAC control block */ bts->neigh_list_manual_mode = NL_MODE_AUTOMATIC; bts->early_classmark_allowed_3g = true; /* 3g Early Classmark Sending controlled by bts->early_classmark_allowed param */ + bts->si_unused_send_empty = true; bts->si_common.cell_sel_par.cell_resel_hyst = 2; /* 4 dB */ bts->si_common.cell_sel_par.rxlev_acc_min = 0; bts->si_common.si2quater_neigh_list.arfcn = bts->si_common.data.earfcn_list; -- To view, visit https://gerrit.osmocom.org/12133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idec1daabc21de4eea5c55edd1dbb0e0775720fc7 Gerrit-Change-Number: 12133 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 15 14:38:00 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 15 Dec 2018 14:38:00 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts: Package the osmo-bts-virtual binary for the ms_driver Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12320 Change subject: osmo-bts: Package the osmo-bts-virtual binary for the ms_driver ...................................................................... osmo-bts: Package the osmo-bts-virtual binary for the ms_driver Change-Id: Id6db5d0bea5262075c3e06fbb0ccfef86afa85e4 --- M contrib/jenkins-build-osmo-bts.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/20/12320/1 diff --git a/contrib/jenkins-build-osmo-bts.sh b/contrib/jenkins-build-osmo-bts.sh index 46a1c11..ee87d7f 100755 --- a/contrib/jenkins-build-osmo-bts.sh +++ b/contrib/jenkins-build-osmo-bts.sh @@ -10,4 +10,4 @@ build_repo libosmo-abis ${SANITIZE_FLAGS} build_repo osmo-bts ${SANITIZE_FLAGS} --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers -create_bin_tgz "osmo-bts-trx osmo-bts-octphy" +create_bin_tgz "osmo-bts-trx osmo-bts-octphy osmo-bts-virtual" -- To view, visit https://gerrit.osmocom.org/12320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id6db5d0bea5262075c3e06fbb0ccfef86afa85e4 Gerrit-Change-Number: 12320 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Dec 15 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 15 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#340?= In-Reply-To: <1021380677.0.1544800212583.JavaMail.jenkins@jenkins.osmocom.org> References: <1021380677.0.1544800212583.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1071003503.14.1544886607355.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Dec 15 17:39:50 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 15 Dec 2018 17:39:50 +0000 Subject: Change in libosmocore[master]: vty: Introduce telnet_init_default and make vty port configurable Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12321 Change subject: vty: Introduce telnet_init_default and make vty port configurable ...................................................................... vty: Introduce telnet_init_default and make vty port configurable Make configuring the bind port optional in the line vty/bind command and introduce telnet_init_default to automatically consume this value. Client code should use it like: int rc = telnet_init_default(ctx, priv, OSMO_VTY_PORT_SGSN); Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 --- M include/osmocom/vty/telnet_interface.h M include/osmocom/vty/vty.h M src/vty/telnet_interface.c M src/vty/vty.c 4 files changed, 34 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/12321/1 diff --git a/include/osmocom/vty/telnet_interface.h b/include/osmocom/vty/telnet_interface.h index d653466..da7cf83 100644 --- a/include/osmocom/vty/telnet_interface.h +++ b/include/osmocom/vty/telnet_interface.h @@ -47,6 +47,7 @@ int telnet_init(void *tall_ctx, void *priv, int port); int telnet_init_dynif(void *tall_ctx, void *priv, const char *ip, int port); +int telnet_init_default(void *tall_ctx, void *priv, int default_port); void telnet_exit(void); diff --git a/include/osmocom/vty/vty.h b/include/osmocom/vty/vty.h index 02ba03e..c4cf707 100644 --- a/include/osmocom/vty/vty.h +++ b/include/osmocom/vty/vty.h @@ -210,6 +210,8 @@ /* Return IP address passed to the 'line vty'/'bind' command, or "127.0.0.1" */ const char *vty_get_bind_addr(void); +/** Returns configured port passed to the 'line vty'/'bind' command or default_port. */ +int vty_get_bind_port(int default_port); extern void *tall_vty_ctx; diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c index fcb4c8d..031bfab 100644 --- a/src/vty/telnet_interface.c +++ b/src/vty/telnet_interface.c @@ -105,6 +105,18 @@ return 0; } +/*! Initializes telnet based VTY interface using the configured bind addr/port. + * \param[in] tall_ctx \ref talloc context + * \param[in] priv private data to be passed to callback + * \param[in] default_port UDP port number to use if not explicitely configured + */ +int telnet_init_default(void *tall_ctx, void *priv, int default_port) +{ + return telnet_init_dynif(tall_ctx, priv, vty_get_bind_addr(), + vty_get_bind_port(default_port)); +} + + extern struct host host; /*! close a telnet connection */ diff --git a/src/vty/vty.c b/src/vty/vty.c index 70f6811..7f6c225 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -90,6 +90,8 @@ * use NULL and VTY_BIND_ADDR_DEFAULT instead. */ static const char *vty_bind_addr = NULL; #define VTY_BIND_ADDR_DEFAULT "127.0.0.1" +/* Port the VTY should bind to. -1 means not configured */ +static int vty_bind_port = -1; /* Configure lock. */ static int vty_config; @@ -1612,12 +1614,13 @@ } /* vty bind */ -DEFUN(vty_bind, vty_bind_cmd, "bind A.B.C.D", +DEFUN(vty_bind, vty_bind_cmd, "bind A.B.C.D [<0-65535>]", "Accept VTY telnet connections on local interface\n" "Local interface IP address (default: " VTY_BIND_ADDR_DEFAULT ")\n") { talloc_free((void*)vty_bind_addr); vty_bind_addr = talloc_strdup(tall_vty_ctx, argv[0]); + vty_bind_port = argc > 1 ? atoi(argv[1]) : -1; return CMD_SUCCESS; } @@ -1628,6 +1631,13 @@ return vty_bind_addr; } +int vty_get_bind_port(int default_port) +{ + if (vty_bind_port >= 0) + return vty_bind_port; + return default_port; +} + DEFUN(service_advanced_vty, service_advanced_vty_cmd, "service advanced-vty", @@ -1700,8 +1710,14 @@ vty_out(vty, " login%s", VTY_NEWLINE); /* bind */ - if (vty_bind_addr && (strcmp(vty_bind_addr, VTY_BIND_ADDR_DEFAULT) != 0)) - vty_out(vty, " bind %s%s", vty_bind_addr, VTY_NEWLINE); + if (vty_bind_addr && (strcmp(vty_bind_addr, VTY_BIND_ADDR_DEFAULT) != 0 || vty_bind_port >= 0)) { + if (vty_bind_port >= 0) { + vty_out(vty, " bind %s %d%s", vty_bind_addr, + vty_bind_port, VTY_NEWLINE); + } else { + vty_out(vty, " bind %s%s", vty_bind_addr, VTY_NEWLINE); + } + } vty_out(vty, "!%s", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 15 17:47:18 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 15 Dec 2018 17:47:18 +0000 Subject: Change in libosmocore[master]: vty: Introduce telnet_init_default and make vty port configurable In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12321 ) Change subject: vty: Introduce telnet_init_default and make vty port configurable ...................................................................... Patch Set 1: PTAL. I haven't used/executed this yet. -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 15 Dec 2018 17:47:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 15 18:48:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 15 Dec 2018 18:48:52 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts: Package the osmo-bts-virtual binary for the ms_driver In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12320 ) Change subject: osmo-bts: Package the osmo-bts-virtual binary for the ms_driver ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6db5d0bea5262075c3e06fbb0ccfef86afa85e4 Gerrit-Change-Number: 12320 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 15 Dec 2018 18:48:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 15 18:48:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 15 Dec 2018 18:48:55 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts: Package the osmo-bts-virtual binary for the ms_driver In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12320 ) Change subject: osmo-bts: Package the osmo-bts-virtual binary for the ms_driver ...................................................................... osmo-bts: Package the osmo-bts-virtual binary for the ms_driver Change-Id: Id6db5d0bea5262075c3e06fbb0ccfef86afa85e4 --- M contrib/jenkins-build-osmo-bts.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins-build-osmo-bts.sh b/contrib/jenkins-build-osmo-bts.sh index 46a1c11..ee87d7f 100755 --- a/contrib/jenkins-build-osmo-bts.sh +++ b/contrib/jenkins-build-osmo-bts.sh @@ -10,4 +10,4 @@ build_repo libosmo-abis ${SANITIZE_FLAGS} build_repo osmo-bts ${SANITIZE_FLAGS} --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers -create_bin_tgz "osmo-bts-trx osmo-bts-octphy" +create_bin_tgz "osmo-bts-trx osmo-bts-octphy osmo-bts-virtual" -- To view, visit https://gerrit.osmocom.org/12320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id6db5d0bea5262075c3e06fbb0ccfef86afa85e4 Gerrit-Change-Number: 12320 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Dec 15 19:57:36 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Dec 2018 19:57:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c155cc2b324f_2c2a916680426095@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 165s] /usr/src/packages/BUILD/Transceiver52M/device/lms/LMSDevice.cpp:252: u[ 155.040221] serial8250: too much work for irq4 [ 165s] ndefined reference to `LMS_SetLPFBW' [ 165s] collect2: error: ld returned 1 exit status [ 165s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 165s] make[4]: *** [LMSDeviceTest] Error 1 [ 165s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 165s] Makefile:401: recipe for target 'all-recursive' failed [ 165s] make[3]: *** [all-recursive] Error 1 [ 165s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 165s] Makefile:516: recipe for target 'all-recursive' failed [ 165s] make[2]: *** [all-recursive] Error 1 [ 165s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 165s] Makefile:447: recipe for target 'all' failed [ 165s] make[1]: *** [all] Error 2 [ 165s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 165s] dh_auto_build: make -j1 returned exit code 2 [ 165s] debian/rules:6: recipe for target 'build' failed [ 165s] make: *** [build] Error 2 [ 165s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 165s] [ 165s] lamb25 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sat Dec 15 19:57:22 UTC 2018. [ 165s] [ 165s] ### VM INTERACTION START ### [ 169s] [ 158.229496] sysrq: SysRq : Power Off [ 169s] [ 158.236311] reboot: Power down [ 169s] ### VM INTERACTION END ### [ 169s] [ 169s] lamb25 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sat Dec 15 19:57:26 UTC 2018. [ 169s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 15 19:58:11 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Dec 2018 19:58:11 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c155ce19e3d3_2c2a9166804261e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 161s] /usr/src/packages/BUILD/Transceiver52M/device/lms/LMSDevice.cpp:252: undefined reference to `LMS_SetLPFBW' [ 161s] collect2: err[ 150.468399] serial8250: too much work for irq4 [ 161s] or: ld returned 1 exit status [ 161s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 161s] make[4]: *** [LMSDeviceTest] Error 1 [ 161s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 161s] Makefile:401: recipe for target 'all-recursive' failed [ 161s] make[3]: *** [all-recursive] Error 1 [ 161s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 161s] Makefile:516: recipe for target 'all-recursive' failed [ 161s] make[2]: *** [all-recursive] Error 1 [ 161s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 161s] Makefile:447: recipe for target 'all' failed [ 161s] make[1]: *** [all] Error 2 [ 161s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 161s] dh_auto_build: make -j1 returned exit code 2 [ 161s] debian/rules:6: recipe for target 'build' failed [ 161s] make: *** [build] Error 2 [ 161s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 161s] [ 161s] lamb69 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sat Dec 15 19:57:52 UTC 2018. [ 161s] [ 161s] ### VM INTERACTION START ### [ 164s] [ 153.703671] sysrq: SysRq : Power Off [ 164s] [ 153.709597] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] lamb69 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sat Dec 15 19:57:55 UTC 2018. [ 164s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 15 19:59:02 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Dec 2018 19:59:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5c155d1e7fb65_2c2a9166804262f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 217s] ../../Transceiver52M/device/lms/.libs/libdevice.a(LMSDevice.o): In function `compat_LMS_VCTCXOWrite': [ 217s] ./Transceiver52M/device/lms/LMSDevice.cpp:58: undefined reference to `LMS_VCTCXOWrite' [ 217s] collect2: error: ld returned 1 exit status [ 217s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 217s] make[4]: *** [LMSDeviceTest] Error 1 [ 217s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 217s] Makefile:401: recipe for target 'all-recursive' failed [ 217s] make[3]: *** [all-recursive] Error 1 [ 217s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 217s] Makefile:516: recipe for target 'all-recursive' failed [ 217s] make[2]: *** [all-recursive] Error 1 [ 217s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 217s] Makefile:447: recipe for target 'all' failed [ 217s] make[1]: *** [all] Error 2 [ 217s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 217s] dh_auto_build: make -j1 returned exit code 2 [ 217s] debian/rules:6: recipe for target 'build' failed [ 217s] make: *** [build] Error 2 [ 217s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 217s] [ 217s] lamb04 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sat Dec 15 19:58:53 UTC 2018. [ 217s] [ 217s] ### VM INTERACTION START ### [ 220s] [ 207.398888] sysrq: SysRq : Power Off [ 220s] [ 207.406046] reboot: Power down [ 220s] ### VM INTERACTION END ### [ 220s] [ 220s] lamb04 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sat Dec 15 19:58:56 UTC 2018. [ 220s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 15 19:59:02 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Dec 2018 19:59:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c155d1f1f5f0_2c2a916680426388@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 187s] ../../Transceiver52M/device/lms/.libs/libdevice.a(LMSDevice.o): In function `compat_LMS_VCTCXOWrite': [ 187s] ./Transceiver52M/device/lms/LMSDevice.cpp:58: undefined reference to `LMS_VCTCXOWrite' [ 187s] collect2: error: ld returned 1 exit status [ 187s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 187s] make[4]: *** [LMSDeviceTest] Error 1 [ 187s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 187s] Makefile:401: recipe for target 'all-recursive' failed [ 187s] make[3]: *** [all-recursive] Error 1 [ 187s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 187s] Makefile:516: recipe for target 'all-recursive' failed [ 187s] make[2]: *** [all-recursive] Error 1 [ 187s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 187s] Makefile:447: recipe for target 'all' failed [ 187s] make[1]: *** [all] Error 2 [ 187s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 187s] dh_auto_build: make -j1 returned exit code 2 [ 187s] debian/rules:6: recipe for target 'build' failed [ 187s] make: *** [build] Error 2 [ 187s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 187s] [ 187s] lamb53 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sat Dec 15 19:58:56 UTC 2018. [ 187s] [ 187s] ### VM INTERACTION START ### [ 190s] [ 179.572703] sysrq: SysRq : Power Off [ 190s] [ 179.578811] reboot: Power down [ 190s] ### VM INTERACTION END ### [ 190s] [ 190s] lamb53 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sat Dec 15 19:59:00 UTC 2018. [ 190s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 15 19:59:19 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Dec 2018 19:59:19 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5c155d1f8d474_2c2a9166804264f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 249s] ../../Transceiver52M/device/lms/.libs/libdevice.a(LMSDevice.o): In function `compat_LMS_VCTCXOWrite': [ 249s] ./Transceiver52M/device/lms/LMSDevice.cpp:58: undefined reference to `LMS_VCTCXOWrite' [ 249s] collect2: error: ld returned 1 exit status [ 249s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 249s] make[4]: *** [LMSDeviceTest] Error 1 [ 249s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 249s] Makefile:401: recipe for target 'all-recursive' failed [ 249s] make[3]: *** [all-recursive] Error 1 [ 249s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 249s] Makefile:516: recipe for target 'all-recursive' failed [ 249s] make[2]: *** [all-recursive] Error 1 [ 249s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 249s] Makefile:447: recipe for target 'all' failed [ 249s] make[1]: *** [all] Error 2 [ 249s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 249s] dh_auto_build: make -j1 returned exit code 2 [ 249s] debian/rules:6: recipe for target 'build' failed [ 249s] make: *** [build] Error 2 [ 249s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 249s] [ 249s] cloud122 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sat Dec 15 19:59:07 UTC 2018. [ 249s] [ 249s] ### VM INTERACTION START ### [ 252s] [ 225.966969] sysrq: SysRq : Power Off [ 252s] [ 225.973577] reboot: Power down [ 253s] ### VM INTERACTION END ### [ 253s] [ 253s] cloud122 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sat Dec 15 19:59:12 UTC 2018. [ 253s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 15 19:59:19 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 15 Dec 2018 19:59:19 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c155d20126b2_2c2a916680426540@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 206s] ../../Transceiver52M/device/lms/.libs/libdevice.a(LMSDevice.o): In function `compat_LMS_VCTCXOWrite': [ 206s] ./Transceiver52M/device/lms/LMSDevice.cpp:58: undefined reference to `LMS_VCTCXOWrite' [ 206s] collect2: error: ld returned 1 exit status [ 206s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 206s] make[4]: *** [LMSDeviceTest] Error 1 [ 206s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 206s] Makefile:401: recipe for target 'all-recursive' failed [ 206s] make[3]: *** [all-recursive] Error 1 [ 206s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 206s] Makefile:516: recipe for target 'all-recursive' failed [ 206s] make[2]: *** [all-recursive] Error 1 [ 206s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 206s] Makefile:447: recipe for target 'all' failed [ 206s] make[1]: *** [all] Error 2 [ 206s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 206s] dh_auto_build: make -j1 returned exit code 2 [ 206s] debian/rules:6: recipe for target 'build' failed [ 206s] make: *** [build] Error 2 [ 206s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 206s] [ 206s] lamb28 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sat Dec 15 19:59:13 UTC 2018. [ 206s] [ 206s] ### VM INTERACTION START ### [ 209s] [ 197.042535] sysrq: SysRq : Power Off [ 209s] [ 197.050035] reboot: Power down [ 209s] ### VM INTERACTION END ### [ 209s] [ 209s] lamb28 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sat Dec 15 19:59:16 UTC 2018. [ 209s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Dec 16 00:08:32 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 16 Dec 2018 00:08:32 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_trx.py: drop meaningless warnings In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12291 ) Change subject: trx_toolkit/ctrl_if_trx.py: drop meaningless warnings ...................................................................... Patch Set 2: Hi, > Could you clarify in commit message if RESET was introduced It wasn't introduced yet. > or why removing this TODO is the right thing. It's written there: > We should neither complain nor reject such commands. So, no matter if RESET introduced or not. -- To view, visit https://gerrit.osmocom.org/12291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a69ebceed5aa724093e6d1b23faad8c16705055 Gerrit-Change-Number: 12291 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Sun, 16 Dec 2018 00:08:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 16 01:14:33 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 16 Dec 2018 01:14:33 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_bb.py: drop meaningless warnings In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12291 to look at the new patch set (#3). Change subject: trx_toolkit/ctrl_if_bb.py: drop meaningless warnings ...................................................................... trx_toolkit/ctrl_if_bb.py: drop meaningless warnings A timeslot can be reconfigured at runtime, this is normal. We should neither complain nor reject such commands. Change-Id: I0a69ebceed5aa724093e6d1b23faad8c16705055 --- M src/target/trx_toolkit/ctrl_if_bb.py 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/91/12291/3 -- To view, visit https://gerrit.osmocom.org/12291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0a69ebceed5aa724093e6d1b23faad8c16705055 Gerrit-Change-Number: 12291 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 16 01:14:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 16 Dec 2018 01:14:34 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: fix missing / useless imports Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12322 Change subject: trx_toolkit: fix missing / useless imports ...................................................................... trx_toolkit: fix missing / useless imports Found using Flake8: - data_if.py:57:4: F405 'log' may be undefined, or defined from star imports: data_msg - clck_gen.py:29:1: F401 'time' imported but unused - clck_gen.py:30:1: F401 'sys' imported but unused - trx_sniff.py:28:1: F401 'signal' imported but unused Change-Id: Id0c42319b445db218b77fd5e99a9a0a89724281d --- M src/target/trx_toolkit/burst_send.py M src/target/trx_toolkit/clck_gen.py M src/target/trx_toolkit/data_if.py M src/target/trx_toolkit/trx_sniff.py 4 files changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/22/12322/1 diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 3745b39..0cf63bb 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -32,7 +32,6 @@ from app_common import ApplicationBase from data_dump import DATADumpFile from data_if import DATAInterface -from gsm_shared import * from data_msg import * class Application(ApplicationBase): diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index 40964dd..6c2cbf8 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -26,8 +26,6 @@ import logging as log import signal -import time -import sys from app_common import ApplicationBase from threading import Timer diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index 45114ed..79584da 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -22,6 +22,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import logging as log + from udp_link import UDPLink from data_msg import * diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index e169c72..19ea8e6 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -25,7 +25,6 @@ APP_CR_HOLDERS = [("2018", "Vadim Yanitskiy ")] import logging as log -import signal import argparse import sys -- To view, visit https://gerrit.osmocom.org/12322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id0c42319b445db218b77fd5e99a9a0a89724281d Gerrit-Change-Number: 12322 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 16 01:14:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 16 Dec 2018 01:14:34 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_send.py: fix: use proper argparse group Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12323 Change subject: trx_toolkit/burst_send.py: fix: use proper argparse group ...................................................................... trx_toolkit/burst_send.py: fix: use proper argparse group Found using Flake8, F841 "local variable 'pf_group' is assigned to but never used". The filtering related options should be defined in 'pf_group' group, not in 'cnt_group'. Change-Id: I15d17c134cbbbd54d761113a56c1f83910ab6407 --- M src/target/trx_toolkit/burst_send.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/23/12323/1 diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 0cf63bb..7186863 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -134,13 +134,13 @@ help = "Stop after sending N messages") pf_group = parser.add_argument_group("Filtering (optional)") - cnt_group.add_argument("--timeslot", metavar = "TN", + pf_group.add_argument("--timeslot", metavar = "TN", dest = "pf_tn", type = int, choices = range(0, 8), help = "TDMA timeslot number (equal TN)") - cnt_group.add_argument("--frame-num-lt", metavar = "FN", + pf_group.add_argument("--frame-num-lt", metavar = "FN", dest = "pf_fn_lt", type = int, help = "TDMA frame number (lower than FN)") - cnt_group.add_argument("--frame-num-gt", metavar = "FN", + pf_group.add_argument("--frame-num-gt", metavar = "FN", dest = "pf_fn_gt", type = int, help = "TDMA frame number (greater than FN)") -- To view, visit https://gerrit.osmocom.org/12323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I15d17c134cbbbd54d761113a56c1f83910ab6407 Gerrit-Change-Number: 12323 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 16 01:14:35 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 16 Dec 2018 01:14:35 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_send.py: exit if DATA dump parsing failed Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12324 Change subject: trx_toolkit/burst_send.py: exit if DATA dump parsing failed ...................................................................... trx_toolkit/burst_send.py: exit if DATA dump parsing failed False is not iterable, so we should properly handle the case when parsing of the whole DATA dump was failed (e.g. due to incorrect offset specified). Change-Id: I5443efb39bb9d3377290ce7ec5e34016cae0edb2 --- M src/target/trx_toolkit/burst_send.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/24/12324/1 diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 7186863..6c19e6f 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -63,7 +63,8 @@ messages = self.ddf.parse_all( skip = self.argv.cnt_skip, count = self.argv.cnt_count) if messages is False: - pass # FIXME!!! + log.error("Parsing failed, nothing to send") + sys.exit(1) for msg in messages: # Pass filter -- To view, visit https://gerrit.osmocom.org/12324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5443efb39bb9d3377290ce7ec5e34016cae0edb2 Gerrit-Change-Number: 12324 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 16 01:14:35 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 16 Dec 2018 01:14:35 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: handle multiple transceivers Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12325 Change subject: trx_toolkit/fake_trx.py: handle multiple transceivers ...................................................................... trx_toolkit/fake_trx.py: handle multiple transceivers Change-Id: Ibff31fb3a958a714c828d0dea7e87d47f778fd80 --- M src/target/trx_toolkit/fake_trx.py 1 file changed, 63 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/25/12325/1 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 733cc10..421f587 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -302,51 +302,62 @@ # BTS: -75 .. -50 self.fake_pm = FakePM(-120, -105, -75, -50) + # List of all transceivers + self.trx_list = [] + # Init TRX instance for BTS - self.bts_trx = FakeTRX(self.argv.trx_bind_addr, - self.argv.bts_addr, self.argv.bts_base_port, - self.clck_gen) + trx = FakeTRX(self.argv.trx_bind_addr, self.argv.bts_addr, + self.argv.bts_base_port, self.clck_gen) + self.trx_list.append(trx) # Init TRX instance for BB # NOTE: trxcon doesn't need clock - self.bb_trx = FakeTRXBB(self.fake_pm, - self.argv.trx_bind_addr, self.argv.bb_addr, - self.argv.bb_base_port) + trx = FakeTRXBB(self.fake_pm, self.argv.trx_bind_addr, + self.argv.bb_addr, self.argv.bb_base_port) + self.trx_list.append(trx) + + # Optional BTS transceivers + if self.argv.bts_trx_list is not None: + for (remote_addr, base_port) in self.argv.bts_trx_list: + trx = FakeTRX(self.argv.trx_bind_addr, + remote_addr, base_port) + self.trx_list.append(trx) + + # Optional BB transceivers + if self.argv.bb_trx_list is not None: + for (remote_addr, base_port) in self.argv.bb_trx_list: + trx = FakeTRXBB(self.fake_pm, + self.argv.trx_bind_addr, + remote_addr, base_port) + self.trx_list.append(trx) # Burst forwarding between transceivers - self.burst_fwd = BurstForwarder() - self.burst_fwd.add_trx(self.bts_trx) - self.burst_fwd.add_trx(self.bb_trx) + self.burst_fwd = BurstForwarder(self.trx_list) + + # Compose list of to be monitored sockets + self.sock_list = [] + for trx in self.trx_list: + self.sock_list.append(trx.ctrl_if.sock) + self.sock_list.append(trx.data_if.sock) log.info("Init complete") # Enter main loop while True: - socks = [self.bts_trx.ctrl_if.sock, self.bb_trx.ctrl_if.sock, - self.bts_trx.data_if.sock, self.bb_trx.data_if.sock] - # Wait until we get any data on any socket - r_event, w_event, x_event = select.select(socks, [], []) + r_event, _, _ = select.select(self.sock_list, [], []) - # Downlink: BTS -> BB - if self.bts_trx.data_if.sock in r_event: - msg = self.bts_trx.recv_data_msg() - if msg is not None: - self.burst_fwd.forward_msg(self.bts_trx, msg) + # Iterate over all transceivers + for trx in self.trx_list: + # DATA interface + if trx.data_if.sock in r_event: + msg = trx.recv_data_msg() + if msg is not None: + self.burst_fwd.forward_msg(trx, msg) - # Uplink: BB -> BTS - if self.bb_trx.data_if.sock in r_event: - msg = self.bb_trx.recv_data_msg() - if msg is not None: - self.burst_fwd.forward_msg(self.bb_trx, msg) - - # CTRL commands from BTS - if self.bts_trx.ctrl_if.sock in r_event: - self.bts_trx.ctrl_if.handle_rx() - - # CTRL commands from BB - if self.bb_trx.ctrl_if.sock in r_event: - self.bb_trx.ctrl_if.handle_rx() + # CTRL interface + if trx.ctrl_if.sock in r_event: + trx.ctrl_if.handle_rx() def shutdown(self): log.info("Shutting down...") @@ -354,6 +365,16 @@ # Stop clock generator self.clck_gen.stop() + @staticmethod + def trx_def(val): + try: + # e.g. 127.0.0.1:5700 + trx = val.split(":") + addr, port = trx[0], int(trx[1]) + return (addr, port) + except: + raise argparse.ArgumentTypeError("Invalid TRX definition: %s" % val) + def parse_argv(self): parser = argparse.ArgumentParser(prog = "fake_trx", description = "Virtual Um-interface (fake transceiver)") @@ -378,8 +399,19 @@ dest = "bb_base_port", type = int, default = 6700, help = "Set BB base port number (default %(default)s)") + mtrx_group = parser.add_argument_group("Additional transceivers") + mtrx_group.add_argument("--bts-trx", metavar = "REMOTE_ADDR:BASE_PORT", + dest = "bts_trx_list", type = self.trx_def, action = "append", + help = "Add a transceiver for BTS (e.g. 127.0.0.1:5703)") + mtrx_group.add_argument("--bb-trx", metavar = "REMOTE_ADDR:BASE_PORT", + dest = "bb_trx_list", type = self.trx_def, action = "append", + help = "Add a transceiver for BB (e.g. 127.0.0.1:6703)") + argv = parser.parse_args() + # TODO: make sure there are no duplicates in both + # bts_trx_list and bb_trx_list + # Make sure there is no overlap between ports if argv.bts_base_port == argv.bb_base_port: parser.error("BTS and BB base ports shall be different") -- To view, visit https://gerrit.osmocom.org/12325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibff31fb3a958a714c828d0dea7e87d47f778fd80 Gerrit-Change-Number: 12325 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 16 06:12:56 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 16 Dec 2018 06:12:56 +0000 Subject: Change in osmocom-bb[master]: mobile: Use new VTY telnet API to allow binding to random port Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12326 Change subject: mobile: Use new VTY telnet API to allow binding to random port ...................................................................... mobile: Use new VTY telnet API to allow binding to random port Change-Id: I5a6214aec2dcb92495038ea8311c0df22fa8d07b --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/26/12326/1 diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index a051fba..907a58f 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -464,8 +464,7 @@ LOGP(DMOB, LOGL_INFO, "Using configuration from '%s'\n", config_file); } vty_reading = 0; - rc = telnet_init_dynif(l23_ctx, NULL, - vty_get_bind_addr(), OSMO_VTY_PORT_BB); + rc = telnet_init_default(l23_ctx, NULL, OSMO_VTY_PORT_BB); if (rc < 0) { LOGP(DMOB, LOGL_FATAL, "Cannot init VTY on %s port %u: %s\n", vty_get_bind_addr(), OSMO_VTY_PORT_BB, strerror(errno)); -- To view, visit https://gerrit.osmocom.org/12326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5a6214aec2dcb92495038ea8311c0df22fa8d07b Gerrit-Change-Number: 12326 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 16 07:38:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 16 Dec 2018 07:38:29 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7511?= Message-ID: <205580966.26.1544945909352.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 10.30 KB...] checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/timerfd.h usability... yes checking sys/timerfd.h presence... yes checking for sys/timerfd.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for library containing dlsym... -ldl checking for backtrace in -lexecinfo... no checking for library containing clock_gettime... none required checking for doxygen... (cached) false checking whether SYS_getrandom is declared... no checking if gcc supports -fvisibility=hidden... yes checking for clock_gettime... yes checking for localtime_r... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether to enable VTY/CTRL tests... no checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.12.0.156-5207 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmocore' Making install in include make[2]: Entering directory '/build/deps/libosmocore/include' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/include' GEN osmocom/core/bit16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc16gen.h make[4]: Entering directory '/build/deps/libosmocore/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/include' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/core' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h '/build/deps/install/stow/libosmocore/include/osmocom/core' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/coding' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h '/build/deps/install/stow/libosmocore/include/osmocom/coding' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/core' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h '/build/deps/install/stow/libosmocore/include/osmocom/core' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/vty' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h '/build/deps/install/stow/libosmocore/include/osmocom/vty' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gsm/protocol' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_29_118.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h '/build/deps/install/stow/libosmocore/include/osmocom/gsm/protocol' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/sim' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h '/build/deps/install/stow/libosmocore/include/osmocom/sim' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gprs' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h '/build/deps/install/stow/libosmocore/include/osmocom/gprs' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/crypt' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h '/build/deps/install/stow/libosmocore/include/osmocom/crypt' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gsm' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm29205.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm29118.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h '/build/deps/install/stow/libosmocore/include/osmocom/gsm' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/ctrl' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h '/build/deps/install/stow/libosmocore/include/osmocom/ctrl' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gprs/protocol' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h '/build/deps/install/stow/libosmocore/include/osmocom/gprs/protocol' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/codec' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h '/build/deps/install/stow/libosmocore/include/osmocom/codec' make[4]: Leaving directory '/build/deps/libosmocore/include' make[3]: Leaving directory '/build/deps/libosmocore/include' make[2]: Leaving directory '/build/deps/libosmocore/include' Making install in src make[2]: Entering directory '/build/deps/libosmocore/src' GEN crc32gen.c GEN crc64gen.c GEN crc8gen.c GEN crc16gen.c make install-am make[3]: Entering directory '/build/deps/libosmocore/src' CC timer_gettimeofday.lo CC timer.lo CC timer_clockgettime.lo CC msgb.lo CC signal.lo CC select.lo CC bitvec.lo CC bits.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC rate_ctr.lo CC logging_gsmtap.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc32gen.lo CC crc16gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo /bin/bash: line 2: 4829 Segmentation fault (core dumped) /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT prim.lo -MD -MP -MF $depbase.Tpo -c -o prim.lo prim.c Makefile:549: recipe for target 'prim.lo' failed make[3]: *** [prim.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/deps/libosmocore/src' Makefile:653: recipe for target 'install' failed make[2]: Leaving directory '/build/deps/libosmocore/src' make[2]: *** [install] Error 2 Makefile:604: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory '/build/deps/libosmocore' Makefile:903: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 16 11:02:13 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 16 Dec 2018 11:02:13 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norm?= =?UTF-8?Q?al_:_master-osmo-sgsn_=C2=BB_--disa?= =?UTF-8?Q?ble-iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7512?= In-Reply-To: <205580966.26.1544945909352.JavaMail.jenkins@jenkins.osmocom.org> References: <205580966.26.1544945909352.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <556020571.28.1544958133222.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 16 12:21:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 16 Dec 2018 12:21:05 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_send.py: fix: use proper argparse group In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12323 ) Change subject: trx_toolkit/burst_send.py: fix: use proper argparse group ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I15d17c134cbbbd54d761113a56c1f83910ab6407 Gerrit-Change-Number: 12323 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 16 Dec 2018 12:21:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 16 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 16 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#341?= In-Reply-To: <1071003503.14.1544886607355.JavaMail.jenkins@jenkins.osmocom.org> References: <1071003503.14.1544886607355.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <900588364.29.1544973007340.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From admin at opensuse.org Sun Dec 16 19:55:56 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Dec 2018 19:55:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5c16adceb1f53_2c2a916680510966@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 96s] /usr/src/packages/BUILD/Transceiver52M/device/lms/LMSDevice.cpp:259: undefined reference to `LMS_Calibrate' [ 96s] /usr/src/packages/BUILD/Transceiver52M/device/lms/LMSDevice.cpp:252: undefined reference to `LMS_SetLPFBW' [ 96s] collect2: error: ld returned 1 exit status [ 96s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 96s] make[4]: *** [LMSDeviceTest] Error 1 [ 96s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 96s] Makefile:401: recipe for target 'all-recursive' failed [ 96s] make[3]: *** [all-recursive] Error 1 [ 96s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 96s] Makefile:516: recipe for target 'all-recursive' failed [ 96s] make[2]: *** [all-recursive] Error 1 [ 96s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 96s] Makefile:447: recipe for target 'all' failed [ 96s] make[1]: *** [all] Error 2 [ 96s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 96s] dh_auto_build: make -j1 returned exit code 2 [ 96s] debian/rules:6: recipe for target 'build' failed [ 96s] make: *** [build] Error 2 [ 96s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 96s] [ 96s] build80 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sun Dec 16 19:55:47 UTC 2018. [ 96s] [ 96s] ### VM INTERACTION START ### [ 99s] [ 90.899158] sysrq: SysRq : Power Off [ 99s] [ 90.901480] reboot: Power down [ 99s] ### VM INTERACTION END ### [ 99s] [ 99s] build80 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sun Dec 16 19:55:50 UTC 2018. [ 99s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 16 19:57:38 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Dec 2018 19:57:38 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5c16ae4444295_2c2a9166805110ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 164s] /usr/src/packages/BUILD/Transceiver52M/device/lms/LMSDevice.cpp:252: u[ 152.624152] serial8250: too much work for irq4 [ 164s] ndefined reference to `LMS_SetLPFBW' [ 164s] collect2: error: ld returned 1 exit status [ 164s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 164s] make[4]: *** [LMSDeviceTest] Error 1 [ 164s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 164s] Makefile:401: recipe for target 'all-recursive' failed [ 164s] make[3]: *** [all-recursive] Error 1 [ 164s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 164s] Makefile:516: recipe for target 'all-recursive' failed [ 164s] make[2]: *** [all-recursive] Error 1 [ 164s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 164s] Makefile:447: recipe for target 'all' failed [ 164s] make[1]: *** [all] Error 2 [ 164s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 164s] dh_auto_build: make -j1 returned exit code 2 [ 164s] debian/rules:6: recipe for target 'build' failed [ 164s] make: *** [build] Error 2 [ 164s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 164s] [ 164s] lamb20 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sun Dec 16 19:57:28 UTC 2018. [ 164s] [ 164s] ### VM INTERACTION START ### [ 167s] [ 155.797448] sysrq: SysRq : Power Off [ 167s] [ 155.805441] reboot: Power down [ 167s] ### VM INTERACTION END ### [ 167s] [ 167s] lamb20 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sun Dec 16 19:57:32 UTC 2018. [ 167s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 16 19:57:38 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Dec 2018 19:57:38 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5c16ae44a2469_2c2a916680511197@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 125s] ../../Transceiver52M/device/lms/.libs/libdevice.a(LMSDevice.o): In function `compat_LMS_VCTCXOWrite': [ 125s] ./Transceiver52M/device/lms/LMSDevice.cpp:58: undefined reference to `LMS_VCTCXOWrite' [ 125s] collect2: error: ld returned 1 exit status [ 125s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 125s] make[4]: *** [LMSDeviceTest] Error 1 [ 125s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 125s] Makefile:401: recipe for target 'all-recursive' failed [ 125s] make[3]: *** [all-recursive] Error 1 [ 125s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 125s] Makefile:516: recipe for target 'all-recursive' failed [ 125s] make[2]: *** [all-recursive] Error 1 [ 125s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 125s] Makefile:447: recipe for target 'all' failed [ 125s] make[1]: *** [all] Error 2 [ 125s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 125s] dh_auto_build: make -j1 returned exit code 2 [ 125s] debian/rules:6: recipe for target 'build' failed [ 125s] make: *** [build] Error 2 [ 125s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 125s] [ 125s] build77 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sun Dec 16 19:57:33 UTC 2018. [ 125s] [ 125s] ### VM INTERACTION START ### [ 129s] [ 119.763141] sysrq: SysRq : Power Off [ 129s] [ 119.764939] reboot: Power down [ 129s] ### VM INTERACTION END ### [ 129s] [ 129s] build77 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sun Dec 16 19:57:37 UTC 2018. [ 129s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 16 19:57:56 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Dec 2018 19:57:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5c16ae6356b93_2c2a916680511245@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 179s] ../../Transceiver52M/device/lms/.libs/libdevice.a(LMSDevice.o): In function `compat_LMS_VCTCXOWrite': [ 179s] ./Transceiver52M/device/lms/LMSDevice.cpp:58: undefined reference to `LMS_VCTCXOWrite' [ 179s] collect2: error: ld returned 1 exit status [ 179s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 179s] make[4]: *** [LMSDeviceTest] Error 1 [ 179s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 179s] Makefile:401: recipe for target 'all-recursive' failed [ 179s] make[3]: *** [all-recursive] Error 1 [ 179s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 179s] Makefile:516: recipe for target 'all-recursive' failed [ 179s] make[2]: *** [all-recursive] Error 1 [ 179s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 179s] Makefile:447: recipe for target 'all' failed [ 179s] make[1]: *** [all] Error 2 [ 179s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 179s] dh_auto_build: make -j1 returned exit code 2 [ 179s] debian/rules:6: recipe for target 'build' failed [ 179s] make: *** [build] Error 2 [ 179s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 179s] [ 179s] lamb05 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sun Dec 16 19:57:37 UTC 2018. [ 179s] [ 179s] ### VM INTERACTION START ### [ 183s] [ 172.091221] sysrq: SysRq : Power Off [ 183s] [ 172.098951] reboot: Power down [ 183s] ### VM INTERACTION END ### [ 183s] [ 183s] lamb05 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sun Dec 16 19:57:41 UTC 2018. [ 183s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 16 19:57:56 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Dec 2018 19:57:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5c16ae643d588_2c2a9166805113a3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 173s] ../../Transceiver52M/device/lms/.libs/libdevice.a(LMSDevice.o): In function `compat_LMS_VCTCXOWrite': [ 173s] ./Transceiver52M/device/lms/LMSDevice.cpp:58: undefined reference to `LMS_VCTCXOWrite' [ 173s] collect2: error: ld returned 1 exit status [ 173s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 173s] make[4]: *** [LMSDeviceTest] Error 1 [ 173s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 173s] Makefile:401: recipe for target 'all-recursive' failed [ 173s] make[3]: *** [all-recursive] Error 1 [ 173s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 173s] Makefile:516: recipe for target 'all-recursive' failed [ 173s] make[2]: *** [all-recursive] Error 1 [ 173s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 173s] Makefile:447: recipe for target 'all' failed [ 173s] make[1]: *** [all] Error 2 [ 173s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 173s] dh_auto_build: make -j1 returned exit code 2 [ 173s] debian/rules:6: recipe for target 'build' failed [ 173s] make: *** [build] Error 2 [ 173s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 173s] [ 173s] lamb16 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sun Dec 16 19:57:50 UTC 2018. [ 173s] [ 173s] ### VM INTERACTION START ### [ 176s] [ 165.940410] sysrq: SysRq : Power Off [ 176s] [ 165.947843] reboot: Power down [ 176s] ### VM INTERACTION END ### [ 176s] [ 176s] lamb16 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sun Dec 16 19:57:53 UTC 2018. [ 176s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 16 19:58:47 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 16 Dec 2018 19:58:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5c16ae833a2d5_2c2a9166805114aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 121s] ../../Transceiver52M/device/lms/.libs/libdevice.a(LMSDevice.o): In function `compat_LMS_VCTCXOWrite': [ 121s] ./Transceiver52M/device/lms/LMSDevice.cpp:58: undefined reference to `LMS_VCTCXOWrite' [ 121s] collect2: error: ld returned 1 exit status [ 121s] Makefile:461: recipe for target 'LMSDeviceTest' failed [ 121s] make[4]: *** [LMSDeviceTest] Error 1 [ 121s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/Transceiver52M' [ 121s] Makefile:401: recipe for target 'all-recursive' failed [ 121s] make[3]: *** [all-recursive] Error 1 [ 121s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 121s] Makefile:516: recipe for target 'all-recursive' failed [ 121s] make[2]: *** [all-recursive] Error 1 [ 121s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 121s] Makefile:447: recipe for target 'all' failed [ 121s] make[1]: *** [all] Error 2 [ 121s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 121s] dh_auto_build: make -j1 returned exit code 2 [ 121s] debian/rules:6: recipe for target 'build' failed [ 121s] make: *** [build] Error 2 [ 121s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 121s] [ 121s] build72 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sun Dec 16 19:58:41 UTC 2018. [ 121s] [ 121s] ### VM INTERACTION START ### [ 124s] [ 115.673585] sysrq: SysRq : Power Off [ 124s] [ 115.675604] reboot: Power down [ 124s] ### VM INTERACTION END ### [ 124s] [ 124s] build72 failed "build osmo-trx_0.4.0.123.affd.dsc" at Sun Dec 16 19:58:44 UTC 2018. [ 124s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Dec 17 07:02:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Dec 2018 07:02:43 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: fix missing / useless imports In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12322 ) Change subject: trx_toolkit: fix missing / useless imports ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0c42319b445db218b77fd5e99a9a0a89724281d Gerrit-Change-Number: 12322 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Dec 2018 07:02:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 07:02:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Dec 2018 07:02:58 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: fix missing / useless imports In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12322 ) Change subject: trx_toolkit: fix missing / useless imports ...................................................................... trx_toolkit: fix missing / useless imports Found using Flake8: - data_if.py:57:4: F405 'log' may be undefined, or defined from star imports: data_msg - clck_gen.py:29:1: F401 'time' imported but unused - clck_gen.py:30:1: F401 'sys' imported but unused - trx_sniff.py:28:1: F401 'signal' imported but unused Change-Id: Id0c42319b445db218b77fd5e99a9a0a89724281d --- M src/target/trx_toolkit/burst_send.py M src/target/trx_toolkit/clck_gen.py M src/target/trx_toolkit/data_if.py M src/target/trx_toolkit/trx_sniff.py 4 files changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 3745b39..0cf63bb 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -32,7 +32,6 @@ from app_common import ApplicationBase from data_dump import DATADumpFile from data_if import DATAInterface -from gsm_shared import * from data_msg import * class Application(ApplicationBase): diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index 40964dd..6c2cbf8 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -26,8 +26,6 @@ import logging as log import signal -import time -import sys from app_common import ApplicationBase from threading import Timer diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index 45114ed..79584da 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -22,6 +22,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import logging as log + from udp_link import UDPLink from data_msg import * diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py index e169c72..19ea8e6 100755 --- a/src/target/trx_toolkit/trx_sniff.py +++ b/src/target/trx_toolkit/trx_sniff.py @@ -25,7 +25,6 @@ APP_CR_HOLDERS = [("2018", "Vadim Yanitskiy ")] import logging as log -import signal import argparse import sys -- To view, visit https://gerrit.osmocom.org/12322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id0c42319b445db218b77fd5e99a9a0a89724281d Gerrit-Change-Number: 12322 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 07:02:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Dec 2018 07:02:58 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_send.py: fix: use proper argparse group In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12323 ) Change subject: trx_toolkit/burst_send.py: fix: use proper argparse group ...................................................................... trx_toolkit/burst_send.py: fix: use proper argparse group Found using Flake8, F841 "local variable 'pf_group' is assigned to but never used". The filtering related options should be defined in 'pf_group' group, not in 'cnt_group'. Change-Id: I15d17c134cbbbd54d761113a56c1f83910ab6407 --- M src/target/trx_toolkit/burst_send.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 0cf63bb..7186863 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -134,13 +134,13 @@ help = "Stop after sending N messages") pf_group = parser.add_argument_group("Filtering (optional)") - cnt_group.add_argument("--timeslot", metavar = "TN", + pf_group.add_argument("--timeslot", metavar = "TN", dest = "pf_tn", type = int, choices = range(0, 8), help = "TDMA timeslot number (equal TN)") - cnt_group.add_argument("--frame-num-lt", metavar = "FN", + pf_group.add_argument("--frame-num-lt", metavar = "FN", dest = "pf_fn_lt", type = int, help = "TDMA frame number (lower than FN)") - cnt_group.add_argument("--frame-num-gt", metavar = "FN", + pf_group.add_argument("--frame-num-gt", metavar = "FN", dest = "pf_fn_gt", type = int, help = "TDMA frame number (greater than FN)") -- To view, visit https://gerrit.osmocom.org/12323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I15d17c134cbbbd54d761113a56c1f83910ab6407 Gerrit-Change-Number: 12323 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 07:03:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Dec 2018 07:03:13 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_send.py: exit if DATA dump parsing failed In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12324 ) Change subject: trx_toolkit/burst_send.py: exit if DATA dump parsing failed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5443efb39bb9d3377290ce7ec5e34016cae0edb2 Gerrit-Change-Number: 12324 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Dec 2018 07:03:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 07:03:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Dec 2018 07:03:58 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_bb.py: drop meaningless warnings In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12291 ) Change subject: trx_toolkit/ctrl_if_bb.py: drop meaningless warnings ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a69ebceed5aa724093e6d1b23faad8c16705055 Gerrit-Change-Number: 12291 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Mon, 17 Dec 2018 07:03:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 07:06:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Dec 2018 07:06:51 +0000 Subject: Change in osmocom-bb[master]: mobile: Use new VTY telnet API to allow binding to random port In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12326 ) Change subject: mobile: Use new VTY telnet API to allow binding to random port ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a6214aec2dcb92495038ea8311c0df22fa8d07b Gerrit-Change-Number: 12326 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 07:06:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 07:08:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Dec 2018 07:08:15 +0000 Subject: Change in libosmocore[master]: vty: Introduce telnet_init_default and make vty port configurable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12321 ) Change subject: vty: Introduce telnet_init_default and make vty port configurable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 07:08:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 09:34:24 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 17 Dec 2018 09:34:24 +0000 Subject: Change in osmo-trx[master]: LMSDeviceTest: fix link errors on OBS Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12327 Change subject: LMSDeviceTest: fix link errors on OBS ...................................................................... LMSDeviceTest: fix link errors on OBS Link LMSDeviceTest against LMS_LIBS, so it does not only compile on Debian, but also on Ubuntu and openSUSE. Thanks to roox for figuring this out. Related: OS#3654 Change-Id: I6980d4290f623485a77db10fea6d17de0321c092 --- M tests/Transceiver52M/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/27/12327/1 diff --git a/tests/Transceiver52M/Makefile.am b/tests/Transceiver52M/Makefile.am index df3ae57..1f8aa7a 100644 --- a/tests/Transceiver52M/Makefile.am +++ b/tests/Transceiver52M/Makefile.am @@ -23,6 +23,7 @@ LMSDeviceTest_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LMS_LIBS) LMSDeviceTest_LDADD = \ $(top_builddir)/Transceiver52M/device/lms/libdevice.la \ - $(COMMON_LA) + $(COMMON_LA) \ + $(LMS_LIBS) LMSDeviceTest_CPPFLAGS = $(AM_CPPFLAGS) $(LMS_CFLAGS) endif -- To view, visit https://gerrit.osmocom.org/12327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6980d4290f623485a77db10fea6d17de0321c092 Gerrit-Change-Number: 12327 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 09:34:33 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 09:34:33 +0000 Subject: Change in libosmocore[master]: vty: Introduce telnet_init_default and make vty port configurable In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12321 ) Change subject: vty: Introduce telnet_init_default and make vty port configurable ...................................................................... Patch Set 1: I can test it today. Let's mark it as WIP for now? Code looks good, but it was hard to understand the key idea from the commit message. I think, it makes sense to extend / rephrase it a bit? -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 09:34:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 09:38:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 17 Dec 2018 09:38:59 +0000 Subject: Change in osmo-trx[master]: LMSDeviceTest: fix link errors on OBS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12327 ) Change subject: LMSDeviceTest: fix link errors on OBS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6980d4290f623485a77db10fea6d17de0321c092 Gerrit-Change-Number: 12327 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Dec 2018 09:38:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 09:39:50 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 09:39:50 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity ...................................................................... Patch Set 3: (1 comment) This change is ready for review. https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c at 51 PS2, Line 51: struct osmo_sccp_user *scu, int conn_id) > TBH, this looks ugly. I am not a big fun of such fancy [?] How this makes it worse? The line I've added is properly aligned. Feel free to submit patch which aligns the rest of them right. -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 17 Dec 2018 09:39:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 09:40:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 09:40:07 +0000 Subject: Change in osmo-trx[master]: LMSDeviceTest: fix link errors on OBS In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12327 ) Change subject: LMSDeviceTest: fix link errors on OBS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6980d4290f623485a77db10fea6d17de0321c092 Gerrit-Change-Number: 12327 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 09:40:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 09:41:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 09:41:57 +0000 Subject: Change in osmo-trx[master]: LMSDeviceTest: fix link errors on OBS In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12327 ) Change subject: LMSDeviceTest: fix link errors on OBS ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12327/1/tests/Transceiver52M/Makefile.am File tests/Transceiver52M/Makefile.am: https://gerrit.osmocom.org/#/c/12327/1/tests/Transceiver52M/Makefile.am at 23 PS1, Line 23: LMSDeviceTest_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LMS_LIBS) Strange it dosn't work without LDADD though, because it's already in LDFLAGS! Probably some autofoo black magic I'm unaware of. -- To view, visit https://gerrit.osmocom.org/12327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6980d4290f623485a77db10fea6d17de0321c092 Gerrit-Change-Number: 12327 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 09:41:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 09:43:45 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 17 Dec 2018 09:43:45 +0000 Subject: Change in osmo-trx[master]: LMSDeviceTest: fix link errors on OBS In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12327 ) Change subject: LMSDeviceTest: fix link errors on OBS ...................................................................... LMSDeviceTest: fix link errors on OBS Link LMSDeviceTest against LMS_LIBS, so it does not only compile on Debian, but also on Ubuntu and openSUSE. Thanks to roox for figuring this out. Related: OS#3654 Change-Id: I6980d4290f623485a77db10fea6d17de0321c092 --- M tests/Transceiver52M/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/Transceiver52M/Makefile.am b/tests/Transceiver52M/Makefile.am index df3ae57..1f8aa7a 100644 --- a/tests/Transceiver52M/Makefile.am +++ b/tests/Transceiver52M/Makefile.am @@ -23,6 +23,7 @@ LMSDeviceTest_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LMS_LIBS) LMSDeviceTest_LDADD = \ $(top_builddir)/Transceiver52M/device/lms/libdevice.la \ - $(COMMON_LA) + $(COMMON_LA) \ + $(LMS_LIBS) LMSDeviceTest_CPPFLAGS = $(AM_CPPFLAGS) $(LMS_CFLAGS) endif -- To view, visit https://gerrit.osmocom.org/12327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6980d4290f623485a77db10fea6d17de0321c092 Gerrit-Change-Number: 12327 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 09:52:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 09:52:14 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_send.py: exit if DATA dump parsing failed In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12324 ) Change subject: trx_toolkit/burst_send.py: exit if DATA dump parsing failed ...................................................................... trx_toolkit/burst_send.py: exit if DATA dump parsing failed False is not iterable, so we should properly handle the case when parsing of the whole DATA dump was failed (e.g. due to incorrect offset specified). Change-Id: I5443efb39bb9d3377290ce7ec5e34016cae0edb2 --- M src/target/trx_toolkit/burst_send.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py index 7186863..6c19e6f 100755 --- a/src/target/trx_toolkit/burst_send.py +++ b/src/target/trx_toolkit/burst_send.py @@ -63,7 +63,8 @@ messages = self.ddf.parse_all( skip = self.argv.cnt_skip, count = self.argv.cnt_count) if messages is False: - pass # FIXME!!! + log.error("Parsing failed, nothing to send") + sys.exit(1) for msg in messages: # Pass filter -- To view, visit https://gerrit.osmocom.org/12324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5443efb39bb9d3377290ce7ec5e34016cae0edb2 Gerrit-Change-Number: 12324 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 09:52:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 09:52:15 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/ctrl_if_bb.py: drop meaningless warnings In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12291 ) Change subject: trx_toolkit/ctrl_if_bb.py: drop meaningless warnings ...................................................................... trx_toolkit/ctrl_if_bb.py: drop meaningless warnings A timeslot can be reconfigured at runtime, this is normal. We should neither complain nor reject such commands. Change-Id: I0a69ebceed5aa724093e6d1b23faad8c16705055 --- M src/target/trx_toolkit/ctrl_if_bb.py 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index fe7f3e8..d25aa30 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -114,18 +114,10 @@ # Deactivate TS (remove from TS pass-filter list) if ts in self.burst_fwd.ts_pass_list: self.burst_fwd.ts_pass_list.remove(ts) - else: - log.warning("TS %u was not activated before" % ts) - # TODO: uncomment as soon as RESET is introduced - # return -1 else: # Activate TS (add to TS pass-filter list) if ts not in self.burst_fwd.ts_pass_list: self.burst_fwd.ts_pass_list.append(ts) - else: - log.warning("TS %u was already activated before" % ts) - # TODO: uncomment as soon as RESET is introduced - # return -1 return 0 -- To view, visit https://gerrit.osmocom.org/12291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0a69ebceed5aa724093e6d1b23faad8c16705055 Gerrit-Change-Number: 12291 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 10:21:38 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 10:21:38 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c at 51 PS2, Line 51: struct osmo_sccp_user *scu, int conn_id) > How this makes it worse? The line I've added is properly aligned. [?] Programmers arguing about whitespace? Unheard of! -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 10:21:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 10:23:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 10:23:19 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity ...................................................................... Patch Set 3: Code-Review+1 I don't see any harm from this but it would be nice to have a more clearly defined use case. -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 17 Dec 2018 10:23:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 10:31:15 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 10:31:15 +0000 Subject: Change in libosmocore[master]: vty: Introduce telnet_init_default and make vty port configurable In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12321 ) Change subject: vty: Introduce telnet_init_default and make vty port configurable ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12321/1/src/vty/telnet_interface.c File src/vty/telnet_interface.c: https://gerrit.osmocom.org/#/c/12321/1/src/vty/telnet_interface.c at 111 PS1, Line 111: * \param[in] default_port UDP port number to use if not explicitely configured UDP? Doesn't telnet/VTY run over TCP in this universe? -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 10:31:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 10:35:38 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 10:35:38 +0000 Subject: Change in osmocom-bb[master]: mobile: Use new VTY telnet API to allow binding to random port In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12326 ) Change subject: mobile: Use new VTY telnet API to allow binding to random port ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a6214aec2dcb92495038ea8311c0df22fa8d07b Gerrit-Change-Number: 12326 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 10:35:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 10:44:15 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 10:44:15 +0000 Subject: Change in osmo-sysmon[master]: Use absolute path for default config In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12319 ) Change subject: Use absolute path for default config ...................................................................... Patch Set 1: > Login shell has already been added through a script, so no issue with that. Let's keep the default file like in all other osmocom projects. Couldn't a long shell simply be invokved with the -c option and pass an abspath? Or is that beyond the capabilities of the login implementation used on systems where sysmon will be run? -- To view, visit https://gerrit.osmocom.org/12319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37c559af99872de9290335699e2118924ae2156a Gerrit-Change-Number: 12319 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 10:44:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 10:47:01 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 10:47:01 +0000 Subject: Change in osmo-sysmon[master]: ctrl: log host/port on errors In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12318 ) Change subject: ctrl: log host/port on errors ...................................................................... Patch Set 1: > What would be the right approach to make host:port available for logging than? Perhaps store the information you need to log in struct simple_ctrl_handle? -- To view, visit https://gerrit.osmocom.org/12318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Gerrit-Change-Number: 12318 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 10:47:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 10:48:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 10:48:57 +0000 Subject: Change in osmo-sysmon[master]: ctrl: make config structure public In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12316 ) Change subject: ctrl: make config structure public ...................................................................... Patch Set 1: Feels like this patch wouldn't be needed if you stored a copy of the host/port tuple in simple_ctrl_handle instead? -- To view, visit https://gerrit.osmocom.org/12316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Gerrit-Change-Number: 12316 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 10:48:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 10:50:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 10:50:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: actualize both GSUP_SM_RP_{DA|OA} In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12304 ) Change subject: library/GSUP_Types.ttcn: actualize both GSUP_SM_RP_{DA|OA} ...................................................................... Patch Set 1: Code-Review+1 Looks like you know what you're doing :) -- To view, visit https://gerrit.osmocom.org/12304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I001cec53a80028ff153db3d8b0318b298f2bd8c2 Gerrit-Change-Number: 12304 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 10:50:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 10:55:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 10:55:15 +0000 Subject: Change in osmo-sysmon[master]: Use absolute path for default config In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12319 ) Change subject: Use absolute path for default config ...................................................................... Patch Set 1: > > Login shell has already been added through a script, so no issue > with that. Let's keep the default file like in all other osmocom > projects. > > > Couldn't a long shell simply be invokved with the -c option and > pass an abspath? Or is that beyond the capabilities of the login > implementation used on systems where sysmon will be run? I tested that and it doesn't allow passing parameters, it takes everything (including spaces) as path to a binary (and then is unable to find it). Using a specific .sh file to run the command has already been tested and already deployed. -- To view, visit https://gerrit.osmocom.org/12319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37c559af99872de9290335699e2118924ae2156a Gerrit-Change-Number: 12319 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 10:55:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 10:58:53 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 10:58:53 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11992 ) Change subject: libmsc/gsm_09_11.c: implement guard timer for NCSS sessions ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/11992/7/src/libmsc/gsm_09_11.c File src/libmsc/gsm_09_11.c: https://gerrit.osmocom.org/#/c/11992/7/src/libmsc/gsm_09_11.c at 62 PS7, Line 62: /* Release connection (if any) with subscriber */ There is a comment elsewhere in this file, above another call to trans_free(trans) which says: /* TODO: release connection with subscriber */ It looks like a general cleanup function might be useful, which could be invoked from this timeout handler and from other places? Perhaps not in this patch, but in a future patch? -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 10:58:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 11:05:31 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 11:05:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11924 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} ...................................................................... Patch Set 5: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/11924/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11924/5//COMMIT_MSG at 10 PS5, Line 10: initiated by ESME over GSUP. Basically, the algorythm is spelling: "algorithm" https://gerrit.osmocom.org/#/c/11924/5/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11924/5/msc/MSC_Tests.ttcn at 2160 PS5, Line 2160: sm_rp_ui := '00068021436500008111328130858200'O, What information is encoded in this string? It might be obvious to those familiar with the data structures involved, but a comment here could help readers who are unfamiliar with them. -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Mon, 17 Dec 2018 11:05:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 11:07:50 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 11:07:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12058 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms ...................................................................... Patch Set 3: Code-Review+1 Looks fine to me. -- To view, visit https://gerrit.osmocom.org/12058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6308586a70c4fb3254c519330a61a9667372149f Gerrit-Change-Number: 12058 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 11:07:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 11:12:13 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 11:12:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11776 ) Change subject: MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP ...................................................................... Patch Set 5: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/11776/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11776/5//COMMIT_MSG at 10 PS5, Line 10: over GSUP towards HLR. The algorythm is equivalent to MO SMS. spelling: "algorithm" https://gerrit.osmocom.org/#/c/11776/5/msc/BSC_ConnectionHandler.ttcn File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/#/c/11776/5/msc/BSC_ConnectionHandler.ttcn at 817 PS5, Line 817: /* just in case this is routed to SMPP.. */ This comment assumes the reader already knows about the consequences of routing over SMPP, so it doesn't really explain anything. What does routing over SMPP imply? -- To view, visit https://gerrit.osmocom.org/11776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7abc95b8e416f7308d54e11be11c08586d18e6c5 Gerrit-Change-Number: 11776 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 11:12:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 11:27:18 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 11:27:18 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11991 ) Change subject: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE ...................................................................... Patch Set 4: Code-Review+1 I also think updating libosmocore would be better, but won't stand in the way of this patch getting merged first. If you are pressed for time now, there's nothing much that can be done about it. Maybe you will find time later? -- To view, visit https://gerrit.osmocom.org/11991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I89727354385b40e18732e8fd1d6c93f4463ade37 Gerrit-Change-Number: 11991 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 11:27:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 11:28:32 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 11:28:32 +0000 Subject: Change in osmo-hlr[master]: gsupclient: add osmo_gsup_msg_enc_send() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: add osmo_gsup_msg_enc_send() ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 11:28:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 11:30:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 11:30:20 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 11:30:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 11:31:38 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 11:31:38 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Patch Set 7: Code-Review+1 Looks good to me now. -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 11:31:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 11:49:46 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 11:49:46 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 3: Code-Review+1 I agree with Max: More information in the log message couldn't hurt. -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 11:49:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 11:51:56 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 11:51:56 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12236 ) Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Max Gerrit-Comment-Date: Mon, 17 Dec 2018 11:51:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 12:14:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 12:14:33 +0000 Subject: Change in osmo-msc[master]: cosmetic: drop duplicated #include Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12328 Change subject: cosmetic: drop duplicated #include ...................................................................... cosmetic: drop duplicated #include Change-Id: I216425ba5994a49981d51bce6cfa7c3fa5fe9e40 --- M src/libmsc/transaction.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/28/12328/1 diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 47124a0..a0f7b31 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -24,7 +24,6 @@ #include #include #include -#include #include void *tall_trans_ctx; -- To view, visit https://gerrit.osmocom.org/12328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I216425ba5994a49981d51bce6cfa7c3fa5fe9e40 Gerrit-Change-Number: 12328 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 12:14:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 12:14:33 +0000 Subject: Change in osmo-msc[master]: MNCC: use log wrapper for call processing Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12329 Change subject: MNCC: use log wrapper for call processing ...................................................................... MNCC: use log wrapper for call processing Add log/debug wrappers to conveniently print local and remote call references. Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 --- M src/libmsc/mncc_builtin.c 1 file changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/12329/1 diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c index 135a5e4..f3fe128 100644 --- a/src/libmsc/mncc_builtin.c +++ b/src/libmsc/mncc_builtin.c @@ -35,6 +35,9 @@ #include #include +#define DEBUGCC(ss, l, r, fmt, args...) DEBUGP(ss, "(call %x, remote %x) " fmt "\n", l->callref, r->callref, ##args) +#define LOGCC(ss, ll, l, r, fmt, args...) LOGP(ss, ll, "(call %x, remote %x) " fmt "\n", l->callref, r->callref, ##args) + void *tall_call_ctx; static LLIST_HEAD(call_list); @@ -105,8 +108,7 @@ llist_add_tail(&remote->entry, &call_list); remote->net = call->net; remote->callref = new_callref++; - DEBUGP(DMNCC, "(call %x) Creating new remote instance %x.\n", - call->callref, remote->callref); + DEBUGCC(DMNCC, call, remote, "Creating new remote instance."); /* link remote call */ call->remote_ref = remote->callref; @@ -115,20 +117,20 @@ /* send call proceeding */ memset(&mncc, 0, sizeof(struct gsm_mncc)); mncc.callref = call->callref; - DEBUGP(DMNCC, "(call %x) Accepting call.\n", call->callref); + DEBUGCC(DMNCC, call, remote, "Accepting call."); mncc_tx_to_cc(call->net, MNCC_CALL_PROC_REQ, &mncc); /* modify mode */ memset(&mncc, 0, sizeof(struct gsm_mncc)); mncc.callref = call->callref; - DEBUGP(DMNCC, "(call %x) Modify channel mode\n", call->callref); + DEBUGCC(DMNCC, call, remote, "Modify channel mode."); mncc_tx_to_cc(call->net, MNCC_LCHAN_MODIFY, &mncc); /* send setup to remote */ // setup->fields |= MNCC_F_SIGNAL; // setup->signal = GSM48_SIGNAL_DIALTONE; setup->callref = remote->callref; - DEBUGP(DMNCC, "(call %x) Forwarding SETUP to remote.\n", call->callref); + DEBUGCC(DMNCC, call, remote, "Forwarding SETUP to remote."); return mncc_tx_to_cc(remote->net, MNCC_SETUP_REQ, setup); out_reject: @@ -146,7 +148,7 @@ if (!(remote = get_call_ref(call->remote_ref))) return 0; alert->callref = remote->callref; - DEBUGP(DMNCC, "(call %x) Forwarding ALERT to remote.\n", call->callref); + DEBUGCC(DMNCC, call, remote, "Forwarding ALERT to remote."); return mncc_tx_to_cc(remote->net, MNCC_ALERT_REQ, alert); } @@ -159,7 +161,7 @@ if (!(remote = get_call_ref(call->remote_ref))) return 0; notify->callref = remote->callref; - DEBUGP(DMNCC, "(call %x) Forwarding NOTIF to remote.\n", call->callref); + DEBUGCC(DMNCC, call, remote, "Forwarding NOTIF to remote."); return mncc_tx_to_cc(remote->net, MNCC_NOTIFY_REQ, notify); } @@ -180,13 +182,13 @@ if (!(remote = get_call_ref(call->remote_ref))) return 0; connect->callref = remote->callref; - DEBUGP(DMNCC, "(call %x) Sending CONNECT to remote.\n", call->callref); + DEBUGCC(DMNCC, call, remote, "Sending CONNECT to remote."); mncc_tx_to_cc(remote->net, MNCC_SETUP_RSP, connect); /* bridge tch */ bridge.callref[0] = call->callref; bridge.callref[1] = call->remote_ref; - DEBUGP(DMNCC, "(call %x) Bridging with remote.\n", call->callref); + DEBUGCC(DMNCC, call, remote, "Bridging with remote."); return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge); } @@ -206,8 +208,7 @@ return 0; } disc->callref = remote->callref; - DEBUGP(DMNCC, "(call %x) Disconnecting remote with cause %d\n", - remote->callref, disc->cause.value); + DEBUGCC(DMNCC, call, remote, "Disconnecting remote with cause %d", disc->cause.value); return mncc_tx_to_cc(remote->net, MNCC_DISC_REQ, disc); } @@ -222,8 +223,7 @@ } rel->callref = remote->callref; - DEBUGP(DMNCC, "(call %x) Releasing remote with cause %d\n", - call->callref, rel->cause.value); + DEBUGCC(DMNCC, call, remote, "Releasing remote with cause %d", rel->cause.value); /* * Release this side of the call right now. Otherwise we end up -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 12:14:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 12:14:33 +0000 Subject: Change in osmo-msc[master]: Use proper type for tch_rtp_connect() parameter Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12330 Change subject: Use proper type for tch_rtp_connect() parameter ...................................................................... Use proper type for tch_rtp_connect() parameter Change-Id: I6e2efcd2e25d6ec2ff35a4b8cfcda02abe97fa59 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/30/12330/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index a172b47..3fe427e 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1761,10 +1761,9 @@ return 0; } -static int tch_rtp_connect(struct gsm_network *net, void *arg) +static int tch_rtp_connect(struct gsm_network *net, struct gsm_mncc_rtp *rtp) { struct gsm_trans *trans; - struct gsm_mncc_rtp *rtp = arg; struct in_addr addr; /* FIXME: in *rtp we should get the codec information of the remote -- To view, visit https://gerrit.osmocom.org/12330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6e2efcd2e25d6ec2ff35a4b8cfcda02abe97fa59 Gerrit-Change-Number: 12330 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 12:14:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 12:14:33 +0000 Subject: Change in osmo-msc[master]: MNCC: internalize bridge error handling Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12331 Change subject: MNCC: internalize bridge error handling ...................................................................... MNCC: internalize bridge error handling This can be handled internally instead of checking tch_bridge() outcome and than calling disconnect_bridge() with the same arguments. Change-Id: I66f6fac254d78dcf64bcb6aa4a443b899fb378a7 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 30 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/31/12331/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 3fe427e..723c9f3 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -345,6 +345,31 @@ return 0; } +static int gsm48_cc_tx_disconnect(struct gsm_trans *trans, void *arg); + +/* disconnect both calls from the bridge */ +static inline int disconnect_bridge(struct gsm_trans *trans0, struct gsm_trans *trans1, int err) +{ + struct gsm_mncc mx_rel; + if (!trans0 || !trans1) + return -err; + + DEBUGP(DCC, "Failed to bridge TCH for calls %x <-> %x :: %s \n", + trans0->callref, trans1->callref, strerror(err)); + + memset(&mx_rel, 0, sizeof(struct gsm_mncc)); + mncc_set_cause(&mx_rel, GSM48_CAUSE_LOC_INN_NET, + GSM48_CC_CAUSE_CHAN_UNACCEPT); + + mx_rel.callref = trans0->callref; + gsm48_cc_tx_disconnect(trans0, &mx_rel); + + mx_rel.callref = trans1->callref; + gsm48_cc_tx_disconnect(trans1, &mx_rel); + + return -err; +} + /* bridge channels of two transactions */ static int tch_bridge(struct gsm_network *net, struct gsm_mncc_bridge *bridge) { @@ -353,10 +378,10 @@ int rc; if (!trans1 || !trans2) - return -EIO; + return disconnect_bridge(trans1, trans2, EIO); if (!trans1->conn || !trans2->conn) - return -EIO; + return disconnect_bridge(trans1, trans2, EIO); /* Which subscriber do we want to track trans1 or trans2? */ log_set_context(LOG_CTX_VLR_SUBSCR, trans1->vsub); @@ -374,12 +399,12 @@ rc = msc_mgcp_call_complete(trans1, trans2->conn->rtp.local_port_cn, trans2->conn->rtp.local_addr_cn); if (rc) - return -EINVAL; + return disconnect_bridge(trans1, trans2, EINVAL); rc = msc_mgcp_call_complete(trans2, trans1->conn->rtp.local_port_cn, trans1->conn->rtp.local_addr_cn); if (rc) - return -EINVAL; + return disconnect_bridge(trans1, trans2, EINVAL); return 0; } @@ -391,7 +416,6 @@ } static int gsm48_cc_tx_release(struct gsm_trans *trans, void *arg); -static int gsm48_cc_tx_disconnect(struct gsm_trans *trans, void *arg); static void gsm48_cc_timeout(void *arg) { @@ -475,30 +499,6 @@ } -/* disconnect both calls from the bridge */ -static inline void disconnect_bridge(struct gsm_network *net, - struct gsm_mncc_bridge *bridge, int err) -{ - struct gsm_trans *trans0 = trans_find_by_callref(net, bridge->callref[0]); - struct gsm_trans *trans1 = trans_find_by_callref(net, bridge->callref[1]); - struct gsm_mncc mx_rel; - if (!trans0 || !trans1) - return; - - DEBUGP(DCC, "Failed to bridge TCH for calls %x <-> %x :: %s \n", - trans0->callref, trans1->callref, strerror(err)); - - memset(&mx_rel, 0, sizeof(struct gsm_mncc)); - mncc_set_cause(&mx_rel, GSM48_CAUSE_LOC_INN_NET, - GSM48_CC_CAUSE_CHAN_UNACCEPT); - - mx_rel.callref = trans0->callref; - gsm48_cc_tx_disconnect(trans0, &mx_rel); - - mx_rel.callref = trans1->callref; - gsm48_cc_tx_disconnect(trans1, &mx_rel); -} - static void gsm48_start_cc_timer(struct gsm_trans *trans, int current, int sec, int micro) { @@ -1865,10 +1865,7 @@ /* handle special messages */ switch(msg_type) { case MNCC_BRIDGE: - rc = tch_bridge(net, arg); - if (rc < 0) - disconnect_bridge(net, arg, -rc); - return rc; + return tch_bridge(net, arg); case MNCC_RTP_CREATE: return tch_rtp_create(net, data->callref); case MNCC_RTP_CONNECT: -- To view, visit https://gerrit.osmocom.org/12331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I66f6fac254d78dcf64bcb6aa4a443b899fb378a7 Gerrit-Change-Number: 12331 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 12:24:07 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 12:24:07 +0000 Subject: Change in osmo-sysmon[master]: Use absolute path for default config In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12319 ) Change subject: Use absolute path for default config ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I37c559af99872de9290335699e2118924ae2156a Gerrit-Change-Number: 12319 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 12:28:21 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 12:28:21 +0000 Subject: Change in osmo-sysmon[master]: ctrl: log host/port on errors In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12318 ) Change subject: ctrl: log host/port on errors ...................................................................... Patch Set 1: > Patch Set 1: > > > What would be the right approach to make host:port available for logging than? > > Perhaps store the information you need to log in struct simple_ctrl_handle? It'll breaks layering as well: we'll either have to duplicate host:port info from anonymous struct inside config and keep it in sync or move this data out of config. Both ways seems worse to me - we either loose single source of truth or we spread config parameters over several structs. -- To view, visit https://gerrit.osmocom.org/12318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Gerrit-Change-Number: 12318 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 12:28:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:03:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 13:03:15 +0000 Subject: Change in docker-playground[master]: MSC: use config file for mncc path In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12277 ) Change subject: MSC: use config file for mncc path ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I689cfb3bad09b76859ef7e42c1312c636eebe637 Gerrit-Change-Number: 12277 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 17 Dec 2018 13:03:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:03:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 13:03:20 +0000 Subject: Change in docker-playground[master]: MSC: use config file for mncc path In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12277 ) Change subject: MSC: use config file for mncc path ...................................................................... MSC: use config file for mncc path Use config file parameter instead of command line option for MNCC socket path. Change-Id: I689cfb3bad09b76859ef7e42c1312c636eebe637 --- M ttcn3-msc-test/jenkins.sh M ttcn3-msc-test/osmo-msc.cfg 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: daniel: Looks good to me, approved Harald Welte: Looks good to me, approved osmith: Looks good to me, but someone else must approve Max: Verified diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 662c377..82ec483 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -38,7 +38,7 @@ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-msc -d \ $REPO_USER/osmo-msc-$IMAGE_SUFFIX \ - /usr/local/bin/osmo-msc -M /data/unix/mncc + /usr/local/bin/osmo-msc echo Starting container with MSC testsuite docker run --rm \ diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg index f0180d8..4c3555b 100644 --- a/ttcn3-msc-test/osmo-msc.cfg +++ b/ttcn3-msc-test/osmo-msc.cfg @@ -73,6 +73,7 @@ cs7-instance-iu 0 mgw remote-ip 172.18.1.103 emergency-call route-to-msisdn 112 + mncc external /data/unix/mncc mncc-int default-codec tch-f fr default-codec tch-h hr -- To view, visit https://gerrit.osmocom.org/12277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I689cfb3bad09b76859ef7e42c1312c636eebe637 Gerrit-Change-Number: 12277 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:03:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 13:03:46 +0000 Subject: Change in osmo-msc[master]: tweak comment to indicate sub_pres_vlr fsm as dead code In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12234 ) Change subject: tweak comment to indicate sub_pres_vlr fsm as dead code ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12234/3/src/libvlr/vlr_lu_fsm.c File src/libvlr/vlr_lu_fsm.c: https://gerrit.osmocom.org/#/c/12234/3/src/libvlr/vlr_lu_fsm.c at 182 PS3, Line 182: * Subscriber_Present_VLR, TS 29.002 Chapter 25.10.1 the spec reference is here, max, similar to all the libvlr FSMs -- To view, visit https://gerrit.osmocom.org/12234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I198d442e9ed288f37c7d4e5ec87b82dc53114e99 Gerrit-Change-Number: 12234 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 13:03:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:05:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 13:05:30 +0000 Subject: Change in sandbox[master]: z In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12301 ) Change subject: z ...................................................................... z Change-Id: Ibf086ec487d8731f776739fd3c7c2d1cb83b6ce7 --- A z 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: neels_test_user: Looks good to me, approved; Verified diff --git a/z b/z new file mode 100644 index 0000000..b680253 --- /dev/null +++ b/z @@ -0,0 +1 @@ +z -- To view, visit https://gerrit.osmocom.org/12301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: sandbox Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibf086ec487d8731f776739fd3c7c2d1cb83b6ce7 Gerrit-Change-Number: 12301 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: neels_test_user -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:08:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 13:08:22 +0000 Subject: Change in osmo-msc[master]: cosmetic: drop duplicated #include In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12328 ) Change subject: cosmetic: drop duplicated #include ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I216425ba5994a49981d51bce6cfa7c3fa5fe9e40 Gerrit-Change-Number: 12328 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 13:08:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:10:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 13:10:49 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: use VTY bind addr from config, deprecate cmd line opt... In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12208 ) Change subject: Revert "mobile: use VTY bind addr from config, deprecate cmd line options" ...................................................................... Patch Set 1: Code-Review-1 > Patch Set 1: > > From my point of view the original change should not have been submitted as it takes away a feature that is actively used and causes a regression. The removed options were marked as deprecated so I also don't think reverting the change is the right way. Unfortunately we don't have releases in osmocom-bb which would allow us to handle deprecations better. -- To view, visit https://gerrit.osmocom.org/12208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie89bc16b667dbe05baa76cfa4f86b4946f8019e8 Gerrit-Change-Number: 12208 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 17 Dec 2018 13:10:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:11:12 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 13:11:12 +0000 Subject: Change in osmo-msc[master]: cosmetic: drop duplicated #include In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12328 ) Change subject: cosmetic: drop duplicated #include ...................................................................... cosmetic: drop duplicated #include Change-Id: I216425ba5994a49981d51bce6cfa7c3fa5fe9e40 --- M src/libmsc/transaction.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 47124a0..a0f7b31 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -24,7 +24,6 @@ #include #include #include -#include #include void *tall_trans_ctx; -- To view, visit https://gerrit.osmocom.org/12328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I216425ba5994a49981d51bce6cfa7c3fa5fe9e40 Gerrit-Change-Number: 12328 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:12:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 13:12:07 +0000 Subject: Change in osmo-msc[master]: MNCC: use log wrapper for call processing In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12329 ) Change subject: MNCC: use log wrapper for call processing ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12329/1/src/libmsc/mncc_builtin.c File src/libmsc/mncc_builtin.c: https://gerrit.osmocom.org/#/c/12329/1/src/libmsc/mncc_builtin.c at 38 PS1, Line 38: #define DEBUGCC(ss, l, r, fmt, args...) DEBUGP(ss, "(call %x, remote %x) " fmt "\n", l->callref, r->callref, ##args) No need to pass DMNCC everywhere. Since the define is local to the file, move DMNCC here and remove it from all changed lines. https://gerrit.osmocom.org/#/c/12329/1/src/libmsc/mncc_builtin.c at 39 PS1, Line 39: #define LOGCC(ss, ll, l, r, fmt, args...) LOGP(ss, ll, "(call %x, remote %x) " fmt "\n", l->callref, r->callref, ##args) This one is not used here, remove it. -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 13:12:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:13:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 13:13:08 +0000 Subject: Change in osmo-msc[master]: Use proper type for tch_rtp_connect() parameter In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12330 ) Change subject: Use proper type for tch_rtp_connect() parameter ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e2efcd2e25d6ec2ff35a4b8cfcda02abe97fa59 Gerrit-Change-Number: 12330 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 13:13:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:15:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 13:15:29 +0000 Subject: Change in osmo-msc[master]: MNCC: internalize bridge error handling In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12331 ) Change subject: MNCC: internalize bridge error handling ...................................................................... Patch Set 1: Code-Review-1 I see no point to merge this patch. In fact it makes code paths more difficult by adding 3 function calls instead of returning a code and calling it in one place. -- To view, visit https://gerrit.osmocom.org/12331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66f6fac254d78dcf64bcb6aa4a443b899fb378a7 Gerrit-Change-Number: 12331 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 13:15:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:20:53 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 13:20:53 +0000 Subject: Change in osmo-msc[master]: MNCC: use log wrapper for call processing In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12329 to look at the new patch set (#2). Change subject: MNCC: use log wrapper for call processing ...................................................................... MNCC: use log wrapper for call processing Add log/debug wrappers to conveniently print local and remote call references. Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 --- M src/libmsc/mncc_builtin.c 1 file changed, 12 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/12329/2 -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:25:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 13:25:21 +0000 Subject: Change in osmo-msc[master]: vty: show subscriber: put() before printing the use count In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12266 ) Change subject: vty: show subscriber: put() before printing the use count ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12266/1/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12266/1/src/libmsc/msc_vty.c at 821 PS1, Line 821: argv[1]); > If this taints the count than what about all other calls to get_vsub_by_argv()? The other code paths don't print the use count on vty_out(). This is only about what use count the user sees. Especially if 'show subscriber cache' and 'show subscriber msisdn 123' show different use counts, it makes you think something is broken. https://gerrit.osmocom.org/#/c/12266/1/src/libmsc/msc_vty.c at 830 PS1, Line 830: * and since it existed before we called _get() on it above. */ > Are you referring to get_vsub_by_argv()? Better use function name - it's more likely to persist than [?] obviously vlr_subscr_put(), but you're right -- To view, visit https://gerrit.osmocom.org/12266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id02b57b7ed299b010b9f8b9e809548eb1e6aa699 Gerrit-Change-Number: 12266 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Mon, 17 Dec 2018 13:25:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:27:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 13:27:28 +0000 Subject: Change in osmo-msc[master]: MNCC: use log wrapper for call processing In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12329 ) Change subject: MNCC: use log wrapper for call processing ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 13:27:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:31:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 13:31:37 +0000 Subject: Change in osmo-msc[master]: vty: show subscriber: put() before printing the use count In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12266 to look at the new patch set (#2). Change subject: vty: show subscriber: put() before printing the use count ...................................................................... vty: show subscriber: put() before printing the use count Do not show the VTY command's own use count during 'show subscriber '. When using 'show subscriber msisdn 2023', I was surprised to see a use count of 2 and suspected a use count leak. With 'show subscriber cache' however, the use count is 1. So I realized it is the vty command's own use count that makes it two, besides the lu_complete=true one. Change-Id: Id02b57b7ed299b010b9f8b9e809548eb1e6aa699 --- M src/libmsc/msc_vty.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/66/12266/2 -- To view, visit https://gerrit.osmocom.org/12266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id02b57b7ed299b010b9f8b9e809548eb1e6aa699 Gerrit-Change-Number: 12266 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:37:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 13:37:02 +0000 Subject: Change in osmo-mgw[master]: drop/replace very weird logging in mgcp_client.c In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12269 ) Change subject: drop/replace very weird logging in mgcp_client.c ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12269/1/src/libosmo-mgcp-client/mgcp_client.c File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/#/c/12269/1/src/libosmo-mgcp-client/mgcp_client.c at 746 PS1, Line 746: msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len))); I'm actually cutting it at 42 chars already. Still usually shows more than just the first line -- To view, visit https://gerrit.osmocom.org/12269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6877ed7fd7dbe009b2ece8792d5160d040c1aaa Gerrit-Change-Number: 12269 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 17 Dec 2018 13:37:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:37:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 13:37:18 +0000 Subject: Change in osmo-mgw[master]: drop/replace very weird logging in mgcp_client.c In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12269 ) Change subject: drop/replace very weird logging in mgcp_client.c ...................................................................... drop/replace very weird logging in mgcp_client.c mgcp_do_write() is the final stage of writing data towards the MGCP server (MGW). In that function, drop an unconditional iteration and copy of the MGCP message to a static string buffer for no apparent reason besides debug logging. Instead, use osmo_escape_str() with a limited length, which can just be an inline format argument in the LOGP() statement. This way, the string mangling is simpler and only gets run when DMGCP is actually on debug log level. Change-Id: Id6877ed7fd7dbe009b2ece8792d5160d040c1aaa --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 5 insertions(+), 16 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 2a8cc15..fc9c5d3 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -735,26 +735,15 @@ static int mgcp_do_write(struct osmo_fd *fd, struct msgb *msg) { int ret; - static char strbuf[4096]; - unsigned int l = msg->len < sizeof(strbuf) ? msg->len : sizeof(strbuf); - unsigned int i; - osmo_strlcpy(strbuf, (const char*)msg->data, l); - for (i = 0; i < sizeof(strbuf); i++) { - if (strbuf[i] == '\n' || strbuf[i] == '\r') { - strbuf[i] = '\0'; - break; - } - } - DEBUGP(DLMGCP, "Tx MGCP msg to MGCP GW: '%s'\n", strbuf); - - LOGP(DLMGCP, LOGL_DEBUG, "Sending msg to MGCP GW size: %u\n", msg->len); + LOGP(DLMGCP, LOGL_DEBUG, "Sending msg to MGCP GW size: len=%u '%s'...\n", + msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len))); ret = write(fd->fd, msg->data, msg->len); if (ret != msg->len) - LOGP(DLMGCP, LOGL_ERROR, "Failed to forward message to MGCP" - " GW: %s\n", strerror(errno)); - + LOGP(DLMGCP, LOGL_ERROR, "Failed to Tx MGCP: %d='%s'; msg: len=%u '%s'...\n", + errno, strerror(errno), + msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len))); return ret; } -- To view, visit https://gerrit.osmocom.org/12269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id6877ed7fd7dbe009b2ece8792d5160d040c1aaa Gerrit-Change-Number: 12269 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:38:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 13:38:12 +0000 Subject: Change in osmo-mgw[master]: check_rtp: on IP:port errors, log the IP and port In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12265 ) Change subject: check_rtp: on IP:port errors, log the IP and port ...................................................................... check_rtp: on IP:port errors, log the IP and port Half of those are obviously zero, but I'd rather print the raw data instead of adding string constants, even if the condition must always lead to 0.0.0.0:0. Rationale: I had osmo-mgw listen on 0.0.0.0 and got the error message DRTP ERROR endpoint:0x1 destination IP-address is invalid which didn't convey that 0.0.0.0 is regarded as invalid. Change-Id: I9e98d464a27038904797c5c10735a98ef5b7b9c3 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index de34cc6..7af8e71 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -945,22 +945,22 @@ * and IP-address for outgoing data. */ if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0 && conn->end.rtp_port == 0) { LOGP(DRTP, LOGL_DEBUG, - "endpoint:0x%x destination IP-address and rtp port is (not yet) known\n", - ENDPOINT_NUMBER(endp)); + "endpoint:0x%x destination IP-address and rtp port is (not yet) known (%s:%u)\n", + ENDPOINT_NUMBER(endp), inet_ntoa(conn->end.addr), conn->end.rtp_port); return -1; } if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0) { LOGP(DRTP, LOGL_ERROR, - "endpoint:0x%x destination IP-address is invalid\n", - ENDPOINT_NUMBER(endp)); + "endpoint:0x%x destination IP-address is invalid (%s:%u)\n", + ENDPOINT_NUMBER(endp), inet_ntoa(conn->end.addr), conn->end.rtp_port); return -1; } if (conn->end.rtp_port == 0) { LOGP(DRTP, LOGL_ERROR, - "endpoint:0x%x destination rtp port is invalid\n", - ENDPOINT_NUMBER(endp)); + "endpoint:0x%x destination rtp port is invalid (%s:%u)\n", + ENDPOINT_NUMBER(endp), inet_ntoa(conn->end.addr), conn->end.rtp_port); return -1; } -- To view, visit https://gerrit.osmocom.org/12265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9e98d464a27038904797c5c10735a98ef5b7b9c3 Gerrit-Change-Number: 12265 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:50:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 13:50:10 +0000 Subject: Change in libosmocore[master]: add to osmo_sock_get_name*() API In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12268 ) Change subject: add to osmo_sock_get_name*() API ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/12268/1/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/#/c/12268/1/include/osmocom/core/socket.h at 63 PS1, Line 63: const char *osmo_sock_get_name2(int fd); > what about osmo_sock_get_name_static()? we have many other _get_name() functions that return strings in a static buffer (also sometimes in a buffer that belongs to the struct or is part of a value_string[]). This was the exception, so to me it feels right to imply 'static'. https://gerrit.osmocom.org/#/c/12268/1/include/osmocom/core/socket.h at 64 PS1, Line 64: int osmo_sock_get_name2_buf(char *str, size_t str_len, int fd); > no need to have a 2 here. there is a 2? You mean it should be in the end instead? The right way would be to call it osmo_sock_get_name_buf() since it's the first signature with this name, but that would confuse with the semantics of osmo_sock_get_name(). I think osmo_sock_get_name2_buf() shows that it intimately belongs to osmo_sock_get_name2() and that we don't need to go looking for a first API version of it. But feel free to request a different name. https://gerrit.osmocom.org/#/c/12268/1/src/socket.c File src/socket.c: https://gerrit.osmocom.org/#/c/12268/1/src/socket.c at 796 PS1, Line 796: * \param[out] str Destination string buffer. > 2 whitespace here and in next line. you mean the indent? I'm just copying the scheme I find around here. I think it's rather weird to indent twice for \param, but that's what this file does, probably because most just have a summary doc and line up with '/*!'. Or do you mean the 2xspace in '\param foo The foo'? I always do that to set apart the argument name from its actual explanation, since doxygen format lacks a ':' that I would like to put there instead. -- To view, visit https://gerrit.osmocom.org/12268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 Gerrit-Change-Number: 12268 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 13:50:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:50:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 13:50:49 +0000 Subject: Change in osmo-msc[master]: log: by default start with all categories on LOGL_NOTICE In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12267 ) Change subject: log: by default start with all categories on LOGL_NOTICE ...................................................................... log: by default start with all categories on LOGL_NOTICE They were on DEBUG during early development stages, and it's high time that I drop those back to NOTICE. Change-Id: I3b46e9107a7a1d81a44d2a2eb855c10960a1ab6b --- M src/osmo-msc/msc_main.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index ce6ae38..4dce2b8 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -469,22 +469,22 @@ [DSMPP] = { .name = "DSMPP", .description = "SMPP interface for external SMS apps", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DRANAP] = { .name = "DRANAP", .description = "Radio Access Network Application Part Protocol", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DVLR] = { .name = "DVLR", .description = "Visitor Location Register", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DIUCS] = { .name = "DIUCS", .description = "Iu-CS Protocol", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DBSSAP] = { .name = "DBSSAP", -- To view, visit https://gerrit.osmocom.org/12267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3b46e9107a7a1d81a44d2a2eb855c10960a1ab6b Gerrit-Change-Number: 12267 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 13:57:53 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 13:57:53 +0000 Subject: Change in libosmocore[master]: vty: Introduce telnet_init_default and make vty port configurable In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12321 ) Change subject: vty: Introduce telnet_init_default and make vty port configurable ...................................................................... Patch Set 1: Code-Review-1 (2 comments) Please clarify why signed values are used for port which starts from 0. https://gerrit.osmocom.org/#/c/12321/1/include/osmocom/vty/vty.h File include/osmocom/vty/vty.h: https://gerrit.osmocom.org/#/c/12321/1/include/osmocom/vty/vty.h at 214 PS1, Line 214: int vty_get_bind_port(int default_port); Is there any use-case where we want to call vty_get_bind_port() with negative value? https://gerrit.osmocom.org/#/c/12321/1/src/vty/vty.c File src/vty/vty.c: https://gerrit.osmocom.org/#/c/12321/1/src/vty/vty.c at 1638 PS1, Line 1638: return default_port; So this can return negative value only if it receives it as parameter. -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 13:57:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:01:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 14:01:01 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: configurable retrieval of IMEI, IMEISV In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12302 ) Change subject: msc_vty.c: configurable retrieval of IMEI, IMEISV ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c at 448 PS1, Line 448: "" > Can somebody suggest a good description here? [?] It might be helpful to understand what "early" means in here. Is there some spec reference around cfg.retrieve_imeisv_*? -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 14:01:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:09:31 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 14:09:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add MSC test for an invalid CIPHER MODE COMPLETE command Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12332 Change subject: add MSC test for an invalid CIPHER MODE COMPLETE command ...................................................................... add MSC test for an invalid CIPHER MODE COMPLETE command Add new test TC_cipher_complete_with_invalid_cipher which verifies that the MSC will reject a CIPHER MODE COMPLETE command with a cipher which wasn't part of the preceding CIPHER MODE command. Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Related: OS#2872 --- M msc/MSC_Tests.cfg M msc/MSC_Tests.ttcn M msc/expected-results.xml 3 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/12332/1 diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg index 5a3c33c..b412889 100644 --- a/msc/MSC_Tests.cfg +++ b/msc/MSC_Tests.cfg @@ -60,3 +60,4 @@ #MSC_Tests.TC_lu_and_mt_call_no_dlcx_resp #MSC_Tests.TC_reset_two #MSC_Tests.TC_lu_and_mt_call +#MSC_Tests.TC_cipher_complete_with_invalid_cipher diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index dc616a8..41964a4 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2766,6 +2766,64 @@ f_vty_config(MSCVTY, "msc", "ncss guard-timeout 0"); } +/* A5/1 only permitted on network side; attempt an invalid CIPHER MODE COMPLETE with A5/3 which MSC should reject. */ +private function f_tc_cipher_complete_with_invalid_cipher(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + pars.net.expect_auth := true; + pars.net.expect_ciph := true; + pars.net.kc_support := '02'O; /* A5/1 only */ + f_init_handler(pars); + + g_pars.vec := f_gen_auth_vec_2g(); + + /* Can't use f_perform_lu() directly. Code below is based on it. */ + + /* tell GSUP dispatcher to send this IMSI to us */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ + var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi) + f_bssap_compl_l3(l3_lu); + + f_mm_auth(); + + var OCT1 a5_net := f_alg_mask_from_cm(g_pars.cm2); + var OCT1 a5_intersect := g_pars.net.kc_support and4b a5_net; + alt { + [] BSSAP.receive(tr_BSSMAP_CipherModeCmd(a5_intersect, g_pars.vec.kc)) { + BSSAP.send(ts_BSSMAP_CipherModeCompl(int2oct(3 /* "accept" A5/3 */, 1))); + } + [] BSSAP.receive(tr_BSSMAP_CipherModeCmd(?, g_pars.vec.kc)) { + setverdict(fail, "Wrong ciphering algorithm mask in CiphModCmd"); + mtc.stop; + } + [] BSSAP.receive { + setverdict(fail, "Unknown/unexpected BSSAP received"); + mtc.stop; + } + } + + /* Expect LU reject from MSC. */ + alt { + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + setverdict(pass); + } + [] BSSAP.receive { + setverdict(fail, "Unknown/unexpected BSSAP received"); + mtc.stop; + } + } +} + +testcase TC_cipher_complete_with_invalid_cipher() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + f_vty_config(MSCVTY, "network", "authentication required"); + f_vty_config(MSCVTY, "network", "encryption a5 1"); + + vc_conn := f_start_handler(refers(f_tc_cipher_complete_with_invalid_cipher), 52); + vc_conn.done; +} + /* TODO (SMS): * different user data lengths * SMPP transaction mode with unsuccessful delivery @@ -2854,6 +2912,8 @@ execute( TC_lu_and_mo_ussd_mo_release() ); execute( TC_lu_and_ss_session_timeout() ); + execute( TC_cipher_complete_with_invalid_cipher() ); + /* Run this last: at the time of writing this test crashes the MSC */ execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() ); execute( TC_mo_cc_bssmap_clear() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 4a9529e..83c8010 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -69,6 +69,7 @@ + -- To view, visit https://gerrit.osmocom.org/12332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Gerrit-Change-Number: 12332 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:19:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 14:19:22 +0000 Subject: Change in osmo-bts[master]: rsl: Send PDCH ACT NACK if TCH chan is still active In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12180 ) Change subject: rsl: Send PDCH ACT NACK if TCH chan is still active ...................................................................... Patch Set 1: (1 comment) my +1 is already here, need someone else now. It's still hard to navigate why exactly this patch is needed though. I assume that you're doing the right thing, but it is not very clearly explained. Good enough for me, but that may be the reason why there is only one vote so far. https://gerrit.osmocom.org/#/c/12180/1/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/#/c/12180/1/src/common/rsl.c at 2207 PS1, Line 2207: /* TCH takes preference over PDCH so allow forcing PDCH DEACT, > From looking at BTS code, it looks like PDCH in general is expected to be !NONE too, but I didn't go [?] (TBF activity never has any impact on osmo-bts, it just hands off all control to the PCU) -- To view, visit https://gerrit.osmocom.org/12180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d Gerrit-Change-Number: 12180 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 14:19:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:33:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 14:33:53 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11787 to look at the new patch set (#4). Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... add/clean big-endian packed structs (struct_endianess.py) This is 1:1 the result of doing cd libosmocore ./contrib/struct_endianess.py git commit -a Running struct_endianess.py again should result in no changes. That means we could include such a check in the gerrit verification job now. Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 --- M include/osmocom/gprs/protocol/gsm_04_60.h M include/osmocom/gsm/protocol/gsm_03_41.h M include/osmocom/gsm/protocol/gsm_04_08.h M include/osmocom/gsm/protocol/gsm_04_08_gprs.h M include/osmocom/gsm/protocol/gsm_04_12.h M include/osmocom/gsm/protocol/gsm_04_14.h M include/osmocom/gsm/protocol/gsm_08_58.h M include/osmocom/gsm/protocol/gsm_44_318.h M tests/endian/endian_test.c 9 files changed, 647 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/11787/4 -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:38:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 14:38:00 +0000 Subject: Change in libosmo-sccp[master]: vty: SCCP timers: add optional units In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/11130 ) Change subject: vty: SCCP timers: add optional units ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I020d5dab19bc67e8444ed548db15b2a4d8871a9c Gerrit-Change-Number: 11130 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:39:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 14:39:08 +0000 Subject: Change in osmo-msc[master]: tweak comment to indicate sub_pres_vlr fsm as dead code In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12234 ) Change subject: tweak comment to indicate sub_pres_vlr fsm as dead code ...................................................................... Patch Set 3: Code-Review+2 pulling the "comment / triviality" rule -- To view, visit https://gerrit.osmocom.org/12234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I198d442e9ed288f37c7d4e5ec87b82dc53114e99 Gerrit-Change-Number: 12234 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 14:39:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:39:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 14:39:16 +0000 Subject: Change in osmo-msc[master]: tweak comment to indicate sub_pres_vlr fsm as dead code In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12234 ) Change subject: tweak comment to indicate sub_pres_vlr fsm as dead code ...................................................................... tweak comment to indicate sub_pres_vlr fsm as dead code sub_pres_vlr_fsm_start() only ever has an effect if ms_not_reachable_flag == true. But there simply is no code that sets this flag. So sub_pres_vlr_fsm_start() is currently dead code. Also, examining the FSM, if it should ever be set to true, this would halt the LU/CM Service/Paging response, since the FSM would merely change its state without dispatching asynchronous messages. No chance of finishing. Short of dropping the code entirely, first just mark it. The point being that this models some FSM definition from 3GPP specs, and we have a couple other "if (0)" branches in the VLR... Change-Id: I198d442e9ed288f37c7d4e5ec87b82dc53114e99 --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 74a6939..a0cbcab 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -271,7 +271,9 @@ return (struct vlr_subscr*)fi->priv; } -/* Note that the start event is dispatched right away, so in case the FSM immediately concludes from that +/* THIS IS CURRENTLY DEAD CODE, SINCE WE NEVER SET vsub->ms_not_reachable_flag = true. + * + * Note that the start event is dispatched right away, so in case the FSM immediately concludes from that * event, the created FSM struct may no longer be valid as it already deallocated again, and it may * furthermore already have invoked the parent FSM instance's deallocation as well. Hence, instead of * returning, store the created FSM instance address in *fi_p before dispatching the event. It is thus -- To view, visit https://gerrit.osmocom.org/12234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I198d442e9ed288f37c7d4e5ec87b82dc53114e99 Gerrit-Change-Number: 12234 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Max Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:39:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 14:39:17 +0000 Subject: Change in osmo-msc[master]: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12236 ) Change subject: vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI ...................................................................... vlr_lu_fsm: drop unused out_state INIT -> WAIT_IMEI There is no state transition from INIT to WAIT_IMEI, only to WAIT_SUB_PRES. If there were code to skip WAIT_SUB_PRES, the allowed state transitions would have to be the same as for WAIT_SUB_PRES, i.e. also WAIT_IMEI_TMSI and WAIT_TMSI_CNF. For now just opt for the status quo. Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index a0cbcab..5d171d5 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -555,8 +555,7 @@ [LU_COMPL_VLR_S_INIT] = { .in_event_mask = S(LU_COMPL_VLR_E_START), .out_state_mask = S(LU_COMPL_VLR_S_DONE) | - S(LU_COMPL_VLR_S_WAIT_SUB_PRES) | - S(LU_COMPL_VLR_S_WAIT_IMEI), + S(LU_COMPL_VLR_S_WAIT_SUB_PRES), .name = OSMO_STRINGIFY(LU_COMPL_VLR_S_INIT), .action = lu_compl_vlr_init, }, -- To view, visit https://gerrit.osmocom.org/12236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I18ef9e8c96b52401d98f49dc410f13681231b533 Gerrit-Change-Number: 12236 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:39:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 14:39:18 +0000 Subject: Change in osmo-msc[master]: comment: vlr: put the 'balancing' comment closer to the put() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12240 ) Change subject: comment: vlr: put the 'balancing' comment closer to the put() ...................................................................... comment: vlr: put the 'balancing' comment closer to the put() Change-Id: Ic42768b22d63d182455c8d860961c44159973d0c --- M src/libvlr/vlr.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Max: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 975b240..7de78bf 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -1142,6 +1142,7 @@ bool vlr_subscr_expire(struct vlr_subscr *vsub) { if (vsub->lu_complete) { + /* balancing the get from vlr_lu_compl_fsm_success() */ vsub->lu_complete = false; vlr_subscr_put(vsub); @@ -1160,7 +1161,6 @@ vsub->imsi_detached_flag = true; vsub->expire_lu = VLR_SUBSCRIBER_NO_EXPIRATION; - /* balancing the get from vlr_lu_compl_fsm_success() */ vlr_subscr_expire(vsub); return 0; -- To view, visit https://gerrit.osmocom.org/12240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic42768b22d63d182455c8d860961c44159973d0c Gerrit-Change-Number: 12240 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:39:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 14:39:33 +0000 Subject: Change in libosmocore[master]: add to osmo_sock_get_name*() API In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12268 ) Change subject: add to osmo_sock_get_name*() API ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12268/1/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/#/c/12268/1/include/osmocom/core/socket.h at 64 PS1, Line 64: int osmo_sock_get_name2_buf(char *str, size_t str_len, int fd); > there is a 2? You mean it should be in the end instead? [?] I mean it should be named osmo_sock_get_name_buf(). Let's not extend use of "2" because a similar "epic FAIL" API has it. https://gerrit.osmocom.org/#/c/12268/1/src/socket.c File src/socket.c: https://gerrit.osmocom.org/#/c/12268/1/src/socket.c at 796 PS1, Line 796: * \param[out] str Destination string buffer. > you mean the indent? I'm just copying the scheme I find around here. [?] Well since a variable in C cannot contain a space, it makes no sense to me to add an extra space, it's obvious the var ends at whitespace boundary, so no need to add 2 of them. -- To view, visit https://gerrit.osmocom.org/12268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 Gerrit-Change-Number: 12268 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 14:39:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:44:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 14:44:53 +0000 Subject: Change in osmo-bts[master]: rsl: Send PDCH ACT NACK if TCH chan is still active In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12180 ) Change subject: rsl: Send PDCH ACT NACK if TCH chan is still active ...................................................................... Patch Set 1: Well as it states it fixes the TTCN3 test, so if someone wants to get more deep knowledge on it, he can just read the scenario exposed in TTCN3 test from git description, run it with and without this patch and see the result. Let's wait for a few more days for someone to +1 it then. -- To view, visit https://gerrit.osmocom.org/12180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d Gerrit-Change-Number: 12180 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 14:44:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:45:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 14:45:47 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 14:45:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:50:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 14:50:59 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 14:50:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:52:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 14:52:20 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 6: Code-Review+1 (1 comment) got a comment still, but since it's minor... https://gerrit.osmocom.org/#/c/11836/6/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11836/6/common/chapters/gsup.adoc at 1134 PS6, Line 1134: |0x00|Reserved (used inside libosmocore only) Leaking implementation details into the protocol specification. To guard 0x00 in libosmocore is a detail of how libosmocore handles presence flagging, does not belong here. Reserving should make sense from a protocol perspective, e.g.: "Reserved for future extension"? Or you could say just "Reserved" without a reason... -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 14:52:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 14:55:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 14:55:40 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Patch Set 7: Code-Review+1 (1 comment) minor... https://gerrit.osmocom.org/#/c/11837/7/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11837/7/common/chapters/gsup.adoc at 1239 PS7, Line 1239: |0x00|Reserved (used inside libosmocore only) keep implementation details out of the spec. Reserved values should make sense from the procotol perspective. Maybe I was wrong to plant the "reserved" concept in your mind, my apologies. -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 14:55:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:03:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 15:03:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add MSC test for an invalid CIPHER MODE COMPLETE command In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12332 ) Change subject: add MSC test for an invalid CIPHER MODE COMPLETE command ...................................................................... Patch Set 1: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/12332/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/12332/1/msc/MSC_Tests.ttcn at 2793 PS1, Line 2793: BSSAP.send(ts_BSSMAP_CipherModeCompl(int2oct(3 /* "accept" A5/3 */, 1))); (isn't 0x3 == A5/2? maybe I'm confusing the IEs) https://gerrit.osmocom.org/#/c/12332/1/msc/MSC_Tests.ttcn at 2820 PS1, Line 2820: f_vty_config(MSCVTY, "network", "authentication required"); ('authentication required' is implied by enabling encryption, so you could drop this first vty cmd) https://gerrit.osmocom.org/#/c/12332/1/msc/expected-results.xml File msc/expected-results.xml: https://gerrit.osmocom.org/#/c/12332/1/msc/expected-results.xml at 72 PS1, Line 72: from the issue i understand that the test should currently be failing? this here marks it as expected-to-pass -- To view, visit https://gerrit.osmocom.org/12332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Gerrit-Change-Number: 12332 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 17 Dec 2018 15:03:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:09:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 15:09:42 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c at 1195 PS3, Line 1195: if (!parsing_config_file) { instead you can do if (vty->type != VTY_FILE) A comment should explain why this is necessary. We have other commands that allow changing the value and write back the config, even though they have no immediate effect on the running program. I think it's good to print a warning, but do you really need to forbid tweaking the config? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 15:09:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 17 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 17 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#342?= In-Reply-To: <900588364.29.1544973007340.JavaMail.jenkins@jenkins.osmocom.org> References: <900588364.29.1544973007340.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1648347215.44.1545059407475.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.76 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:10:32 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 15:10:32 +0000 Subject: Change in osmo-dev[master]: run.sh: run osmo-hlr with --db-upgrade In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12295 ) Change subject: run.sh: run osmo-hlr with --db-upgrade ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I74dd09698dd508fce047ce086a22a369ad9ee6a4 Gerrit-Change-Number: 12295 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 15:10:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:10:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 15:10:39 +0000 Subject: Change in osmo-dev[master]: run.sh: run osmo-hlr with --db-upgrade In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12295 ) Change subject: run.sh: run osmo-hlr with --db-upgrade ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I74dd09698dd508fce047ce086a22a369ad9ee6a4 Gerrit-Change-Number: 12295 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 15:10:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:10:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 15:10:41 +0000 Subject: Change in osmo-dev[master]: run.sh: run osmo-hlr with --db-upgrade In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12295 ) Change subject: run.sh: run osmo-hlr with --db-upgrade ...................................................................... run.sh: run osmo-hlr with --db-upgrade Do not stop if the DB needs to be upgraded. Change-Id: I74dd09698dd508fce047ce086a22a369ad9ee6a4 --- M net/tmpl_std/run.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved; Verified diff --git a/net/tmpl_std/run.sh b/net/tmpl_std/run.sh index 829c236..f31330b 100755 --- a/net/tmpl_std/run.sh +++ b/net/tmpl_std/run.sh @@ -67,7 +67,7 @@ #mgw4bsc="gdb -ex run --args osmo-mgw -c osmo-mgw-for-bsc.cfg" #mgw4bsc="strace osmo-mgw -c osmo-mgw-for-bsc.cfg" mgw4bsc="osmo-mgw -c osmo-mgw-for-bsc.cfg" -hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr" +hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade" stp="osmo-stp" bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc.cfg" -- To view, visit https://gerrit.osmocom.org/12295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I74dd09698dd508fce047ce086a22a369ad9ee6a4 Gerrit-Change-Number: 12295 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:11:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 15:11:49 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: > I don't see a beneficial use case in clearing the IPA name before > saving the current config. Why would anyone want to omit that name? > If we require the name to be stored in the config file, why should > it not always be saved when the file gets written out? I don't get you there. I don't see anywhere that it is REQUIRED that the name is stored in the config file. That's why we have defaults right? When storing the config back into the cfg file we usually have same approach. If it's the default value, don't save it, because it means the user simply wants the default value and we may decide later that another default value is better, this way the user can benefit from it for free. It also keeps config files shorter and easy to find "user specific values". -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 15:11:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:24:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 15:24:30 +0000 Subject: Change in osmo-sgsn[master]: remove pointless declaration of struct gsm_network In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12242 ) Change subject: remove pointless declaration of struct gsm_network ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Gerrit-Change-Number: 12242 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 15:24:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:24:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 15:24:56 +0000 Subject: Change in osmo-msc[master]: cosmetic: log more details about unhandled message/state Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12333 Change subject: cosmetic: log more details about unhandled message/state ...................................................................... cosmetic: log more details about unhandled message/state Change-Id: I8e0febd04f7338aed7222dcfcd9bfddc7b8fda59 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/12333/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index a172b47..15c6d9d 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -2047,7 +2047,7 @@ && ((1 << trans->cc.state) & downstatelist[i].states)) break; if (i == DOWNSLLEN) { - DEBUGP(DCC, "Message unhandled at this state.\n"); + DEBUGP(DCC, "Message '%s' unhandled at state '%s'\n", get_mncc_name(msg_type), gsm48_cc_state_name(trans->cc.state)); return 0; } -- To view, visit https://gerrit.osmocom.org/12333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8e0febd04f7338aed7222dcfcd9bfddc7b8fda59 Gerrit-Change-Number: 12333 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:24:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 15:24:56 +0000 Subject: Change in osmo-msc[master]: cosmetic: drop unused variable Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12334 Change subject: cosmetic: drop unused variable ...................................................................... cosmetic: drop unused variable Change-Id: Iff358eb2328cdd052e66b572aeec1b767174949b --- M src/libmsc/a_iface.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/12334/1 diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index 66644ee..a96f247 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -360,7 +360,6 @@ struct ran_conn *conn; struct gsm0808_channel_type ct; struct gsm0808_speech_codec_list scl; - uint32_t *ci_ptr = NULL; struct msgb *msg; struct sockaddr_storage rtp_addr; struct sockaddr_in rtp_addr_in; @@ -404,7 +403,7 @@ memset(&rtp_addr, 0, sizeof(rtp_addr)); memcpy(&rtp_addr, &rtp_addr_in, sizeof(rtp_addr_in)); - msg = gsm0808_create_ass(&ct, NULL, &rtp_addr, &scl, ci_ptr); + msg = gsm0808_create_ass(&ct, NULL, &rtp_addr, &scl, NULL); LOGPCONN(conn, LOGL_DEBUG, "N-DATA.req(%s)\n", msgb_hexdump_l2(msg)); return osmo_sccp_tx_data_msg(conn->a.scu, conn->a.conn_id, msg); -- To view, visit https://gerrit.osmocom.org/12334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iff358eb2328cdd052e66b572aeec1b767174949b Gerrit-Change-Number: 12334 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:27:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 15:27:11 +0000 Subject: Change in osmo-msc[master]: msc_vty.c: configurable retrieval of IMEI, IMEISV In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12302 ) Change subject: msc_vty.c: configurable retrieval of IMEI, IMEISV ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c at 437 PS1, Line 437: "Send each IMEI to the EIR to ask if it is permitted or not. The EIR is implemented as part of osmo-hlr, " slightly out-of-scope, we don't know whether the user is using OsmoHLR or something else. https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c at 440 PS1, Line 440: "1 = send each IMEI to the EIR\n") (we normally don't name the values again, just write the string for that value. online vty doc will print the value and add your string to it) https://gerrit.osmocom.org/#/c/12302/1/src/libmsc/msc_vty.c at 448 PS1, Line 448: "" > It might be helpful to understand what "early" means in here. [?] IIUC this patch doesn't require adding IMEISV config, so maybe we can push this off into the future instead? Some explanation: IMEISV can be * not requested; * requested as an explicit Identity Request roundtrip; * requested as piggy-back on the Ciphering Mode Complete, partly to save roundtrips, but actually more importantly to not leak the identity in an unencrypted message, because above ID Request typically happens before ciphering. So the IMEISV-Early says "We require the IMEISV, and ask for it in the beginning via ID Request". And the IMEISV-ciphered says "We require IMEISV, but wait until after ciphering". I think to the user, it could make sense to offer: retrieve-imeisv (0|1|early) 0 Do not request an IMEISV 1 Request an IMEISV. With encryption enabled, this will be requested during Ciphering Mode negotiation. Without encryption, this will cause a separate Identity Request. early Request an IMEISV, always use a separate, unencrypted Identity Request even if encryption is enabled. Not sure about: * do we even need the 'early' option? * I can imagine requesting IMEISV could be an implicit internal process instead of a user config, and we only have these flags in vlr because we haven't implemented the code that would require an IMEISV yet? (the SV, software version, does indicate some traits but I forget what it was) -- To view, visit https://gerrit.osmocom.org/12302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee516b9cd7877b21207ce9a6d954109f19558163 Gerrit-Change-Number: 12302 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 15:27:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:27:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 15:27:50 +0000 Subject: Change in osmo-msc[master]: cosmetic: log more details about unhandled message/state In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12333 ) Change subject: cosmetic: log more details about unhandled message/state ...................................................................... Patch Set 1: That's not a cosmetic change. -- To view, visit https://gerrit.osmocom.org/12333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e0febd04f7338aed7222dcfcd9bfddc7b8fda59 Gerrit-Change-Number: 12333 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-CC: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 15:27:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:28:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 15:28:19 +0000 Subject: Change in osmo-msc[master]: cosmetic: drop unused variable In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12334 ) Change subject: cosmetic: drop unused variable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iff358eb2328cdd052e66b572aeec1b767174949b Gerrit-Change-Number: 12334 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 17 Dec 2018 15:28:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:28:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 15:28:21 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: > Patch Set 3: > > > I don't see a beneficial use case in clearing the IPA name before > > saving the current config. Why would anyone want to omit that name? > > If we require the name to be stored in the config file, why should > > it not always be saved when the file gets written out? > > > I don't get you there. I don't see anywhere that it is REQUIRED that the name is stored in the config file. That's why we have defaults right? When storing the config back into the cfg file we usually have same approach. If it's the default value, don't save it, because it means the user simply wants the default value and we may decide later that another default value is better, this way the user can benefit from it for free. It also keeps config files shorter and easy to find "user specific values". But... wait... my patch saves the ipa-name to the config file only if the user has overridden it. If the user does not change it, the 'ipa-name' line won't appear in the saved configuration. You sound like you believed we'd save the default name "MSC-00-00-00-00-00-00"? That is not the case! Does this address your concern or did I misunderstand you? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 15:28:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:31:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 15:31:52 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c at 1195 PS3, Line 1195: if (!parsing_config_file) { > instead you can do [?] OK, so say the user changes the ipa-name. And now we print a warning that they did something bad. Can you tell me: 1) What would the resulting system behaviour be? 2) And what should this warning say? >From my point my view, the resulting behaviour is essentially undefined, so the warning would have to say something like: "We are sorry, you have just changed an option which should not be changed at run-time because it leads to what essentially amounts to undefined behaviour of our application. Have fun!" -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 15:31:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:33:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 15:33:35 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: > > Patch Set 3: > > > > > I don't see a beneficial use case in clearing the IPA name > before > > > saving the current config. Why would anyone want to omit that > name? > > > If we require the name to be stored in the config file, why > should > > > it not always be saved when the file gets written out? > > > > > > I don't get you there. I don't see anywhere that it is REQUIRED > that the name is stored in the config file. That's why we have > defaults right? When storing the config back into the cfg file we > usually have same approach. If it's the default value, don't save > it, because it means the user simply wants the default value and we > may decide later that another default value is better, this way the > user can benefit from it for free. It also keeps config files > shorter and easy to find "user specific values". > > But... wait... my patch saves the ipa-name to the config file only > if the user has overridden it. If the user does not change it, the > 'ipa-name' line won't appear in the saved configuration. > > You sound like you believed we'd save the default name > "MSC-00-00-00-00-00-00"? > That is not the case! > > Does this address your concern or did I misunderstand you? I was just replying that I still lack a "no ipa-name" in order to be able to go back to default before saving the config, but I didn't really understand your arguments against it, I was just stating I don't get them and trying to explain why. I know your patch currently doesn't do that. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 15:33:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:37:01 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 15:37:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add MSC test for an invalid CIPHER MODE COMPLETE command In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12332 ) Change subject: add MSC test for an invalid CIPHER MODE COMPLETE command ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/12332/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/12332/1/msc/MSC_Tests.ttcn at 2793 PS1, Line 2793: BSSAP.send(ts_BSSMAP_CipherModeCompl(int2oct(3 /* "accept" A5/3 */, 1))); > (isn't 0x3 == A5/2? maybe I'm confusing the IEs) Oh, right. I'll fix this, thanks! https://gerrit.osmocom.org/#/c/12332/1/msc/MSC_Tests.ttcn at 2820 PS1, Line 2820: f_vty_config(MSCVTY, "network", "authentication required"); > ('authentication required' is implied by enabling encryption, so you could drop this first vty cmd) Will fix, thanks. https://gerrit.osmocom.org/#/c/12332/1/msc/expected-results.xml File msc/expected-results.xml: https://gerrit.osmocom.org/#/c/12332/1/msc/expected-results.xml at 72 PS1, Line 72: > from the issue i understand that the test should currently be failing? this here marks it as expecte [?] Yes it is expected to pass. As I explained in the issue, the current behaviour is that the MSC returns a LU reject, and the test has been written to expect this. I don't know how the MSC should behave in this case. I've read some parts of the spec but haven't found out about this detail yet. Any clues? -- To view, visit https://gerrit.osmocom.org/12332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Gerrit-Change-Number: 12332 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 15:37:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:39:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 15:39:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add MSC test for an invalid CIPHER MODE COMPLETE command In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12332 to look at the new patch set (#2). Change subject: add MSC test for an invalid CIPHER MODE COMPLETE command ...................................................................... add MSC test for an invalid CIPHER MODE COMPLETE command Add new test TC_cipher_complete_with_invalid_cipher which verifies that the MSC will reject a CIPHER MODE COMPLETE command with a cipher which wasn't part of the preceding CIPHER MODE command. Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Related: OS#2872 --- M msc/MSC_Tests.cfg M msc/MSC_Tests.ttcn M msc/expected-results.xml 3 files changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/12332/2 -- To view, visit https://gerrit.osmocom.org/12332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Gerrit-Change-Number: 12332 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:44:24 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 15:44:24 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: > I was just replying that I still lack a "no ipa-name" in order to be able to go back to default before saving the config, but I didn't really understand your arguments against it, I was just stating I don't get them and trying to explain why. I know your patch currently doesn't do that. OK, I see. I don't think 'no ipa-name' is a good idea, for the same reasons that changing the name at runtime is not a good idea. As I understand, the semantics of 'no ipa-name' would include switching the IPA name back to the default name at run-time, would it not? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 15:44:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:49:22 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 15:49:22 +0000 Subject: Change in osmo-msc[master]: comment: vlr: drop unused struct members Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12335 Change subject: comment: vlr: drop unused struct members ...................................................................... comment: vlr: drop unused struct members Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 --- M include/osmocom/msc/vlr.h 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/35/12335/1 diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 68e0759..2f31063 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -171,9 +171,6 @@ /* PS (SGSN) specific parts */ struct { struct llist_head pdp_list; - uint8_t rac; - uint8_t sac; - struct gprs_mm_ctx *mmctx; } ps; /* CS (NITB/CSCN) specific parts */ struct { -- To view, visit https://gerrit.osmocom.org/12335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 Gerrit-Change-Number: 12335 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 15:51:32 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 15:51:32 +0000 Subject: Change in osmo-sgsn[master]: remove pointless declaration of struct gsm_network In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/12242 ) Change subject: remove pointless declaration of struct gsm_network ...................................................................... remove pointless declaration of struct gsm_network We were passing a NULL pointer of type struct gsm_network * to ctrl_interface_setup_dynip(). Remove the pointless declaration of this struct. Also, replace the sgsn_controlif_setup() helper function with a direct call to ctrl_interface_setup_dynip(). The helper fnuction was just a thin wrapper around the latter. Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Related: OS#3356 --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/sgsn_ctrl.c M src/gprs/sgsn_main.c 3 files changed, 2 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index b6afe69..a0a056f 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -404,9 +404,6 @@ /* * ctrl interface related work */ -struct gsm_network; -struct ctrl_handle *sgsn_controlif_setup(struct gsm_network *, - const char *bind_addr, uint16_t port); int sgsn_ctrl_cmds_install(void); /* diff --git a/src/gprs/sgsn_ctrl.c b/src/gprs/sgsn_ctrl.c index dc5ae79..ad91d25 100644 --- a/src/gprs/sgsn_ctrl.c +++ b/src/gprs/sgsn_ctrl.c @@ -60,9 +60,3 @@ rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_subscriber_list); return rc; } - -struct ctrl_handle *sgsn_controlif_setup(struct gsm_network *net, - const char *bind_addr, uint16_t port) -{ - return ctrl_interface_setup_dynip(net, bind_addr, port, NULL); -} diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index 798e507..f12270d 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -450,8 +450,8 @@ /* start control interface after reading config for * ctrl_vty_get_bind_addr() */ - g_ctrlh = sgsn_controlif_setup(NULL, ctrl_vty_get_bind_addr(), - OSMO_CTRL_PORT_SGSN); + g_ctrlh = ctrl_interface_setup_dynip(NULL, ctrl_vty_get_bind_addr(), + OSMO_CTRL_PORT_SGSN, NULL); if (!g_ctrlh) { LOGP(DGPRS, LOGL_ERROR, "Failed to create CTRL interface.\n"); exit(1); -- To view, visit https://gerrit.osmocom.org/12242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib4151afa5bff01e63b462cca517fb60ac0503759 Gerrit-Change-Number: 12242 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 16:01:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 16:01:14 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: > > I was just replying that I still lack a "no ipa-name" in order to > be able to go back to default before saving the config, but I > didn't really understand your arguments against it, I was just > stating I don't get them and trying to explain why. I know your > patch currently doesn't do that. > > > OK, I see. I don't think 'no ipa-name' is a good idea, for the same > reasons that changing the name at runtime is not a good idea. As I > understand, the semantics of 'no ipa-name' would include switching > the IPA name back to the default name at run-time, would it not? Not necessarily. I think I already described it. You could simply print it won't be applied until next restart, but still give the option that it is saved so next time you start it it will be taken into account. Otherwise user really needs to modify the cfg file manually. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 16:01:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 16:01:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 16:01:41 +0000 Subject: Change in osmo-msc[master]: comment: vlr: drop unused struct members In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12335 ) Change subject: comment: vlr: drop unused struct members ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 Gerrit-Change-Number: 12335 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 16:01:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 16:09:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 17 Dec 2018 16:09:44 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: > Not necessarily. I think I already described it. You could simply print it won't be applied until next restart, but still give the option that it is saved so next time you start it it will be taken into account. Otherwise user really needs to modify the cfg file manually. I really don't see why a regular user would want to clear the name, write the config, and then configure the name again to prevent the network from falling apart: no ipa-name write file ipa-name 'SGSN-911-123456879' Just to save the effort of removing one line from the saved file? Considering that multi-SGSN and multi-MSC setups will be an exception rather than the norm, how often do you think users will even run into this? Do you have a concrete situation where you would use this yourself? Or are you arguing based on "consistency is good" (which it isn't in this case, I would say)? If I were an admin of such a network, I'd be incredibly happy to have a unique identifier in all my configuration files saved from different SGSN/MSC. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 16:09:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 16:18:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 16:18:57 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: > > I really don't see why a regular user would want to clear the name, > write the config, and then configure the name again to prevent the > network from falling apart: > > no ipa-name > write file > ipa-name 'SGSN-911-123456879' Why this third ipa-name? The scenario I describe is I want to revert to default, I don't need to know which is it. Does this ipa-name really need to match the same token in another node? If that's the case for HLR, then I get your point and we can skip adding it since then in prod networks it will always be set to something specific. > > Just to save the effort of removing one line from the saved file? I'd say one of the main points of using a VTY is that you don't ever need to modify the file directly. You may have access to the VTY but not the cfg file. > > Considering that multi-SGSN and multi-MSC setups will be an > exception rather than the norm, how often do you think users will > even run into this? > Do you have a concrete situation where you would use this yourself? If I followed this logic when implementing stuff I'll be laying on the sofa right now :P > Or are you arguing based on "consistency is good" (which it isn't > in this case, I would say)? consistency is good. Being able to modify the value back to default without touching the cfg file is also good. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 16:18:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 16:29:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 16:29:07 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 16:29:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 16:35:00 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 16:35:00 +0000 Subject: Change in osmo-msc[master]: VLR tests: add logging macro with explicit value description Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12336 Change subject: VLR tests: add logging macro with explicit value description ...................................................................... VLR tests: add logging macro with explicit value description To avoid leaking structure details into test we sometimes have to separate value description from actual value. Introduce new macro which makes that possible and convert old one into trivial wrapper around it. Change-Id: Ic462297edac4c55689f93cc45771c8b5e2aed864 --- M tests/msc_vlr/msc_vlr_tests.h 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/36/12336/1 diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index f7ff940..3629967 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -182,11 +182,13 @@ OSMO_ASSERT(accepted == expect_accepted); \ } while (false) -#define VERBOSE_ASSERT(val, expect_op, fmt) \ +#define V_ASSERT(desc, val, expect_op, fmt) \ do { \ - log(#val " == " fmt, (val)); \ + log(desc " == " fmt, (val)); \ OSMO_ASSERT((val) expect_op); \ - } while (0); + } while (0) + +#define VERBOSE_ASSERT(val, expect_op, fmt) V_ASSERT(#val, val, expect_op, fmt) #define EXPECT_CONN_COUNT(N) VERBOSE_ASSERT(llist_count(&net->ran_conns), == N, "%d") -- To view, visit https://gerrit.osmocom.org/12336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic462297edac4c55689f93cc45771c8b5e2aed864 Gerrit-Change-Number: 12336 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 16:35:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 16:35:01 +0000 Subject: Change in osmo-msc[master]: VLR tests: avoid leaking LAC access details Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12337 Change subject: VLR tests: avoid leaking LAC access details ...................................................................... VLR tests: avoid leaking LAC access details Avoid leaking details on accessing data structure for LAC value into test output: that's irrelevant clutter which forces unnucessary test output modifications. Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e --- M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_ss.err 4 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/37/12337/1 diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index ef88c5a..83bc84b 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -154,7 +154,7 @@ vsub = vlr_subscr_find_by_imsi(net->vlr, IMSI); VERBOSE_ASSERT(vsub != NULL, == true, "%d"); VERBOSE_ASSERT(strcmp(vsub->imsi, IMSI), == 0, "%d"); - VERBOSE_ASSERT(vsub->lac, == 23, "%u"); + V_ASSERT("LAC", vsub->lac, == 23, "%u"); vlr_subscr_put(vsub); } diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 481a2db..db0d58c 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -175,7 +175,7 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:42342 usage decreases to: 1 --- - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector @@ -555,7 +555,7 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:42342 usage decreases to: 1 --- - after a while, MNCC asks us to setup a call, causing Paging @@ -934,7 +934,7 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:42342 usage decreases to: 1 --- - after a while, MNCC asks us to setup a call, causing Paging @@ -1279,7 +1279,7 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:42342 usage decreases to: 1 --- - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector @@ -1621,7 +1621,7 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:42342 usage decreases to: 1 --- - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c index 34aa634..d8167bd 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.c +++ b/tests/msc_vlr/msc_vlr_test_ss.c @@ -68,7 +68,7 @@ vsub = vlr_subscr_find_by_imsi(net->vlr, IMSI); VERBOSE_ASSERT(vsub != NULL, == true, "%d"); VERBOSE_ASSERT(strcmp(vsub->imsi, IMSI), == 0, "%d"); - VERBOSE_ASSERT(vsub->lac, == 23, "%u"); + V_ASSERT("LAC", vsub->lac, == 23, "%u"); vlr_subscr_put(vsub); bss_sends_clear_complete(); diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index fe869ad..1d4a0c6 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -91,7 +91,7 @@ DREF VLR subscr MSISDN:46071 usage increases to: 3 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:46071 usage decreases to: 2 - BSS sends BSSMAP Clear Complete DREF MSISDN:46071: MSC conn use - release == 0 (0x0: ) @@ -287,7 +287,7 @@ DREF VLR subscr MSISDN:46071 usage increases to: 3 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:46071 usage decreases to: 2 - BSS sends BSSMAP Clear Complete DREF MSISDN:46071: MSC conn use - release == 0 (0x0: ) -- To view, visit https://gerrit.osmocom.org/12337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e Gerrit-Change-Number: 12337 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 16:35:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 16:35:01 +0000 Subject: Change in osmo-msc[master]: Remove redundancy in LAC processing Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12338 Change subject: Remove redundancy in LAC processing ...................................................................... Remove redundancy in LAC processing Always use LAC which is part of Cell Global ID otherwise we might end up in a situation where separately stored LAC differs. Both are described in 3GPP TS 23.008 $2.4 as temporary subscriber data to be stored in VLR. Both are defined in 3GPP TS 23.003. The LAC is part of LAI which is part of CGI so there should be no case when those values differ for a given subscriber. Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e --- M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/msc_vty.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_ss.c 8 files changed, 9 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/12338/1 diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 2f31063..20a9c0f 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -142,9 +142,7 @@ /* Newly allocated TMSI that was not yet acked by MS */ uint32_t tmsi_new; - /* some redundancy in information below? */ struct osmo_cell_global_id cgi; /* 2.4.16 */ - uint16_t lac; /* 2.4.2 */ char imeisv[GSM23003_IMEISV_NUM_DIGITS+1]; /* 2.2.3 */ char imei[GSM23003_IMEISV_NUM_DIGITS+1]; /* 2.1.9 */ diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index a172b47..70f5c29 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1940,7 +1940,7 @@ GSM48_CC_CAUSE_UNASSIGNED_NR); } /* If subscriber is not "attached" */ - if (!vsub->lac) { + if (!vsub->cgi.lai.lac) { DEBUGP(DCC, "(bts - trx - ts - ti -- sub %s) " "Received '%s' from MNCC with " "detached subscriber %s\n", data->called.number, @@ -1979,7 +1979,7 @@ "unallocated channel, paging already " "started for lac %d.\n", data->called.number, - get_mncc_name(msg_type), vsub->lac); + get_mncc_name(msg_type), vsub->cgi.lai.lac); vlr_subscr_put(vsub); trans_free(trans); return 0; diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 43bf48c..3ee6e92 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -287,7 +287,7 @@ } /* If subscriber is not "attached" */ - if (!vsub->lac) { + if (!vsub->cgi.lai.lac) { LOGP(DMM, LOGL_ERROR, "Network-originated session " "rejected - subscriber is not attached\n"); return NULL; diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c index 188807e..0e76efc 100644 --- a/src/libmsc/gsm_subscriber.c +++ b/src/libmsc/gsm_subscriber.c @@ -116,12 +116,12 @@ * SCCP connections (if any). */ switch (vsub->cs.attached_via_ran) { case RAN_GERAN_A: - return a_iface_tx_paging(vsub->imsi, vsub->tmsi, vsub->lac); + return a_iface_tx_paging(vsub->imsi, vsub->tmsi, vsub->cgi.lai.lac); case RAN_UTRAN_IU: return ranap_iu_page_cs(vsub->imsi, vsub->tmsi == GSM_RESERVED_TMSI? NULL : &vsub->tmsi, - vsub->lac); + vsub->cgi.lai.lac); default: break; } diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 87adc82..59112a7 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -631,7 +631,7 @@ vty_out(vty, " Extension: %s%s", vsub->msisdn, VTY_NEWLINE); vty_out(vty, " LAC: %d/0x%x%s", - vsub->lac, vsub->lac, VTY_NEWLINE); + vsub->cgi.lai.lac, vsub->cgi.lai.lac, VTY_NEWLINE); vty_out(vty, " IMSI: %s%s", vsub->imsi, VTY_NEWLINE); if (vsub->tmsi != GSM_RESERVED_TMSI) vty_out(vty, " TMSI: %08X%s", vsub->tmsi, diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 5d171d5..e635305 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -950,7 +950,7 @@ vsub->lu_fsm = fi; vsub->msc_conn_ref = lfp->msc_conn_ref; /* FIXME: send new LAC to HLR? */ - vsub->lac = lfp->new_lai.lac; + vsub->cgi.lai.lac = lfp->new_lai.lac; lfp->vsub = vsub; /* Tell MSC to associate this subscriber with the given * connection */ diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 83bc84b..852ec32 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -154,7 +154,7 @@ vsub = vlr_subscr_find_by_imsi(net->vlr, IMSI); VERBOSE_ASSERT(vsub != NULL, == true, "%d"); VERBOSE_ASSERT(strcmp(vsub->imsi, IMSI), == 0, "%d"); - V_ASSERT("LAC", vsub->lac, == 23, "%u"); + V_ASSERT("LAC", vsub->cgi.lai.lac, == 23, "%u"); vlr_subscr_put(vsub); } diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c index d8167bd..70b7b1f 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.c +++ b/tests/msc_vlr/msc_vlr_test_ss.c @@ -68,7 +68,7 @@ vsub = vlr_subscr_find_by_imsi(net->vlr, IMSI); VERBOSE_ASSERT(vsub != NULL, == true, "%d"); VERBOSE_ASSERT(strcmp(vsub->imsi, IMSI), == 0, "%d"); - V_ASSERT("LAC", vsub->lac, == 23, "%u"); + V_ASSERT("LAC", vsub->cgi.lai.lac, == 23, "%u"); vlr_subscr_put(vsub); bss_sends_clear_complete(); -- To view, visit https://gerrit.osmocom.org/12338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e Gerrit-Change-Number: 12338 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 16:37:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 16:37:31 +0000 Subject: Change in osmo-msc[master]: CC: log more details about unhandled message/state In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12333 to look at the new patch set (#2). Change subject: CC: log more details about unhandled message/state ...................................................................... CC: log more details about unhandled message/state Change-Id: I8e0febd04f7338aed7222dcfcd9bfddc7b8fda59 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/12333/2 -- To view, visit https://gerrit.osmocom.org/12333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8e0febd04f7338aed7222dcfcd9bfddc7b8fda59 Gerrit-Change-Number: 12333 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 16:44:22 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 16:44:22 +0000 Subject: Change in osmo-msc[master]: comment: vlr: drop unused struct members In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12335 ) Change subject: comment: vlr: drop unused struct members ...................................................................... Patch Set 1: Not sure if entire .ps can be dropped - it looks like pre-split leftover but it's called in GSUP processing and I don't see direct equivalent in SGSN so let's wait for Neels' feedback. -- To view, visit https://gerrit.osmocom.org/12335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 Gerrit-Change-Number: 12335 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 16:44:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 16:45:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 16:45:25 +0000 Subject: Change in osmo-msc[master]: cosmetic: drop unused variable In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12334 ) Change subject: cosmetic: drop unused variable ...................................................................... cosmetic: drop unused variable Change-Id: Iff358eb2328cdd052e66b572aeec1b767174949b --- M src/libmsc/a_iface.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index 66644ee..a96f247 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -360,7 +360,6 @@ struct ran_conn *conn; struct gsm0808_channel_type ct; struct gsm0808_speech_codec_list scl; - uint32_t *ci_ptr = NULL; struct msgb *msg; struct sockaddr_storage rtp_addr; struct sockaddr_in rtp_addr_in; @@ -404,7 +403,7 @@ memset(&rtp_addr, 0, sizeof(rtp_addr)); memcpy(&rtp_addr, &rtp_addr_in, sizeof(rtp_addr_in)); - msg = gsm0808_create_ass(&ct, NULL, &rtp_addr, &scl, ci_ptr); + msg = gsm0808_create_ass(&ct, NULL, &rtp_addr, &scl, NULL); LOGPCONN(conn, LOGL_DEBUG, "N-DATA.req(%s)\n", msgb_hexdump_l2(msg)); return osmo_sccp_tx_data_msg(conn->a.scu, conn->a.conn_id, msg); -- To view, visit https://gerrit.osmocom.org/12334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iff358eb2328cdd052e66b572aeec1b767174949b Gerrit-Change-Number: 12334 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:33:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 17:33:16 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Prepare code for gpsd < 2.96 support Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12339 Change subject: sysmobts_mgr: Prepare code for gpsd < 2.96 support ...................................................................... sysmobts_mgr: Prepare code for gpsd < 2.96 support API prior to that version allocates the pointer internally. Let's change current code to always use a pointer and in current supported code (gpsd >= 2.96) point it to a user-allocated struct. Follow-up patch will introduce necessary ifdefs to support older gpsd. Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f --- M src/osmo-bts-sysmo/misc/sysmobts_mgr.h M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c 2 files changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/39/12339/1 diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h index 88f4e24..b62707c 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h @@ -96,7 +96,8 @@ /* gps structure to see if there is a fix */ int gps_open; struct osmo_fd gpsfd; - struct gps_data_t gpsdata; + struct gps_data_t *gpsdata; + struct gps_data_t gpsdata_buf; struct osmo_timer_list fix_timeout; /* Loop/Re-try control */ diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c index b0b5edd..ec8cb93 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c @@ -86,14 +86,14 @@ osmo_timer_del(&mgr->calib.fix_timeout); osmo_fd_unregister(&mgr->calib.gpsfd); - gps_close(&mgr->calib.gpsdata); - memset(&mgr->calib.gpsdata, 0, sizeof(mgr->calib.gpsdata)); + gps_close(mgr->calib.gpsdata); + memset(mgr->calib.gpsdata, 0, sizeof(*(mgr->calib.gpsdata))); mgr->calib.gps_open = 0; } static void mgr_gps_checkfix(struct sysmobts_mgr_instance *mgr) { - struct gps_data_t *data = &mgr->calib.gpsdata; + struct gps_data_t *data = mgr->calib.gpsdata; /* No 2D fix yet */ if (data->fix.mode < MODE_2D) { @@ -119,7 +119,7 @@ { int rc; struct sysmobts_mgr_instance *mgr = fd->data; - rc = compat_gps_read(&mgr->calib.gpsdata); + rc = compat_gps_read(mgr->calib.gpsdata); if (rc == -1) { LOGP(DCALIB, LOGL_ERROR, "gpsd vanished during read.\n"); calib_state_reset(mgr, CALIB_FAIL_GPS); @@ -143,7 +143,7 @@ { int rc; - rc = gps_open("localhost", DEFAULT_GPSD_PORT, &mgr->calib.gpsdata); + rc = gps_open("localhost", DEFAULT_GPSD_PORT, mgr->calib.gpsdata); if (rc != 0) { LOGP(DCALIB, LOGL_ERROR, "Failed to connect to GPS %d\n", rc); calib_state_reset(mgr, CALIB_FAIL_GPS); @@ -151,12 +151,12 @@ } mgr->calib.gps_open = 1; - gps_stream(&mgr->calib.gpsdata, WATCH_ENABLE, NULL); + gps_stream(mgr->calib.gpsdata, WATCH_ENABLE, NULL); mgr->calib.gpsfd.data = mgr; mgr->calib.gpsfd.cb = mgr_gps_read; mgr->calib.gpsfd.when = BSC_FD_READ | BSC_FD_EXCEPT; - mgr->calib.gpsfd.fd = mgr->calib.gpsdata.gps_fd; + mgr->calib.gpsfd.fd = mgr->calib.gpsdata->gps_fd; if (osmo_fd_register(&mgr->calib.gpsfd) < 0) { LOGP(DCALIB, LOGL_ERROR, "Failed to register GPSD fd\n"); calib_state_reset(mgr, CALIB_FAIL_GPS); -- To view, visit https://gerrit.osmocom.org/12339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f Gerrit-Change-Number: 12339 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:33:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 17:33:17 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Add support for gpsd < 2.39 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12340 Change subject: sysmobts_mgr: Add support for gpsd < 2.39 ...................................................................... sysmobts_mgr: Add support for gpsd < 2.39 This allows running sysmobts-mgr on systems with old gpsd releases (which may have other software depending on such old release). Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b --- M src/osmo-bts-sysmo/misc/sysmobts_mgr.h M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c 2 files changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/12340/1 diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h index b62707c..668263d 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h @@ -9,6 +9,10 @@ #include +#if !defined(GPSD_API_MAJOR_VERSION) || GPSD_API_MAJOR_VERSION < 5 +#define USE_GPSD2_API 1 +#endif + #include enum { @@ -97,7 +101,9 @@ int gps_open; struct osmo_fd gpsfd; struct gps_data_t *gpsdata; +#if !USE_GPSD2_API struct gps_data_t gpsdata_buf; +#endif struct osmo_timer_list fix_timeout; /* Loop/Re-try control */ diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c index ec8cb93..a0ba649 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c @@ -59,8 +59,10 @@ static inline int compat_gps_read(struct gps_data_t *data) { +#if USE_GPSD2_API + return gps_poll(data); /* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */ -#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0 +#elif GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0 return gps_read(data, NULL, 0); #else return gps_read(data); @@ -87,7 +89,9 @@ osmo_fd_unregister(&mgr->calib.gpsfd); gps_close(mgr->calib.gpsdata); +#if !USE_GPSD2_API memset(mgr->calib.gpsdata, 0, sizeof(*(mgr->calib.gpsdata))); +#endif mgr->calib.gps_open = 0; } @@ -143,7 +147,13 @@ { int rc; +#if USE_GPSD2_API + mgr->calib.gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT); + rc = mgr->calib.gpsdata ? 0 : -1; +#else + mgr->calib.gpsdata = &mgr->calib.gpsdata_buf; rc = gps_open("localhost", DEFAULT_GPSD_PORT, mgr->calib.gpsdata); +#endif if (rc != 0) { LOGP(DCALIB, LOGL_ERROR, "Failed to connect to GPS %d\n", rc); calib_state_reset(mgr, CALIB_FAIL_GPS); @@ -151,8 +161,12 @@ } mgr->calib.gps_open = 1; - gps_stream(mgr->calib.gpsdata, WATCH_ENABLE, NULL); +#if USE_GPSD2_API + gps_query(mgr->calib.gpsdata, "w+x"); +#else + gps_stream(mgr->calib.gpsdata, WATCH_ENABLE, NULL); +#endif mgr->calib.gpsfd.data = mgr; mgr->calib.gpsfd.cb = mgr_gps_read; mgr->calib.gpsfd.when = BSC_FD_READ | BSC_FD_EXCEPT; -- To view, visit https://gerrit.osmocom.org/12340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b Gerrit-Change-Number: 12340 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:35:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 17:35:44 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Add support for gpsd < 2.96 In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12340 ) Change subject: sysmobts_mgr: Add support for gpsd < 2.96 ...................................................................... sysmobts_mgr: Add support for gpsd < 2.96 This allows running sysmobts-mgr on systems with old gpsd releases (which may have other software depending on such old release). GPSD_API_MAJOR_VERSION define was first added in gpsd 2.39, before that it didn't exist (but this code is known to work against 2.38). GPSD_API_MAJOR_VERSION == 5 was set in version 2.96. Related gpsd commits: 3771dba081bd1175adab6096d7b6270d3822aaa1 e69bcb6b01af6b25c6a525fb1961b92ac04f5213 Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b --- M src/osmo-bts-sysmo/misc/sysmobts_mgr.h M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c 2 files changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/12340/2 -- To view, visit https://gerrit.osmocom.org/12340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b Gerrit-Change-Number: 12340 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:37:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 17:37:00 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Add support for gpsd < 2.96 In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/12340 ) Change subject: sysmobts_mgr: Add support for gpsd < 2.96 ...................................................................... sysmobts_mgr: Add support for gpsd < 2.96 This allows running sysmobts-mgr on systems with old gpsd releases (which may have other software depending on such old release). GPSD_API_MAJOR_VERSION define was first added in gpsd 2.39, before that it didn't exist (but this code is known to work against 2.38). GPSD_API_MAJOR_VERSION == 5 was set in version 2.96. Related gpsd commits: 3771dba081bd1175adab6096d7b6270d3822aaa1 e69bcb6b01af6b25c6a525fb1961b92ac04f5213 Related: SYS#4290 Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b --- M src/osmo-bts-sysmo/misc/sysmobts_mgr.h M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c 2 files changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/12340/3 -- To view, visit https://gerrit.osmocom.org/12340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b Gerrit-Change-Number: 12340 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:44:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 17:44:19 +0000 Subject: Change in osmo-msc[master]: VLR tests: add logging macro with explicit value description In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12336 ) Change subject: VLR tests: add logging macro with explicit value description ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic462297edac4c55689f93cc45771c8b5e2aed864 Gerrit-Change-Number: 12336 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 17:44:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:44:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 17:44:22 +0000 Subject: Change in osmo-msc[master]: VLR tests: avoid leaking LAC access details In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12337 ) Change subject: VLR tests: avoid leaking LAC access details ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e Gerrit-Change-Number: 12337 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 17:44:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:44:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 17:44:26 +0000 Subject: Change in osmo-msc[master]: Remove redundancy in LAC processing In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12338 ) Change subject: Remove redundancy in LAC processing ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e Gerrit-Change-Number: 12338 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 17:44:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:44:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 17:44:55 +0000 Subject: Change in osmo-msc[master]: CC: log more details about unhandled message/state In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12333 ) Change subject: CC: log more details about unhandled message/state ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e0febd04f7338aed7222dcfcd9bfddc7b8fda59 Gerrit-Change-Number: 12333 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 17:44:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:45:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 17:45:41 +0000 Subject: Change in osmo-msc[master]: CC: log more details about unhandled message/state In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12333 ) Change subject: CC: log more details about unhandled message/state ...................................................................... CC: log more details about unhandled message/state Change-Id: I8e0febd04f7338aed7222dcfcd9bfddc7b8fda59 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index a172b47..15c6d9d 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -2047,7 +2047,7 @@ && ((1 << trans->cc.state) & downstatelist[i].states)) break; if (i == DOWNSLLEN) { - DEBUGP(DCC, "Message unhandled at this state.\n"); + DEBUGP(DCC, "Message '%s' unhandled at state '%s'\n", get_mncc_name(msg_type), gsm48_cc_state_name(trans->cc.state)); return 0; } -- To view, visit https://gerrit.osmocom.org/12333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8e0febd04f7338aed7222dcfcd9bfddc7b8fda59 Gerrit-Change-Number: 12333 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:46:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 17:46:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: match default expectation with config In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12296 ) Change subject: MSC: match default expectation with config ...................................................................... Patch Set 1: Code-Review+2 1 + 1 = 2 :) -- To view, visit https://gerrit.osmocom.org/12296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I540645ef4b1e08d05b89251f074af84a516e7a88 Gerrit-Change-Number: 12296 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 17 Dec 2018 17:46:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:46:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 17 Dec 2018 17:46:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: match default expectation with config In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12296 ) Change subject: MSC: match default expectation with config ...................................................................... MSC: match default expectation with config In MSC_Tests.default we expect /tmp/mncc.sock as MNCC socket path - let's match this expectation with osmo-msc.cfg to make sure that tests work out of the box without the need to use specific command-line option. Change-Id: I540645ef4b1e08d05b89251f074af84a516e7a88 --- M msc/osmo-msc.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve Max: Looks good to me, approved diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg index 3f9e192..ddac4cd 100644 --- a/msc/osmo-msc.cfg +++ b/msc/osmo-msc.cfg @@ -73,6 +73,7 @@ cs7-instance-iu 0 mgw remote-ip 127.0.0.1 emergency-call route-to-msisdn 112 + mncc external /tmp/mncc.sock mncc-int default-codec tch-f fr default-codec tch-h hr -- To view, visit https://gerrit.osmocom.org/12296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I540645ef4b1e08d05b89251f074af84a516e7a88 Gerrit-Change-Number: 12296 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:49:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 17 Dec 2018 17:49:39 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Add support for gpsd < 2.96 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12340 ) Change subject: sysmobts_mgr: Add support for gpsd < 2.96 ...................................................................... Patch Set 3: Tested it builds fine against gpsd 2.38. -- To view, visit https://gerrit.osmocom.org/12340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b Gerrit-Change-Number: 12340 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 17 Dec 2018 17:49:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:52:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 17:52:29 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Hello Stefan Sperling, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11836 to look at the new patch set (#7). Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... chapters/gsup.adoc: document MO-/MT-forwardSM messages Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Related Change-Id: (core) Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Related Change-Id: (TTCN) Ibf49474a81235096c032ea21f217170f523bd94e Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 213 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/36/11836/7 -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:52:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 17:52:29 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Hello Stefan Sperling, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11837 to look at the new patch set (#8). Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... chapters/gsup.adoc: document READY-FOR-SM message Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Related Change-Id: (core) Ic37f3b2114b8095cfce22977e67133b9103942e3 Related Change-Id: (TTCN) If2256607527ecfcb10285583332fb8b0515d7c78 Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/37/11837/8 -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:53:46 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 17:53:46 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/11837/7/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11837/7/common/chapters/gsup.adoc at 1239 PS7, Line 1239: |0x00|Reserved (used inside libosmocore only) > keep implementation details out of the spec. [?] Done -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 17:53:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 17:53:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 17:53:51 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/11836/6/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11836/6/common/chapters/gsup.adoc at 1134 PS6, Line 1134: |0x00|Reserved (used inside libosmocore only) > Leaking implementation details into the protocol specification. [?] Done -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 17:53:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 19:27:32 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 19:27:32 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 19:27:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 19:28:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 19:28:35 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 19:28:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 19:29:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 19:29:29 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 7: Code-Review+2 there have been only trivial changes since stsp's earlier +1, so +2ing -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 19:29:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 19:29:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 19:29:36 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Patch Set 8: there have been only trivial changes since stsp's earlier +1, so +2ing -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 19:29:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 19:29:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 19:29:42 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 19:29:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 19:32:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 19:32:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add MSC test for an invalid CIPHER MODE COMPLETE command In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12332 ) Change subject: add MSC test for an invalid CIPHER MODE COMPLETE command ...................................................................... Patch Set 2: Code-Review+1 If the chosen cipher is not part of the offered ciphers, that should result in a LU reject, yes. But possibly, what you have tested is that A5/2 is generally deprecated and should always be rejected? Please clarify this with another test run and then submit. -- To view, visit https://gerrit.osmocom.org/12332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Gerrit-Change-Number: 12332 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 19:32:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 19:39:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 17 Dec 2018 19:39:54 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c at 1195 PS3, Line 1195: if (!parsing_config_file) { > OK, so say the user changes the ipa-name. And now we print a warning that they did something bad. [?] my question: do things break when changing during run-time? If they break, then rejecting is justified and explain why in a comment or the vty out message. Do things not break, and simply have no effect? Then that is how many other vty options already work, and matches the feeling that we're editing cached config that doesn't necessarily have an effect on the running program. It matches the current scheme, and that can be allowed. For example in osmo-bsc you can edit the pchan settings of time slots, and you can write them back to config file, but they will only have an effect when you re-connect the OML. Re-connect OML can be done by 'do bts 0 drop oml' or something, or a program restart. (...still valid: just use vty->type) -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 17 Dec 2018 19:39:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 23:31:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 23:31:04 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix RSSI -> RX level conversion In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11157 ) Change subject: trxcon/scheduler: fix RSSI -> RX level conversion ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4659de899411ec1ba1718fdcb40aec562dbfd65 Gerrit-Change-Number: 11157 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 23:31:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 23:31:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 23:31:12 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix RSSI -> RX level conversion In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11157 ) Change subject: trxcon/scheduler: fix RSSI -> RX level conversion ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4659de899411ec1ba1718fdcb40aec562dbfd65 Gerrit-Change-Number: 11157 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 23:31:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 23:46:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 23:46:19 +0000 Subject: Change in osmocom-bb[master]: mobile: Use new VTY telnet API to allow binding to random port In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12326 ) Change subject: mobile: Use new VTY telnet API to allow binding to random port ...................................................................... Patch Set 1: Verified+1 Code-Review+1 Verified, works! -- To view, visit https://gerrit.osmocom.org/12326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a6214aec2dcb92495038ea8311c0df22fa8d07b Gerrit-Change-Number: 12326 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 23:46:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 23:47:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 23:47:25 +0000 Subject: Change in libosmocore[master]: vty: Introduce telnet_init_default and make vty port configurable In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12321 ) Change subject: vty: Introduce telnet_init_default and make vty port configurable ...................................................................... Patch Set 1: Verified+1 Code-Review+1 Verified, works! -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 23:47:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 17 23:59:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 17 Dec 2018 23:59:58 +0000 Subject: Change in libosmocore[master]: vty: Introduce telnet_init_default and make vty port configurable In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12321 ) Change subject: vty: Introduce telnet_init_default and make vty port configurable ...................................................................... Patch Set 1: Code-Review-1 (4 comments) I still would like to see a better commit description. BTW: I don't think 'int' vs 'unsigned' is critical. TODO: let's replace s/UDP/TCP/ in a separate change! https://gerrit.osmocom.org/#/c/12321/1/src/vty/telnet_interface.c File src/vty/telnet_interface.c: https://gerrit.osmocom.org/#/c/12321/1/src/vty/telnet_interface.c at 70 PS1, Line 70: port UDP port number I think it was copy-pasted from here... https://gerrit.osmocom.org/#/c/12321/1/src/vty/telnet_interface.c at 81 PS1, Line 81: port UDP port number or here ;) https://gerrit.osmocom.org/#/c/12321/1/src/vty/telnet_interface.c at 111 PS1, Line 111: if not explicitely configured > "if not explicitely configured" ... from where? Let's clarify that VTY parameters do overwrite this 'default' port. BTW: typo: explicitely -> explicitly https://gerrit.osmocom.org/#/c/12321/1/src/vty/telnet_interface.c at 111 PS1, Line 111: * \param[in] default_port UDP port number to use if not explicitely configured > UDP? Doesn't telnet/VTY run over TCP in this universe? Agree, should be TCP. -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 17 Dec 2018 23:59:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 00:13:49 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 00:13:49 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: use struct API for fn and toa256 coding Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12341 Change subject: trx_toolkit/data_msg.py: use struct API for fn and toa256 coding ...................................................................... trx_toolkit/data_msg.py: use struct API for fn and toa256 coding The built-in struct module is already used for toa256 decoding, so let's use it for toa256 encoding, and TDMA frame number coding too - no need to (re)implement the wheel! Change-Id: I10d2e15ac57a0524e9bc1c80ed6a0f6f5a263436 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 4 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/41/12341/1 diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index 95ec9dc..bbc9d93 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -143,24 +143,13 @@ # Generates frame number to bytes def gen_fn(self, fn): - # Allocate an empty byte-array - buf = bytearray() - # Big endian, 4 bytes - buf.append((fn >> 24) & 0xff) - buf.append((fn >> 16) & 0xff) - buf.append((fn >> 8) & 0xff) - buf.append((fn >> 0) & 0xff) - - return buf + return struct.pack(">L", fn) # Parses frame number from bytes def parse_fn(self, buf): # Big endian, 4 bytes - return (buf[0] << 24) \ - | (buf[1] << 16) \ - | (buf[2] << 8) \ - | (buf[3] << 0) + return struct.unpack(">L", buf)[0] # Generates a TRX DATA message def gen_msg(self): @@ -197,7 +186,7 @@ raise ValueError("Message is to short") # Parse both fn and tn - self.fn = self.parse_fn(msg[1:]) + self.fn = self.parse_fn(msg[1:5]) self.tn = msg[0] # Specific message part @@ -381,8 +370,7 @@ # Encode ToA (Time of Arrival) # Big endian, 2 bytes (int32_t) - buf.append((self.toa256 >> 8) & 0xff) - buf.append(self.toa256 & 0xff) + buf += struct.pack(">h", self.toa256) return buf -- To view, visit https://gerrit.osmocom.org/12341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I10d2e15ac57a0524e9bc1c80ed6a0f6f5a263436 Gerrit-Change-Number: 12341 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 00:13:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 00:13:50 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: add optional legacy message coding flag Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12342 Change subject: trx_toolkit/data_msg.py: add optional legacy message coding flag ...................................................................... trx_toolkit/data_msg.py: add optional legacy message coding flag Some transceivers (e.g. OsmoTRX) have inherited a rudiment from OpenBTS - two dummy bytes at the end of TRX2L1 messages. Despite they are absolutely useless, some L1 implementations, such as trxcon and OpenBTS, still do expect them when checking the message length. Let's add an optional (disabled by default) argument to gen_msg(), that would enable adding those two dummy bytes. Change-Id: I0cf1314c399411886420176704cadd6e6d84787f --- M src/target/trx_toolkit/data_msg.py 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/42/12342/1 diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index bbc9d93..62fd29b 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -152,7 +152,7 @@ return struct.unpack(">L", buf)[0] # Generates a TRX DATA message - def gen_msg(self): + def gen_msg(self, legacy = False): # Validate all the fields if not self.validate(): raise ValueError("Message incomplete or incorrect") @@ -174,6 +174,11 @@ # Generate burst buf += self.gen_burst() + # This is a rudiment from (legacy) OpenBTS transceiver, + # some L1 implementations still expect two dummy bytes. + if legacy: + buf += bytearray(2) + return buf # Parses a TRX DATA message @@ -461,6 +466,9 @@ l12trx_raw = msg_l12trx_ref.gen_msg() trx2l1_raw = msg_trx2l1_ref.gen_msg() + # Encode a TRX2L1 message in legacy mode + trx2l1_raw_legacy = msg_trx2l1_ref.gen_msg(legacy = True) + log.info("Parsing generated messages back") # Parse generated DATA messages @@ -469,11 +477,16 @@ msg_l12trx_dec.parse_msg(l12trx_raw) msg_trx2l1_dec.parse_msg(trx2l1_raw) + # Parse generated TRX2L1 message in legacy mode + msg_trx2l1_legacy_dec = DATAMSG_TRX2L1() + msg_trx2l1_legacy_dec.parse_msg(trx2l1_raw_legacy) + log.info("Comparing decoded messages with the reference") # Compare bursts assert(msg_l12trx_dec.burst == burst_l12trx_ref) assert(msg_trx2l1_dec.burst == burst_trx2l1_ref) + assert(msg_trx2l1_legacy_dec.burst == burst_trx2l1_ref) log.info("Compare bursts: OK") -- To view, visit https://gerrit.osmocom.org/12342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0cf1314c399411886420176704cadd6e6d84787f Gerrit-Change-Number: 12342 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 00:14:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 00:14:17 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: add optional legacy message coding flag In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12262 ) Change subject: trx_toolkit/data_if.py: add optional legacy message coding flag ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6b9a8b611ea1e9badc4d9ddf13aa9e237028e39a Gerrit-Change-Number: 12262 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 00:14:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 02:48:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Dec 2018 02:48:52 +0000 Subject: Change in libosmocore[master]: add to osmo_sock_get_name*() API In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12268 to look at the new patch set (#2). Change subject: add to osmo_sock_get_name*() API ...................................................................... add to osmo_sock_get_name*() API Basically, I am applying code review that I would have given had I not been on vacation when the last osmo_sock_get_name* stuff was merged. osmo_sock_get_name2() is so far a static internal function. However, it is nothing like osmo_sock_get_name(), so instead rename it to osmo_sock_get_ip_and_port(). Also make it public API, no need to hide it. I'm adding an "and" in the name to hopefully clarify: "ip_port" vs. "ip_and_port" -- there already are _get_X_ip_port() functions that only return the port string, despite "ip" in the name. Add new public osmo_sock_get_name2(), which is like osmo_sock_get_name(), except it uses a static string instead of talloc, and omits the braces. This is most convenient for log statement formats, avoiding dyn allocations. Add new osmo_sock_get_name2_buf(), which is like osmo_sock_get_name2() but writes to a caller provided char buffer. Technically this should be called osmo_sock_get_name_buf() without '2', but that would be quite confusing. Use osmo_sock_get_name2_buf() in the implementation of osmo_sock_get_name(), but use another (non-static) local string buffer, because adding braces is too complex without talloc_snprintf(). Rationale: I want to improve the logging of socket errors, e.g. change DLMGCP ERROR Failed to read: 111/Connection refused (mgcp_client.c:720) to DLMGCP ERROR Failed to read: r=10.0.99.2:2427<->l=10.0.99.2:2728: 111='Connection refused' (mgcp_client.c:721) but it is just not handy to compose logging with the current API: - osmo_sock_get_name() requires a talloc_free(). - all the others require output buffers. - the only way to conveniently compose a logging string and, - notably, the only trivial way to skip the string composition if the logging level is currently muted, is to have a function that returns a static string: the new osmo_sock_get_name2(). - (I think the osmo_sock_get_{local,remote}_* convenience wrappers should never have been added, because they encourage the caller to invoke the same code twice, for IP addr and port, and throw away one half each time.) Related: Iae728192f499330d16836d9435648f6b8ed213b6 (osmo-mgw) Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 49 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/12268/2 -- To view, visit https://gerrit.osmocom.org/12268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 Gerrit-Change-Number: 12268 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 02:49:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Dec 2018 02:49:17 +0000 Subject: Change in libosmocore[master]: add to osmo_sock_get_name*() API In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12268 ) Change subject: add to osmo_sock_get_name*() API ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12268/1/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/#/c/12268/1/include/osmocom/core/socket.h at 64 PS1, Line 64: int osmo_sock_get_name_buf(char *str, size_t str_len, int fd); > I mean it should be named osmo_sock_get_name_buf(). [?] ok. Just to make sure, it's not confusing that osmo_sock_get_name_buf() results in "r:1.2.3.4:5<->l:4.5.6.7:8" while osmo_sock_get_name() returns a tallocd "(r:....7:8)" with braces? (I will know this, but am worried about future readers) If you're sure then I'll drop the 2. https://gerrit.osmocom.org/#/c/12268/1/src/socket.c File src/socket.c: https://gerrit.osmocom.org/#/c/12268/1/src/socket.c at 796 PS1, Line 796: * \param[out] str Destination string buffer. > Well since a variable in C cannot contain a space, it makes no sense to me to add an extra space, it [?] lol what, a variable containing a space? I do this just for readability, I find it a lot easier to spot where the doc string starts when setting it apart from the variable name. I'd even use a tab if I liked tabs. Would a tab be better? -- To view, visit https://gerrit.osmocom.org/12268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 Gerrit-Change-Number: 12268 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 02:49:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 09:16:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 18 Dec 2018 09:16:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Remove -Wall for autogenerated code In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12241 ) Change subject: Remove -Wall for autogenerated code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7ef141f7f3370a1bf909845ce8a4eb650b33fa81 Gerrit-Change-Number: 12241 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 09:16:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 09:18:01 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 18 Dec 2018 09:18:01 +0000 Subject: Change in osmo-msc[master]: msc_vty: also show IMEI and IMEISV Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12343 Change subject: msc_vty: also show IMEI and IMEISV ...................................................................... msc_vty: also show IMEI and IMEISV When the VLR subscriber information is shown on the VTY it shows IMSI and TMSI, but not IMEI and IMEISV. Since in some cases this information might be helpful, lets display it as well. Change-Id: Iedd75dbb9850388ec1fedb984ed0b8bf4c62e780 --- M src/libmsc/msc_vty.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/43/12343/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 87adc82..adcf1b1 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -639,6 +639,10 @@ if (vsub->tmsi_new != GSM_RESERVED_TMSI) vty_out(vty, " new TMSI: %08X%s", vsub->tmsi_new, VTY_NEWLINE); + if (strlen(vsub->imei)) + vty_out(vty, " IMEI: %s%s", vsub->imei, VTY_NEWLINE); + if (strlen(vsub->imeisv)) + vty_out(vty, " IMEISV: %s%s", vsub->imeisv, VTY_NEWLINE); #if 0 /* TODO: add this to vlr_subscr? */ -- To view, visit https://gerrit.osmocom.org/12343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iedd75dbb9850388ec1fedb984ed0b8bf4c62e780 Gerrit-Change-Number: 12343 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 09:18:01 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 18 Dec 2018 09:18:01 +0000 Subject: Change in osmo-msc[master]: msc_vty: display subscriber flags Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12344 Change subject: msc_vty: display subscriber flags ...................................................................... msc_vty: display subscriber flags When a VLR subscriber is displayed on the VTY we get a lot of meta information, but there are also some flags to handle the internal subscriber status e.g. conf_by_radio_contact_ind. Lets display those flags as well as this information can be very helpful when debugging problems in the VLR Change-Id: I59a9145a4daad50d68de3fd5c3291f027256917f --- M src/libmsc/msc_vty.c 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/44/12344/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index adcf1b1..7e30165 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -644,6 +644,25 @@ if (strlen(vsub->imeisv)) vty_out(vty, " IMEISV: %s%s", vsub->imeisv, VTY_NEWLINE); + vty_out(vty, " Flags: %s", VTY_NEWLINE); + vty_out(vty, " IMSI detached: %s%s", + vsub->imsi_detached_flag ? "true" : "false", VTY_NEWLINE); + vty_out(vty, " Conf. by radio contact: %s%s", + vsub->conf_by_radio_contact_ind ? "true" : "false", + VTY_NEWLINE); + vty_out(vty, " Subscr. data conf. by HLR: %s%s", + vsub->sub_dataconf_by_hlr_ind ? "true" : "false", VTY_NEWLINE); + vty_out(vty, " Location conf. in HLR: %s%s", + vsub->loc_conf_in_hlr_ind ? "true" : "false", VTY_NEWLINE); + vty_out(vty, " Subscriber dormant: %s%s", + vsub->dormant_ind ? "true" : "false", VTY_NEWLINE); + vty_out(vty, " Received cancel locataion: %s%s", + vsub->cancel_loc_rx ? "true" : "false", VTY_NEWLINE); + vty_out(vty, " MS not reachable: %s%s", + vsub->ms_not_reachable_flag ? "true" : "false", VTY_NEWLINE); + vty_out(vty, " LA allowed: %s%s", + vsub->la_allowed ? "true" : "false", VTY_NEWLINE); + #if 0 /* TODO: add this to vlr_subscr? */ if (vsub->auth_info.auth_algo != AUTH_ALGO_NONE) { -- To view, visit https://gerrit.osmocom.org/12344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I59a9145a4daad50d68de3fd5c3291f027256917f Gerrit-Change-Number: 12344 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 09:18:02 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 18 Dec 2018 09:18:02 +0000 Subject: Change in osmo-msc[master]: msc_vty: display current RAN type Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12345 Change subject: msc_vty: display current RAN type ...................................................................... msc_vty: display current RAN type When a subscriber is displayed the RAN type is not included in the overview. Meanwhile the MSC supports multiple different ran types it becomes important to see in which RAN the subscriber is currently active. Change-Id: I000cafd5e41b9951d51b6bd6672ee68a224b8212 Related: OS#3615 --- M src/libmsc/msc_vty.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/45/12345/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 7e30165..4cd1c18 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -632,6 +632,8 @@ VTY_NEWLINE); vty_out(vty, " LAC: %d/0x%x%s", vsub->lac, vsub->lac, VTY_NEWLINE); + vty_out(vty, " RAN: %s%s", + ran_type_name(vsub->cs.attached_via_ran), VTY_NEWLINE); vty_out(vty, " IMSI: %s%s", vsub->imsi, VTY_NEWLINE); if (vsub->tmsi != GSM_RESERVED_TMSI) vty_out(vty, " TMSI: %08X%s", vsub->tmsi, -- To view, visit https://gerrit.osmocom.org/12345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I000cafd5e41b9951d51b6bd6672ee68a224b8212 Gerrit-Change-Number: 12345 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 09:31:24 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 18 Dec 2018 09:31:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: adjust gsup log level to error In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12298 ) Change subject: MSC: adjust gsup log level to error ...................................................................... Patch Set 1: I am not sure if this is a very good idea. Shouldn't the integration tests log as much as possible to allow investigation afterwards. What if there is a bug hiding in the gsub code? Maybe we should try to find a more reasonable logging level for the related GSUP logging in osmo-msc? -- To view, visit https://gerrit.osmocom.org/12298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If79db99ceb7a9d4e2ec8d8b375aa628c4088c65c Gerrit-Change-Number: 12298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 18 Dec 2018 09:31:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 09:38:42 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 18 Dec 2018 09:38:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Remove -Wall for autogenerated code In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12241 ) Change subject: Remove -Wall for autogenerated code ...................................................................... Patch Set 1: Code-Review+1 > Patch Set 1: Code-Review+2 Looks ok to me. In the end I find the C++ compiler output of the generated code is not all that helpful and if there are real problems, the TTCN3 compiler usually refuses to build anyway. -- To view, visit https://gerrit.osmocom.org/12241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7ef141f7f3370a1bf909845ce8a4eb650b33fa81 Gerrit-Change-Number: 12241 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 09:38:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 10:25:47 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 10:25:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Remove -Wall for autogenerated code In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12241 ) Change subject: Remove -Wall for autogenerated code ...................................................................... Remove -Wall for autogenerated code There seems to be no option for ttcn3_makefilegen to disable generated code warnings so the only way to clear output from useless warnings about indentation and such is to manually strip -Wall using sed. Change-Id: I7ef141f7f3370a1bf909845ce8a4eb650b33fa81 --- M regen-makefile.sh 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/regen-makefile.sh b/regen-makefile.sh index a9f8562..5a4dd4c 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -33,6 +33,9 @@ # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879816 for details sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile +#remove -Wall from CXXFLAGS: we're not interested in generic warnings for autogenerated code cluttering the logs +sed -i -e 's/-Wall//' Makefile + if [ "x$CPPFLAGS_TTCN3" != "x" ]; then sed -i -e 's/CPPFLAGS_TTCN3 =/CPPFLAGS_TTCN3 = '"$CPPFLAGS_TTCN3"'/' Makefile fi -- To view, visit https://gerrit.osmocom.org/12241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7ef141f7f3370a1bf909845ce8a4eb650b33fa81 Gerrit-Change-Number: 12241 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 10:51:33 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 10:51:33 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c at 1195 PS3, Line 1195: if (!parsing_config_file) { > my question: do things break when changing during run-time? [?] I can't enumerate the consequences of changing this name on the fly. What seems obvious is that changing this name will result in some IPA connections using name A and others using name B. Likewise for routes which get installed in the HLR which refers to these names, both of which point towards the same SGSN. Will this cause real harm? I cannot tell. Will connections using the old name be negatively impacted? Maybe. What I am pretty certain about is that it risks putting the system into an inconsistent state. What I also know is that this is an unprecedented use case because Osmocom has never run in multi-MSC/multi-SGSN setups which means that we cannot really judge the consequences based on past experience. We'd have to do a lot of testing and code audit to be sure of the consequences. And all that for what looks like an edge-case to me which should never happen in real multi-MSC/multi-SGSN deployments as far as I can tell. So I'll turn the question around on you again: Why would you want to change this name without also restarting the process? What is the use case for this? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 10:51:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 10:56:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 10:56:49 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: use struct API for fn and toa256 coding In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12341 ) Change subject: trx_toolkit/data_msg.py: use struct API for fn and toa256 coding ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12341/1/src/target/trx_toolkit/data_msg.py File src/target/trx_toolkit/data_msg.py: https://gerrit.osmocom.org/#/c/12341/1/src/target/trx_toolkit/data_msg.py at 372 PS1, Line 372: # Big endian, 2 bytes (int32_t) If it's 2 bytes, why does it say int32_t (4 bytes) here? -- To view, visit https://gerrit.osmocom.org/12341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I10d2e15ac57a0524e9bc1c80ed6a0f6f5a263436 Gerrit-Change-Number: 12341 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 10:56:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 10:58:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 10:58:22 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: add optional legacy message coding flag In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12342 ) Change subject: trx_toolkit/data_msg.py: add optional legacy message coding flag ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0cf1314c399411886420176704cadd6e6d84787f Gerrit-Change-Number: 12342 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 10:58:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 10:58:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 10:58:38 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: add optional legacy message coding flag In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12262 ) Change subject: trx_toolkit/data_if.py: add optional legacy message coding flag ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6b9a8b611ea1e9badc4d9ddf13aa9e237028e39a Gerrit-Change-Number: 12262 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 10:58:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 10:58:49 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 10:58:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add MSC test for an invalid CIPHER MODE COMPLETE command In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12332 ) Change subject: add MSC test for an invalid CIPHER MODE COMPLETE command ...................................................................... Patch Set 2: Code-Review+2 > Patch Set 2: Code-Review+1 > > If the chosen cipher is not part of the offered ciphers, that should result in a LU reject, yes. In that case the current behaviour seems to be correct? Issue OS#2872 is asking for a test and a fix. Since we now have a test and the behaviour seems OK, can I simply close the issue? > > But possibly, what you have tested is that A5/2 is generally deprecated and should always be rejected? > > Please clarify this with another test run and then submit. Yes the test is still passing with A5/3 instead of A5/2. -- To view, visit https://gerrit.osmocom.org/12332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Gerrit-Change-Number: 12332 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 10:58:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 10:58:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 10:58:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add MSC test for an invalid CIPHER MODE COMPLETE command In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/12332 ) Change subject: add MSC test for an invalid CIPHER MODE COMPLETE command ...................................................................... add MSC test for an invalid CIPHER MODE COMPLETE command Add new test TC_cipher_complete_with_invalid_cipher which verifies that the MSC will reject a CIPHER MODE COMPLETE command with a cipher which wasn't part of the preceding CIPHER MODE command. Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Related: OS#2872 --- M msc/MSC_Tests.cfg M msc/MSC_Tests.ttcn M msc/expected-results.xml 3 files changed, 61 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg index 5a3c33c..b412889 100644 --- a/msc/MSC_Tests.cfg +++ b/msc/MSC_Tests.cfg @@ -60,3 +60,4 @@ #MSC_Tests.TC_lu_and_mt_call_no_dlcx_resp #MSC_Tests.TC_reset_two #MSC_Tests.TC_lu_and_mt_call +#MSC_Tests.TC_cipher_complete_with_invalid_cipher diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index dc616a8..adaeea3 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2766,6 +2766,63 @@ f_vty_config(MSCVTY, "msc", "ncss guard-timeout 0"); } +/* A5/1 only permitted on network side; attempt an invalid CIPHER MODE COMPLETE with A5/3 which MSC should reject. */ +private function f_tc_cipher_complete_with_invalid_cipher(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + pars.net.expect_auth := true; + pars.net.expect_ciph := true; + pars.net.kc_support := '02'O; /* A5/1 only */ + f_init_handler(pars); + + g_pars.vec := f_gen_auth_vec_2g(); + + /* Can't use f_perform_lu() directly. Code below is based on it. */ + + /* tell GSUP dispatcher to send this IMSI to us */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ + var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi) + f_bssap_compl_l3(l3_lu); + + f_mm_auth(); + + var OCT1 a5_net := f_alg_mask_from_cm(g_pars.cm2); + var OCT1 a5_intersect := g_pars.net.kc_support and4b a5_net; + alt { + [] BSSAP.receive(tr_BSSMAP_CipherModeCmd(a5_intersect, g_pars.vec.kc)) { + BSSAP.send(ts_BSSMAP_CipherModeCompl(int2oct(4 /* "accept" A5/3 */, 1))); + } + [] BSSAP.receive(tr_BSSMAP_CipherModeCmd(?, g_pars.vec.kc)) { + setverdict(fail, "Wrong ciphering algorithm mask in CiphModCmd"); + mtc.stop; + } + [] BSSAP.receive { + setverdict(fail, "Unknown/unexpected BSSAP received"); + mtc.stop; + } + } + + /* Expect LU reject from MSC. */ + alt { + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + setverdict(pass); + } + [] BSSAP.receive { + setverdict(fail, "Unknown/unexpected BSSAP received"); + mtc.stop; + } + } +} + +testcase TC_cipher_complete_with_invalid_cipher() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + f_vty_config(MSCVTY, "network", "encryption a5 1"); + + vc_conn := f_start_handler(refers(f_tc_cipher_complete_with_invalid_cipher), 52); + vc_conn.done; +} + /* TODO (SMS): * different user data lengths * SMPP transaction mode with unsuccessful delivery @@ -2854,6 +2911,8 @@ execute( TC_lu_and_mo_ussd_mo_release() ); execute( TC_lu_and_ss_session_timeout() ); + execute( TC_cipher_complete_with_invalid_cipher() ); + /* Run this last: at the time of writing this test crashes the MSC */ execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() ); execute( TC_mo_cc_bssmap_clear() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 4a9529e..83c8010 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -69,6 +69,7 @@ + -- To view, visit https://gerrit.osmocom.org/12332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4492eb7d77371aaa047abae81a2dcf26fe46eb6a Gerrit-Change-Number: 12332 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 11:06:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 11:06:27 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 11:06:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 11:07:05 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 11:07:05 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 11:07:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 11:07:50 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 18 Dec 2018 11:07:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... Patch Set 8: (4 comments) I have rebased this and checked it in docker, everything looks still good. https://gerrit.osmocom.org/#/c/11897/4/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11897/4/msc/MSC_Tests.ttcn at 1984 PS4, Line 1984: [] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) > so ... [?] This is a bit confusing. The SMS is triggered from MTC_CT. I have borrowed from another test. I think this is due to the missing VTY support in BSC_ConnHdlr. However, it works fine but probably it would be nicer to have the VTY access right here in the BSC_ConnHdlr. https://gerrit.osmocom.org/#/c/11897/4/msc/MSC_Tests.ttcn at 1986 PS4, Line 1986: page_count := page_count + 1; > if above LU ended up negotiating a TMSI, I actually expect Paging by TMSI? The IMSI is a mandatory field in the BSSMAP PAGING message see also: 3GPP TS 48.008 3.2.1.19. The other SMS tests work the same way. I think this fine. https://gerrit.osmocom.org/#/c/11897/4/msc/MSC_Tests.ttcn at 2028 PS4, Line 2028: } > ah. [?] Done https://gerrit.osmocom.org/#/c/11897/6/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11897/6/msc/MSC_Tests.ttcn at 2000 PS6, Line 2000: timer T := 20.0; > I think the other 10 iterations wouldn't take that much time. [?] The messages appear in intervals of approx. 10sec. So the timer that checks if the paging really has stopped must be at least 10sec. I use 20sec to be absolutely sure. -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 18 Dec 2018 11:07:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 11:09:30 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 11:09:30 +0000 Subject: Change in osmo-msc[master]: VLR tests: avoid leaking LAC access details In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12337 ) Change subject: VLR tests: avoid leaking LAC access details ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Yes I agree this is better. https://gerrit.osmocom.org/#/c/12337/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12337/1//COMMIT_MSG at 10 PS1, Line 10: test output: that's irrelevant clutter which forces unnucessary test typo: "unnecessary" -- To view, visit https://gerrit.osmocom.org/12337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e Gerrit-Change-Number: 12337 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 11:09:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 11:11:47 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 11:11:47 +0000 Subject: Change in osmo-msc[master]: VLR tests: add logging macro with explicit value description In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12336 ) Change subject: VLR tests: add logging macro with explicit value description ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12336/1/tests/msc_vlr/msc_vlr_tests.h File tests/msc_vlr/msc_vlr_tests.h: https://gerrit.osmocom.org/#/c/12336/1/tests/msc_vlr/msc_vlr_tests.h at 185 PS1, Line 185: #define V_ASSERT(desc, val, expect_op, fmt) \ Perhaps call this VAL_ASSERT instead of V_ASSERT? It's hard to tell the semantic difference between V_ and VERBOSE_; VAL_ and VERBOSE_ would be a clearer distinction. -- To view, visit https://gerrit.osmocom.org/12336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic462297edac4c55689f93cc45771c8b5e2aed864 Gerrit-Change-Number: 12336 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 11:11:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 11:13:08 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 11:13:08 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 11:13:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 11:15:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 11:15:17 +0000 Subject: Change in libosmocore[master]: add to osmo_sock_get_name*() API In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12268 ) Change subject: add to osmo_sock_get_name*() API ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12268/1/include/osmocom/core/socket.h File include/osmocom/core/socket.h: https://gerrit.osmocom.org/#/c/12268/1/include/osmocom/core/socket.h at 64 PS1, Line 64: int osmo_sock_get_name2_buf(char *str, size_t str_len, int fd); > ok. Just to make sure, it's not confusing that osmo_sock_get_name_buf() results in "r:1.2.3. [?] The function name contains "buf" some some reason, so readers should be able to figure out there's 2 functions for some reason and that they are not exactly the same. Furthermore, future readers, as their name indicate, are capable of reading the function documentation and few lines of code :) So yes, let's please remove unneeded 2. https://gerrit.osmocom.org/#/c/12268/1/src/socket.c File src/socket.c: https://gerrit.osmocom.org/#/c/12268/1/src/socket.c at 796 PS1, Line 796: * \param[out] str Destination string buffer. > lol what, a variable containing a space? I do this just for readability, I find it a lot easier to s [?] Not really, but it's not really important, you can leave it like that if you want. Just wanted to make sure at least you were aware of it. -- To view, visit https://gerrit.osmocom.org/12268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 Gerrit-Change-Number: 12268 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 11:15:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 11:15:40 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 11:15:40 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11751 ) Change subject: GSUP/SMS: introduce READY-FOR-SM message ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/11751/6/src/gsm/gsup.c File src/gsm/gsup.c: https://gerrit.osmocom.org/#/c/11751/6/src/gsm/gsup.c at 710 PS6, Line 710: if ((u8 = gsup_msg->sm_alert_rsn)) { > Well, this approach is quite common, look at: [?] The only benefit is that it would help code readers like me :) I think it is more obvious to check against != NONE if there's a NONE value specifically defined for this set of values. -- To view, visit https://gerrit.osmocom.org/11751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Gerrit-Change-Number: 11751 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 11:15:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 11:16:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 11:16:44 +0000 Subject: Change in osmo-msc[master]: msc_vty: also show IMEI and IMEISV In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12343 ) Change subject: msc_vty: also show IMEI and IMEISV ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12343/2/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12343/2/src/libmsc/msc_vty.c at 642 PS2, Line 642: if (strlen(vsub->imei)) Simply check like this: if (vsub->imei[0] != '\0') -- To view, visit https://gerrit.osmocom.org/12343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedd75dbb9850388ec1fedb984ed0b8bf4c62e780 Gerrit-Change-Number: 12343 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 11:16:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 11:18:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 11:18:43 +0000 Subject: Change in osmo-msc[master]: msc_vty: display current RAN type In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12345 ) Change subject: msc_vty: display current RAN type ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I000cafd5e41b9951d51b6bd6672ee68a224b8212 Gerrit-Change-Number: 12345 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 11:18:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 11:20:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 11:20:07 +0000 Subject: Change in osmo-msc[master]: msc_vty: display subscriber flags In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12344 ) Change subject: msc_vty: display subscriber flags ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12344/2/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12344/2/src/libmsc/msc_vty.c at 652 PS2, Line 652: VTY_NEWLINE); Can you put this one in same line with true and false? -- To view, visit https://gerrit.osmocom.org/12344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I59a9145a4daad50d68de3fd5c3291f027256917f Gerrit-Change-Number: 12344 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 11:20:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 11:43:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 11:43:17 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: use struct API for fn and toa256 coding In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12341 ) Change subject: trx_toolkit/data_msg.py: use struct API for fn and toa256 coding ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12341/1/src/target/trx_toolkit/data_msg.py File src/target/trx_toolkit/data_msg.py: https://gerrit.osmocom.org/#/c/12341/1/src/target/trx_toolkit/data_msg.py at 372 PS1, Line 372: # Big endian, 2 bytes (int32_t) > If it's 2 bytes, why does it say int32_t (4 bytes) here? This is a typo, of course. I will fix it soon, separately. -- To view, visit https://gerrit.osmocom.org/12341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I10d2e15ac57a0524e9bc1c80ed6a0f6f5a263436 Gerrit-Change-Number: 12341 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 11:43:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 12:53:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 18 Dec 2018 12:53:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Hello daniel, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11697 to look at the new patch set (#11). Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... BSC_ConnectionHandler: introduce ctrl interface There are some upcomming tests which require to access the control interface of the MSC while the actual test is running. Future test cases (e.g. Paging, see also Change Id: a6a1a6bd6da1bf46d6d703be495795d3610ca431) will use this. Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Related: OS#3615 Related: OS#3187 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/11697/11 -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 12:53:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 18 Dec 2018 12:53:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: Add SGs testcases In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#17) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: Add SGs testcases ...................................................................... WIP: MSC_Tests: Add SGs testcases This extens MSC_Tests.ttcn with an initial set of SGs interface test cases for RESET, LU, DETACH, PAGING, SMS and CSFB procedures In particular the following testcases are added: - TC_sgsap_reset: isolated reset procedure test - TC_sgsap_lu: isolated location update with TMSI realloc - TC_sgsap_lu_imsi_reject: location update, reject case - TC_sgsap_lu_and_nothing: location update with failed TMSI realloc - TC_sgsap_expl_imsi_det_eps: detach from EPS serveces - TC_sgsap_expl_imsi_det_noneps: detach from non-EPS services - TC_sgsap_paging_rej: isolated paging, reject case - TC_sgsap_paging_subscr_rej: isolated paging, subscr rejects call - TC_sgsap_paging_ue_unr: isolated paging, ue is unreachable - TC_sgsap_paging_and_nothing: page, but don't respond - TC_sgsap_mt_sms: mobile terminated SMS through SGs Interface - TC_sgsap_mo_sms: mobile originated SMS through SGs Interface - TC_sgsap_mt_sms_and_nothing: trigger SMS, but don't respond to paging - TC_sgsap_mt_sms_and_reject: trigger SMS, but reject paging - TC_sgsap_unexp_ud: Send unexpected unitdata (SGs Association: NULL) - TC_sgsap_unsol_ud: Send unsolicited unitdata (subscriber not in VLR) - TC_bssap_lu_sgsap_lu_and_mt_call: LU on 2G, LU on SGs and CSFB call - TC_sgsap_lu_and_mt_call: LU on SGs, and CSFB call Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Related: OS#3645 --- M library/SGsAP_Emulation.ttcn M library/SGsAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/expected-results.xml M msc/gen_links.sh M msc/regen_makefile.sh 7 files changed, 1,105 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11488/17 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 17 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 13:22:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Dec 2018 13:22:28 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Add support for gpsd < 2.96 In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12340 ) Change subject: sysmobts_mgr: Add support for gpsd < 2.96 ...................................................................... Patch Set 3: Code-Review+1 don't know anything about this, but it looks sane to me -- To view, visit https://gerrit.osmocom.org/12340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b Gerrit-Change-Number: 12340 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 13:22:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 13:32:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 13:32:43 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Add support for gpsd < 2.96 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12340 ) Change subject: sysmobts_mgr: Add support for gpsd < 2.96 ...................................................................... Patch Set 3: Code-Review+2 I really have no understanding about GPSD protocol/API changes. But assuming you have tested this... -- To view, visit https://gerrit.osmocom.org/12340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b Gerrit-Change-Number: 12340 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 13:32:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 13:34:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 13:34:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: Add SGs testcases In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: Add SGs testcases ...................................................................... Patch Set 17: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 17 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 13:34:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 13:36:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 13:36:27 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: add optional legacy message coding flag In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12342 ) Change subject: trx_toolkit/data_msg.py: add optional legacy message coding flag ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0cf1314c399411886420176704cadd6e6d84787f Gerrit-Change-Number: 12342 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 13:36:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 13:36:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 13:36:55 +0000 Subject: Change in osmo-msc[master]: msc_vty: display subscriber flags In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12344 ) Change subject: msc_vty: display subscriber flags ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I59a9145a4daad50d68de3fd5c3291f027256917f Gerrit-Change-Number: 12344 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 13:36:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 13:50:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Dec 2018 13:50:50 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Prepare code for gpsd < 2.96 support In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12339 ) Change subject: sysmobts_mgr: Prepare code for gpsd < 2.96 support ...................................................................... Patch Set 1: I don't see the line putting gpsdata = &gpsdata_buf -- To view, visit https://gerrit.osmocom.org/12339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f Gerrit-Change-Number: 12339 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 18 Dec 2018 13:50:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 13:52:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Dec 2018 13:52:12 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Prepare code for gpsd < 2.96 support In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12339 ) Change subject: sysmobts_mgr: Prepare code for gpsd < 2.96 support ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12339/1/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c File src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c: https://gerrit.osmocom.org/#/c/12339/1/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c at 145 PS1, Line 145: here should be gpsdata = &gpsdata_buf or this would be a segfault, right? -- To view, visit https://gerrit.osmocom.org/12339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f Gerrit-Change-Number: 12339 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 18 Dec 2018 13:52:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:23:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 14:23:11 +0000 Subject: Change in osmo-msc[master]: VLR tests: add logging macro with explicit value description In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12336 to look at the new patch set (#2). Change subject: VLR tests: add logging macro with explicit value description ...................................................................... VLR tests: add logging macro with explicit value description To avoid leaking structure details into test we sometimes have to separate value description from actual value. Introduce new macro which makes that possible and convert old one into trivial wrapper around it. Change-Id: Ic462297edac4c55689f93cc45771c8b5e2aed864 --- M tests/msc_vlr/msc_vlr_tests.h 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/36/12336/2 -- To view, visit https://gerrit.osmocom.org/12336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic462297edac4c55689f93cc45771c8b5e2aed864 Gerrit-Change-Number: 12336 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:23:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 14:23:11 +0000 Subject: Change in osmo-msc[master]: VLR tests: avoid leaking LAC access details In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12337 to look at the new patch set (#2). Change subject: VLR tests: avoid leaking LAC access details ...................................................................... VLR tests: avoid leaking LAC access details Avoid leaking details on accessing data structure for LAC value into test output: that's irrelevant clutter which forces unnucessary test output modifications. Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e --- M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_ss.err 4 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/37/12337/2 -- To view, visit https://gerrit.osmocom.org/12337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e Gerrit-Change-Number: 12337 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:23:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 14:23:11 +0000 Subject: Change in osmo-msc[master]: Remove redundancy in LAC processing In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12338 to look at the new patch set (#2). Change subject: Remove redundancy in LAC processing ...................................................................... Remove redundancy in LAC processing Always use LAC which is part of Cell Global ID otherwise we might end up in a situation where separately stored LAC differs. Both are described in 3GPP TS 23.008 $2.4 as temporary subscriber data to be stored in VLR. Both are defined in 3GPP TS 23.003. The LAC is part of LAI which is part of CGI so there should be no case when those values differ for a given subscriber. Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e --- M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/msc_vty.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_ss.c 8 files changed, 9 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/12338/2 -- To view, visit https://gerrit.osmocom.org/12338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e Gerrit-Change-Number: 12338 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:23:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 14:23:11 +0000 Subject: Change in osmo-msc[master]: VLR: drop unused struct members In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12335 to look at the new patch set (#2). Change subject: VLR: drop unused struct members ...................................................................... VLR: drop unused struct members Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 --- M include/osmocom/msc/vlr.h 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/35/12335/2 -- To view, visit https://gerrit.osmocom.org/12335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 Gerrit-Change-Number: 12335 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:28:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 14:28:08 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Prepare code for gpsd < 2.96 support In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12339 to look at the new patch set (#2). Change subject: sysmobts_mgr: Prepare code for gpsd < 2.96 support ...................................................................... sysmobts_mgr: Prepare code for gpsd < 2.96 support API prior to that version allocates the pointer internally. Let's change current code to always use a pointer and in current supported code (gpsd >= 2.96) point it to a user-allocated struct. Follow-up patch will introduce necessary ifdefs to support older gpsd. Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f --- M src/osmo-bts-sysmo/misc/sysmobts_mgr.h M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c 2 files changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/39/12339/2 -- To view, visit https://gerrit.osmocom.org/12339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f Gerrit-Change-Number: 12339 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:28:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 14:28:08 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Add support for gpsd < 2.96 In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12340 to look at the new patch set (#4). Change subject: sysmobts_mgr: Add support for gpsd < 2.96 ...................................................................... sysmobts_mgr: Add support for gpsd < 2.96 This allows running sysmobts-mgr on systems with old gpsd releases (which may have other software depending on such old release). GPSD_API_MAJOR_VERSION define was first added in gpsd 2.39, before that it didn't exist (but this code is known to work against 2.38). GPSD_API_MAJOR_VERSION == 5 was set in version 2.96. Related gpsd commits: 3771dba081bd1175adab6096d7b6270d3822aaa1 e69bcb6b01af6b25c6a525fb1961b92ac04f5213 Related: SYS#4290 Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b --- M src/osmo-bts-sysmo/misc/sysmobts_mgr.h M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c 2 files changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/12340/4 -- To view, visit https://gerrit.osmocom.org/12340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b Gerrit-Change-Number: 12340 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:31:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 14:31:17 +0000 Subject: Change in osmo-msc[master]: VLR tests: add logging macro with explicit value description In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12336 ) Change subject: VLR tests: add logging macro with explicit value description ...................................................................... Patch Set 2: Code-Review+1 Please next time put together in same commit a define with its users. Same when you remove stuff. Let's not leave stuff dangling unused. -- To view, visit https://gerrit.osmocom.org/12336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic462297edac4c55689f93cc45771c8b5e2aed864 Gerrit-Change-Number: 12336 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 14:31:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:31:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 14:31:36 +0000 Subject: Change in osmo-msc[master]: VLR tests: avoid leaking LAC access details In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12337 ) Change subject: VLR tests: avoid leaking LAC access details ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e Gerrit-Change-Number: 12337 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 14:31:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:31:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 14:31:48 +0000 Subject: Change in osmo-msc[master]: Remove redundancy in LAC processing In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12338 ) Change subject: Remove redundancy in LAC processing ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e Gerrit-Change-Number: 12338 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 14:31:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:31:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 14:31:59 +0000 Subject: Change in osmo-msc[master]: VLR: drop unused struct members In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12335 ) Change subject: VLR: drop unused struct members ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 Gerrit-Change-Number: 12335 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 14:31:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:32:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 14:32:46 +0000 Subject: Change in osmo-msc[master]: VLR tests: add logging macro with explicit value description In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12336 ) Change subject: VLR tests: add logging macro with explicit value description ...................................................................... Patch Set 2: Code-Review+2 Trivial rename from previous revision which got +2 already. -- To view, visit https://gerrit.osmocom.org/12336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic462297edac4c55689f93cc45771c8b5e2aed864 Gerrit-Change-Number: 12336 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 14:32:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:33:22 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 14:33:22 +0000 Subject: Change in osmo-msc[master]: VLR tests: avoid leaking LAC access details In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12337 ) Change subject: VLR tests: avoid leaking LAC access details ...................................................................... Patch Set 2: Code-Review+2 Trivial macro rename from earlier revision which got +2 already. -- To view, visit https://gerrit.osmocom.org/12337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e Gerrit-Change-Number: 12337 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 14:33:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:35:10 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 14:35:10 +0000 Subject: Change in osmo-msc[master]: VLR tests: add logging macro with explicit value description In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12336 ) Change subject: VLR tests: add logging macro with explicit value description ...................................................................... VLR tests: add logging macro with explicit value description To avoid leaking structure details into test we sometimes have to separate value description from actual value. Introduce new macro which makes that possible and convert old one into trivial wrapper around it. Change-Id: Ic462297edac4c55689f93cc45771c8b5e2aed864 --- M tests/msc_vlr/msc_vlr_tests.h 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Max: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index f7ff940..7eb6d24 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -182,11 +182,13 @@ OSMO_ASSERT(accepted == expect_accepted); \ } while (false) -#define VERBOSE_ASSERT(val, expect_op, fmt) \ +#define VAL_ASSERT(desc, val, expect_op, fmt) \ do { \ - log(#val " == " fmt, (val)); \ + log(desc " == " fmt, (val)); \ OSMO_ASSERT((val) expect_op); \ - } while (0); + } while (0) + +#define VERBOSE_ASSERT(val, expect_op, fmt) VAL_ASSERT(#val, val, expect_op, fmt) #define EXPECT_CONN_COUNT(N) VERBOSE_ASSERT(llist_count(&net->ran_conns), == N, "%d") -- To view, visit https://gerrit.osmocom.org/12336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic462297edac4c55689f93cc45771c8b5e2aed864 Gerrit-Change-Number: 12336 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:37:21 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 14:37:21 +0000 Subject: Change in osmo-msc[master]: VLR tests: avoid leaking LAC access details In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12337 to look at the new patch set (#3). Change subject: VLR tests: avoid leaking LAC access details ...................................................................... VLR tests: avoid leaking LAC access details Avoid leaking details on accessing data structure for LAC value into test output: that's irrelevant clutter which forces unnecessary test output modifications. Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e --- M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_ss.err 4 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/37/12337/3 -- To view, visit https://gerrit.osmocom.org/12337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e Gerrit-Change-Number: 12337 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:40:53 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 14:40:53 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: use struct API for fn and toa256 coding In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12341 ) Change subject: trx_toolkit/data_msg.py: use struct API for fn and toa256 coding ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I10d2e15ac57a0524e9bc1c80ed6a0f6f5a263436 Gerrit-Change-Number: 12341 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 14:40:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:44:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 14:44:17 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: refactor global class hierarchy In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12264 ) Change subject: trx_toolkit/fake_trx.py: refactor global class hierarchy ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice44e2b22566b3652ef6d43896055963b13ab185 Gerrit-Change-Number: 12264 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 14:44:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:44:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 14:44:25 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: use struct API for fn and toa256 coding In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12341 ) Change subject: trx_toolkit/data_msg.py: use struct API for fn and toa256 coding ...................................................................... trx_toolkit/data_msg.py: use struct API for fn and toa256 coding The built-in struct module is already used for toa256 decoding, so let's use it for toa256 encoding, and TDMA frame number coding too - no need to (re)implement the wheel! Change-Id: I10d2e15ac57a0524e9bc1c80ed6a0f6f5a263436 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 4 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, approved diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index 95ec9dc..bbc9d93 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -143,24 +143,13 @@ # Generates frame number to bytes def gen_fn(self, fn): - # Allocate an empty byte-array - buf = bytearray() - # Big endian, 4 bytes - buf.append((fn >> 24) & 0xff) - buf.append((fn >> 16) & 0xff) - buf.append((fn >> 8) & 0xff) - buf.append((fn >> 0) & 0xff) - - return buf + return struct.pack(">L", fn) # Parses frame number from bytes def parse_fn(self, buf): # Big endian, 4 bytes - return (buf[0] << 24) \ - | (buf[1] << 16) \ - | (buf[2] << 8) \ - | (buf[3] << 0) + return struct.unpack(">L", buf)[0] # Generates a TRX DATA message def gen_msg(self): @@ -197,7 +186,7 @@ raise ValueError("Message is to short") # Parse both fn and tn - self.fn = self.parse_fn(msg[1:]) + self.fn = self.parse_fn(msg[1:5]) self.tn = msg[0] # Specific message part @@ -381,8 +370,7 @@ # Encode ToA (Time of Arrival) # Big endian, 2 bytes (int32_t) - buf.append((self.toa256 >> 8) & 0xff) - buf.append(self.toa256 & 0xff) + buf += struct.pack(">h", self.toa256) return buf -- To view, visit https://gerrit.osmocom.org/12341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I10d2e15ac57a0524e9bc1c80ed6a0f6f5a263436 Gerrit-Change-Number: 12341 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:44:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 14:44:25 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: add optional legacy message coding flag In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12342 ) Change subject: trx_toolkit/data_msg.py: add optional legacy message coding flag ...................................................................... trx_toolkit/data_msg.py: add optional legacy message coding flag Some transceivers (e.g. OsmoTRX) have inherited a rudiment from OpenBTS - two dummy bytes at the end of TRX2L1 messages. Despite they are absolutely useless, some L1 implementations, such as trxcon and OpenBTS, still do expect them when checking the message length. Let's add an optional (disabled by default) argument to gen_msg(), that would enable adding those two dummy bytes. Change-Id: I0cf1314c399411886420176704cadd6e6d84787f --- M src/target/trx_toolkit/data_msg.py 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Harald Welte: Looks good to me, approved diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index bbc9d93..62fd29b 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -152,7 +152,7 @@ return struct.unpack(">L", buf)[0] # Generates a TRX DATA message - def gen_msg(self): + def gen_msg(self, legacy = False): # Validate all the fields if not self.validate(): raise ValueError("Message incomplete or incorrect") @@ -174,6 +174,11 @@ # Generate burst buf += self.gen_burst() + # This is a rudiment from (legacy) OpenBTS transceiver, + # some L1 implementations still expect two dummy bytes. + if legacy: + buf += bytearray(2) + return buf # Parses a TRX DATA message @@ -461,6 +466,9 @@ l12trx_raw = msg_l12trx_ref.gen_msg() trx2l1_raw = msg_trx2l1_ref.gen_msg() + # Encode a TRX2L1 message in legacy mode + trx2l1_raw_legacy = msg_trx2l1_ref.gen_msg(legacy = True) + log.info("Parsing generated messages back") # Parse generated DATA messages @@ -469,11 +477,16 @@ msg_l12trx_dec.parse_msg(l12trx_raw) msg_trx2l1_dec.parse_msg(trx2l1_raw) + # Parse generated TRX2L1 message in legacy mode + msg_trx2l1_legacy_dec = DATAMSG_TRX2L1() + msg_trx2l1_legacy_dec.parse_msg(trx2l1_raw_legacy) + log.info("Comparing decoded messages with the reference") # Compare bursts assert(msg_l12trx_dec.burst == burst_l12trx_ref) assert(msg_trx2l1_dec.burst == burst_trx2l1_ref) + assert(msg_trx2l1_legacy_dec.burst == burst_trx2l1_ref) log.info("Compare bursts: OK") -- To view, visit https://gerrit.osmocom.org/12342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0cf1314c399411886420176704cadd6e6d84787f Gerrit-Change-Number: 12342 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:44:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 14:44:26 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: add optional legacy message coding flag In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12262 ) Change subject: trx_toolkit/data_if.py: add optional legacy message coding flag ...................................................................... trx_toolkit/data_if.py: add optional legacy message coding flag In I6b9a8b611ea1e9badc4d9ddf13aa9e237028e39a an optional legacy message coding mode was introduced. Let's add the corresponding argument to send_msg() and pass it to gen_msg(). Change-Id: I6b9a8b611ea1e9badc4d9ddf13aa9e237028e39a --- M src/target/trx_toolkit/data_if.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index 79584da..a773c04 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -62,13 +62,13 @@ return msg - def send_msg(self, msg): + def send_msg(self, msg, legacy = False): # Validate a message if not msg.validate(): raise ValueError("Message incomplete or incorrect") # Generate TRX message - payload = msg.gen_msg() + payload = msg.gen_msg(legacy) # Send message self.send(payload) -- To view, visit https://gerrit.osmocom.org/12262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6b9a8b611ea1e9badc4d9ddf13aa9e237028e39a Gerrit-Change-Number: 12262 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:44:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 14:44:28 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx.py: refactor global class hierarchy In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12264 ) Change subject: trx_toolkit/fake_trx.py: refactor global class hierarchy ...................................................................... trx_toolkit/fake_trx.py: refactor global class hierarchy This change is a big step towards handling of multiple transceivers in a single process, i.e. multiple MS and multiple BTS connections. The old class hierarchy wasn't flexible enough, because initially fake_trx was designed as a bridge between OsmocomBB and OsmoBTS, but not as the burst router. There were two separate, but 90% similar implementations of the CTRL interface, two variations of each simulation parameter - one for UL, another for DL. The following new classes are introduced: - Transceiver - represents a single transceiver, that can be used as for the BTS side, as for the MS side. Each instance has its own CTRL, DATA, and (optionally) CLCK interfaces, among with basic state variables, such as both RX / TX freq., power state (running or idle) and list of active timeslots. - CTRLInterfaceTRX - unified control interface handler for common transceiver management commands, such as POWERON, RXTUNE, and SETSLOT. Deprecates both CTRLInterface{BB|BTS}. - FakeTRX - basically, a child of Transceiver, extended with RF path (burst loss, RSSI, TA, ToA) simulation. Implements a custom CTRL command handler for CTRLInterfaceTRX. The following classes were refactored: - BurstForwarder - still performs burst forwarding, but now it doesn't store any simulation parameters, and doesn't know who is BTS, and who is MS. Actually, BurstForwarder transforms each L12TRX message into a TRX2L1 message, and dispatches it between running transceivers with matching RX frequency and matching timeslot. - FakePM - still generates random RSSI values, but doesn't distinguish between MS and BTS anymore. As soon as a measurement request is received, it attempts to find at least one running TRX on a given frequency. Please note that fake_trx.py still does handle only a single pair of MS and BTS. No regressions have been observed. Both new and refactored classes were documented. Change-Id: Ice44e2b22566b3652ef6d43896055963b13ab185 Related: OS#3667 --- M src/target/trx_toolkit/burst_fwd.py D src/target/trx_toolkit/ctrl_if_bb.py D src/target/trx_toolkit/ctrl_if_bts.py A src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/fake_pm.py M src/target/trx_toolkit/fake_trx.py A src/target/trx_toolkit/transceiver.py 7 files changed, 652 insertions(+), 779 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 3cb6acd..38ce18f 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # TRX Toolkit -# BTS <-> BB burst forwarding +# Burst forwarding between transceivers # # (C) 2017-2018 by Vadim Yanitskiy # @@ -23,321 +23,62 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import logging as log -import random - -from data_msg import * class BurstForwarder: - """ Performs burst forwarding and preprocessing between MS and BTS. + """ Performs burst forwarding between transceivers. - == Pass-filtering parameters + BurstForwarder distributes bursts between the list of given + FakeTRX (Transceiver) instances depending on the following + parameters of each transceiver: - BurstForwarder may drop or pass an UL/DL burst depending - on the following parameters: + - execution state (running or idle), + - actual RX / TX frequencies, + - list of active timeslots. - - bts_freq / bb_freq - the current BTS / MS frequency - that was set using RXTUNE control command. By default, - both freq. values are set to None, so nothing is being - forwarded (i.e. bursts are getting dropped). - - FIXME: currently, we don't care about TXTUNE command - and transmit frequencies. It would be great to distinguish - between RX and TX frequencies for both BTS and MS. - - - ts_pass_list - the list of active (i.e. configured) - timeslot numbers for the MS. A timeslot can be activated - or deactivated using SETSLOT control command from the MS. - - FIXME: there is no such list for the BTS side. - - == Preprocessing and measurement simulation - - Since this is a virtual environment, we can simulate different - parameters of a virtual RF interface: - - - ToA (Timing of Arrival) - measured difference between expected - and actual time of burst arrival in units of 1/256 of GSM symbol - periods. A pair of both base and threshold values defines a range - of ToA value randomization: - - DL: from (toa256_dl_base - toa256_dl_threshold) - to (toa256_dl_base + toa256_dl_threshold), - UL: from (toa256_ul_base - toa256_ul_threshold) - to (toa256_ul_base + toa256_ul_threshold). - - - RSSI (Received Signal Strength Indication) - measured "power" of - the signal (per burst) in dBm. A pair of both base and threshold - values defines a range of RSSI value randomization: - - DL: from (rssi_dl_base - rssi_dl_threshold) - to (rssi_dl_base + rssi_dl_threshold), - UL: from (rssi_ul_base - rssi_ul_threshold) - to (rssi_ul_base + rssi_ul_threshold). - - Please note that the randomization of both RSSI and ToA - is optional, and can be enabled from the control interface. - - === Timing Advance handling - - The BTS is using ToA measurements for UL bursts in order to calculate - Timing Advance value, that is then indicated to a MS, which in its turn - shall apply this value to the transmitted signal in order to compensate - the delay. Basically, every burst is transmitted in advance defined by - the indicated Timing Advance value. The valid range is 0..63, where - each unit means one GSM symbol advance. The actual Timing Advance value - is set using SETTA control command from MS. By default, it's set to 0. - - === Path loss simulation - burst dropping - - In some cases, e.g. due to a weak signal or high interference, a burst - can be lost, i.e. not detected by the receiver. This can also be - simulated using FAKE_DROP command on both control interfaces: - - - burst_{dl|ul}_drop_amount - the amount of DL/UL bursts - to be dropped (i.e. not forwarded towards the MS/BTS), - - - burst_{dl|ul}_drop_period - drop every X DL/UL burst, e.g. - 1 - drop every consequent burst, 2 - drop every second burst, etc. + Each to be distributed L12TRX message is being transformed + into a TRX2L1 message, and then forwarded to transceivers + with partially initialized header. All uninitialized header + fields (such as rssi and toa256) shall be set by each + transceiver individually before sending towards the L1. """ - def __init__(self, bts_link, bb_link): - self.bts_link = bts_link - self.bb_link = bb_link + def __init__(self, trx_list = []): + # List of Transceiver instances + self.trx_list = trx_list - # Init default parameters - self.reset_dl() - self.reset_ul() + def add_trx(self, trx): + if trx in self.trx_list: + log.error("TRX is already in the list") + return - # Initialize (or reset to) default parameters for Downlink - def reset_dl(self): - # Unset current DL freq. - self.bts_freq = None + self.trx_list.append(trx) - # Indicated RSSI / ToA values - self.toa256_dl_base = 0 - self.rssi_dl_base = -60 + def del_trx(self, trx): + if trx not in self.trx_list: + log.error("TRX is not in the list") + return - # RSSI / ToA randomization threshold - self.toa256_dl_threshold = 0 - self.rssi_dl_threshold = 0 + self.trx_list.remove(trx) - # Path loss simulation (burst dropping) - self.burst_dl_drop_amount = 0 - self.burst_dl_drop_period = 1 + def forward_msg(self, src_trx, rx_msg): + # Transform from L12TRX to TRX2L1 + tx_msg = rx_msg.gen_trx2l1() + if tx_msg is None: + log.error("Forwarding failed, could not transform " + "message (%s) => dropping..." % rx_msg.desc_hdr()) - # Initialize (or reset to) default parameters for Uplink - def reset_ul(self): - # Unset current DL freq. - self.bb_freq = None + # Iterate over all known transceivers + for trx in self.trx_list: + if trx == src_trx: + continue - # Indicated RSSI / ToA values - self.rssi_ul_base = -70 - self.toa256_ul_base = 0 + # Check transceiver state + if not trx.running: + continue + if trx.rx_freq != src_trx.tx_freq: + continue + if tx_msg.tn not in trx.ts_list: + continue - # RSSI / ToA randomization threshold - self.toa256_ul_threshold = 0 - self.rssi_ul_threshold = 0 - - # Path loss simulation (burst dropping) - self.burst_ul_drop_amount = 0 - self.burst_ul_drop_period = 1 - - # Init timeslot filter (drop everything by default) - self.ts_pass_list = [] - - # Reset Timing Advance value - self.ta = 0 - - # Converts TA value from symbols to - # units of 1/256 of GSM symbol periods - def calc_ta256(self): - return self.ta * 256 - - # Calculates a random ToA value for Downlink bursts - def calc_dl_toa256(self): - # Check if randomization is required - if self.toa256_dl_threshold is 0: - return self.toa256_dl_base - - # Calculate a range for randomization - toa256_min = self.toa256_dl_base - self.toa256_dl_threshold - toa256_max = self.toa256_dl_base + self.toa256_dl_threshold - - # Generate a random ToA value - toa256 = random.randint(toa256_min, toa256_max) - - return toa256 - - # Calculates a random ToA value for Uplink bursts - def calc_ul_toa256(self): - # Check if randomization is required - if self.toa256_ul_threshold is 0: - return self.toa256_ul_base - - # Calculate a range for randomization - toa256_min = self.toa256_ul_base - self.toa256_ul_threshold - toa256_max = self.toa256_ul_base + self.toa256_ul_threshold - - # Generate a random ToA value - toa256 = random.randint(toa256_min, toa256_max) - - return toa256 - - # Calculates a random RSSI value for Downlink bursts - def calc_dl_rssi(self): - # Check if randomization is required - if self.rssi_dl_threshold is 0: - return self.rssi_dl_base - - # Calculate a range for randomization - rssi_min = self.rssi_dl_base - self.rssi_dl_threshold - rssi_max = self.rssi_dl_base + self.rssi_dl_threshold - - # Generate a random RSSI value - return random.randint(rssi_min, rssi_max) - - # Calculates a random RSSI value for Uplink bursts - def calc_ul_rssi(self): - # Check if randomization is required - if self.rssi_ul_threshold is 0: - return self.rssi_ul_base - - # Calculate a range for randomization - rssi_min = self.rssi_ul_base - self.rssi_ul_threshold - rssi_max = self.rssi_ul_base + self.rssi_ul_threshold - - # Generate a random RSSI value - return random.randint(rssi_min, rssi_max) - - # DL path loss simulation - def path_loss_sim_dl(self, msg): - # Burst dropping - if self.burst_dl_drop_amount > 0: - if msg.fn % self.burst_dl_drop_period == 0: - log.info("Simulation: dropping DL burst (fn=%u %% %u == 0)" - % (msg.fn, self.burst_dl_drop_period)) - self.burst_dl_drop_amount -= 1 - return None - - return msg - - # UL path loss simulation - def path_loss_sim_ul(self, msg): - # Burst dropping - if self.burst_ul_drop_amount > 0: - if msg.fn % self.burst_ul_drop_period == 0: - log.info("Simulation: dropping UL burst (fn=%u %% %u == 0)" - % (msg.fn, self.burst_ul_drop_period)) - self.burst_ul_drop_amount -= 1 - return None - - return msg - - # DL burst preprocessing - def preprocess_dl_burst(self, msg): - # Calculate both RSSI and ToA values - msg.toa256 = self.calc_dl_toa256() - msg.rssi = self.calc_dl_rssi() - - # UL burst preprocessing - def preprocess_ul_burst(self, msg): - # Calculate both RSSI and ToA values, - # also apply Timing Advance - msg.toa256 = self.calc_ul_toa256() - msg.toa256 -= self.calc_ta256() - msg.rssi = self.calc_ul_rssi() - - # Converts a L12TRX message to TRX2L1 message - def transform_msg(self, msg_raw): - # Attempt to parse a message - try: - msg_l12trx = DATAMSG_L12TRX() - msg_l12trx.parse_msg(bytearray(msg_raw)) - except: - log.error("Dropping unhandled DL message...") - return None - - # Compose a new message for L1 - return msg_l12trx.gen_trx2l1() - - # Downlink handler: BTS -> BB - def bts2bb(self): - # Read data from socket - data, addr = self.bts_link.sock.recvfrom(512) - - # BB is not connected / tuned - if self.bb_freq is None: - return None - - # Freq. filter - if self.bb_freq != self.bts_freq: - return None - - # Process a message - msg = self.transform_msg(data) - if msg is None: - return None - - # Timeslot filter - if msg.tn not in self.ts_pass_list: - return None - - # Path loss simulation - msg = self.path_loss_sim_dl(msg) - if msg is None: - return None - - # Burst preprocessing - self.preprocess_dl_burst(msg) - - # Validate and generate the payload - payload = msg.gen_msg() - - # Append two unused bytes at the end - # in order to keep the compatibility - payload += bytearray(2) - - # Send burst to BB - self.bb_link.send(payload) - - # Uplink handler: BB -> BTS - def bb2bts(self): - # Read data from socket - data, addr = self.bb_link.sock.recvfrom(512) - - # BTS is not connected / tuned - if self.bts_freq is None: - return None - - # Freq. filter - if self.bb_freq != self.bts_freq: - return None - - # Process a message - msg = self.transform_msg(data) - if msg is None: - return None - - # Timeslot filter - if msg.tn not in self.ts_pass_list: - log.warning("TS %u is not configured, dropping UL burst..." % msg.tn) - return None - - # Path loss simulation - msg = self.path_loss_sim_ul(msg) - if msg is None: - return None - - # Burst preprocessing - self.preprocess_ul_burst(msg) - - # Validate and generate the payload - payload = msg.gen_msg() - - # Append two unused bytes at the end - # in order to keep the compatibility - payload += bytearray(2) - - # Send burst to BTS - self.bts_link.send(payload) + trx.send_data_msg(src_trx, tx_msg) diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py deleted file mode 100644 index d25aa30..0000000 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ /dev/null @@ -1,219 +0,0 @@ -#!/usr/bin/env python2 -# -*- coding: utf-8 -*- - -# TRX Toolkit -# CTRL interface implementation (OsmocomBB specific) -# -# (C) 2016-2017 by Vadim Yanitskiy -# -# All Rights Reserved -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -import logging as log - -from ctrl_if import CTRLInterface - -class CTRLInterfaceBB(CTRLInterface): - # Internal state variables - trx_started = False - burst_fwd = None - rx_freq = None - tx_freq = None - pm = None - - def __init__(self, *udp_link_args): - CTRLInterface.__init__(self, *udp_link_args) - log.info("Init CTRL interface for BB (%s)" % self.desc_link()) - - def parse_cmd(self, request): - # Power control - if self.verify_cmd(request, "POWERON", 0): - log.debug("Recv POWERON CMD") - - # Ensure transceiver isn't working - if self.trx_started: - log.error("Transceiver already started") - return -1 - - # Ensure RX / TX freq. are set - if (self.rx_freq is None) or (self.tx_freq is None): - log.error("RX / TX freq. are not set") - return -1 - - log.info("Starting transceiver...") - self.trx_started = True - return 0 - - elif self.verify_cmd(request, "POWEROFF", 0): - log.debug("Recv POWEROFF cmd") - - log.info("Stopping transceiver...") - self.trx_started = False - return 0 - - # Tuning Control - elif self.verify_cmd(request, "RXTUNE", 1): - log.debug("Recv RXTUNE cmd") - - # TODO: check freq range - self.rx_freq = int(request[1]) * 1000 - self.burst_fwd.bb_freq = self.rx_freq - return 0 - - elif self.verify_cmd(request, "TXTUNE", 1): - log.debug("Recv TXTUNE cmd") - - # TODO: check freq range - self.tx_freq = int(request[1]) * 1000 - return 0 - - # Power measurement - elif self.verify_cmd(request, "MEASURE", 1): - log.debug("Recv MEASURE cmd") - - if self.pm is None: - return -1 - - # TODO: check freq range - meas_freq = int(request[1]) * 1000 - meas_dbm = str(self.pm.measure(meas_freq)) - - return (0, [meas_dbm]) - - elif self.verify_cmd(request, "SETSLOT", 2): - log.debug("Recv SETSLOT cmd") - - if self.burst_fwd is None: - return -1 - - # Obtain TS index - ts = int(request[1]) - if ts not in range(0, 8): - log.error("TS index should be in range: 0..7") - return -1 - - # Parse TS type - ts_type = int(request[2]) - - # TS activation / deactivation - # We don't care about ts_type - if ts_type == 0: - # Deactivate TS (remove from TS pass-filter list) - if ts in self.burst_fwd.ts_pass_list: - self.burst_fwd.ts_pass_list.remove(ts) - else: - # Activate TS (add to TS pass-filter list) - if ts not in self.burst_fwd.ts_pass_list: - self.burst_fwd.ts_pass_list.append(ts) - - return 0 - - # Timing Advance - elif self.verify_cmd(request, "SETTA", 1): - log.debug("Recv SETTA cmd") - - # Save to the BurstForwarder instance - self.burst_fwd.ta = int(request[1]) - return 0 - - # Timing of Arrival simulation for Uplink - # Absolute form: CMD FAKE_TOA - elif self.verify_cmd(request, "FAKE_TOA", 2): - log.debug("Recv FAKE_TOA cmd") - - # Parse and apply both base and threshold - self.burst_fwd.toa256_ul_base = int(request[1]) - self.burst_fwd.toa256_ul_threshold = int(request[2]) - - return 0 - - # Timing of Arrival simulation for Uplink - # Relative form: CMD FAKE_TOA <+-BASE_DELTA> - elif self.verify_cmd(request, "FAKE_TOA", 1): - log.debug("Recv FAKE_TOA cmd") - - # Parse and apply delta - self.burst_fwd.toa256_ul_base += int(request[1]) - - return 0 - - # RSSI simulation for Uplink - # Absolute form: CMD FAKE_RSSI - elif self.verify_cmd(request, "FAKE_RSSI", 2): - log.debug("Recv FAKE_RSSI cmd") - - # Parse and apply both base and threshold - self.burst_fwd.rssi_ul_base = int(request[1]) - self.burst_fwd.rssi_ul_threshold = int(request[2]) - - return 0 - - # RSSI simulation for Uplink - # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> - elif self.verify_cmd(request, "FAKE_RSSI", 1): - log.debug("Recv FAKE_RSSI cmd") - - # Parse and apply delta - self.burst_fwd.rssi_ul_base += int(request[1]) - - return 0 - - # Path loss simulation for UL: burst dropping - # Syntax: CMD FAKE_DROP - # Dropping pattern: fn % 1 == 0 - elif self.verify_cmd(request, "FAKE_DROP", 1): - log.debug("Recv FAKE_DROP cmd") - - # Parse / validate amount of bursts - num = int(request[1]) - if num < 0: - log.error("FAKE_DROP amount shall not be negative") - return -1 - - self.burst_fwd.burst_ul_drop_amount = num - self.burst_fwd.burst_ul_drop_period = 1 - - return 0 - - # Path loss simulation for UL: burst dropping - # Syntax: CMD FAKE_DROP - # Dropping pattern: fn % period == 0 - elif self.verify_cmd(request, "FAKE_DROP", 2): - log.debug("Recv FAKE_DROP cmd") - - # Parse / validate amount of bursts - num = int(request[1]) - if num < 0: - log.error("FAKE_DROP amount shall not be negative") - return -1 - - # Parse / validate period - period = int(request[2]) - if period <= 0: - log.error("FAKE_DROP period shall be greater than zero") - return -1 - - self.burst_fwd.burst_ul_drop_amount = num - self.burst_fwd.burst_ul_drop_period = period - - return 0 - - # Wrong / unknown command - else: - # We don't care about other commands, - # so let's merely ignore them ;) - log.debug("Ignore CMD %s" % request[0]) - return 0 diff --git a/src/target/trx_toolkit/ctrl_if_bts.py b/src/target/trx_toolkit/ctrl_if_bts.py deleted file mode 100644 index cb38b67..0000000 --- a/src/target/trx_toolkit/ctrl_if_bts.py +++ /dev/null @@ -1,189 +0,0 @@ -#!/usr/bin/env python2 -# -*- coding: utf-8 -*- - -# TRX Toolkit -# CTRL interface implementation (OsmoBTS specific) -# -# (C) 2016-2017 by Vadim Yanitskiy -# -# All Rights Reserved -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -import logging as log - -from ctrl_if import CTRLInterface - -class CTRLInterfaceBTS(CTRLInterface): - # Internal state variables - trx_started = False - burst_fwd = None - clck_gen = None - rx_freq = None - tx_freq = None - pm = None - - def __init__(self, *udp_link_args): - CTRLInterface.__init__(self, *udp_link_args) - log.info("Init CTRL interface for BTS (%s)" % self.desc_link()) - - def parse_cmd(self, request): - # Power control - if self.verify_cmd(request, "POWERON", 0): - log.debug("Recv POWERON CMD") - - # Ensure transceiver isn't working - if self.trx_started: - log.error("Transceiver already started") - return -1 - - # Ensure RX / TX freq. are set - if (self.rx_freq is None) or (self.tx_freq is None): - log.error("RX / TX freq. are not set") - return -1 - - log.info("Starting transceiver...") - self.trx_started = True - - # Power emulation - if self.pm is not None: - self.pm.add_bts_list([self.tx_freq]) - - # Start clock indications - if self.clck_gen is not None: - self.clck_gen.start() - - return 0 - - elif self.verify_cmd(request, "POWEROFF", 0): - log.debug("Recv POWEROFF cmd") - - log.info("Stopping transceiver...") - self.trx_started = False - - # Power emulation - if self.pm is not None: - self.pm.del_bts_list([self.tx_freq]) - - # Stop clock indications - if self.clck_gen is not None: - self.clck_gen.stop() - - return 0 - - # Tuning Control - elif self.verify_cmd(request, "RXTUNE", 1): - log.debug("Recv RXTUNE cmd") - - # TODO: check freq range - self.rx_freq = int(request[1]) * 1000 - return 0 - - elif self.verify_cmd(request, "TXTUNE", 1): - log.debug("Recv TXTUNE cmd") - - # TODO: check freq range - self.tx_freq = int(request[1]) * 1000 - self.burst_fwd.bts_freq = self.tx_freq - return 0 - - # Timing of Arrival simulation for Downlink - # Absolute form: CMD FAKE_TOA - elif self.verify_cmd(request, "FAKE_TOA", 2): - log.debug("Recv FAKE_TOA cmd") - - # Parse and apply both base and threshold - self.burst_fwd.toa256_dl_base = int(request[1]) - self.burst_fwd.toa256_dl_threshold = int(request[2]) - - return 0 - - # Timing of Arrival simulation for Downlink - # Relative form: CMD FAKE_TOA <+-BASE_DELTA> - elif self.verify_cmd(request, "FAKE_TOA", 1): - log.debug("Recv FAKE_TOA cmd") - - # Parse and apply delta - self.burst_fwd.toa256_dl_base += int(request[1]) - - return 0 - - # RSSI simulation for Downlink - # Absolute form: CMD FAKE_RSSI - elif self.verify_cmd(request, "FAKE_RSSI", 2): - log.debug("Recv FAKE_RSSI cmd") - - # Parse and apply both base and threshold - self.burst_fwd.rssi_dl_base = int(request[1]) - self.burst_fwd.rssi_dl_threshold = int(request[2]) - - return 0 - - # RSSI simulation for Downlink - # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> - elif self.verify_cmd(request, "FAKE_RSSI", 1): - log.debug("Recv FAKE_RSSI cmd") - - # Parse and apply delta - self.burst_fwd.rssi_dl_base += int(request[1]) - - return 0 - - # Path loss simulation for DL: burst dropping - # Syntax: CMD FAKE_DROP - # Dropping pattern: fn % 1 == 0 - elif self.verify_cmd(request, "FAKE_DROP", 1): - log.debug("Recv FAKE_DROP cmd") - - # Parse / validate amount of bursts - num = int(request[1]) - if num < 0: - log.error("FAKE_DROP amount shall not be negative") - return -1 - - self.burst_fwd.burst_dl_drop_amount = num - self.burst_fwd.burst_dl_drop_period = 1 - - return 0 - - # Path loss simulation for DL: burst dropping - # Syntax: CMD FAKE_DROP - # Dropping pattern: fn % period == 0 - elif self.verify_cmd(request, "FAKE_DROP", 2): - log.debug("Recv FAKE_DROP cmd") - - # Parse / validate amount of bursts - num = int(request[1]) - if num < 0: - log.error("FAKE_DROP amount shall not be negative") - return -1 - - # Parse / validate period - period = int(request[2]) - if period <= 0: - log.error("FAKE_DROP period shall be greater than zero") - return -1 - - self.burst_fwd.burst_dl_drop_amount = num - self.burst_fwd.burst_dl_drop_period = period - - return 0 - - # Wrong / unknown command - else: - # We don't care about other commands, - # so let's merely ignore them ;) - log.debug("Ignore CMD %s" % request[0]) - return 0 diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py new file mode 100644 index 0000000..83d55db --- /dev/null +++ b/src/target/trx_toolkit/ctrl_if_trx.py @@ -0,0 +1,155 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# TRX Toolkit +# CTRL interface implementation (common commands) +# +# (C) 2016-2018 by Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import logging as log + +from ctrl_if import CTRLInterface + +class CTRLInterfaceTRX(CTRLInterface): + """ CTRL interface handler for common transceiver management commands. + + The following set of commands is mandatory for every transceiver: + + - POWERON / POWEROFF - state management (running / idle), + - RXTUNE / TXTUNE - RX / TX frequency management, + - SETSLOT - timeslot management. + + Additionally, there is an optional MEASURE command, which is used + by OsmocomBB to perform power measurement on a given frequency. + + A given transceiver may also define its own command handler, + that is prioritized, i.e. it can overwrite any commands mentioned + above. If None is returned, a command is considered as unhandled. + + """ + + def __init__(self, trx, *udp_link_args): + CTRLInterface.__init__(self, *udp_link_args) + log.info("Init CTRL interface (%s)" % self.desc_link()) + + # Link with Transceiver instance we belong to + self.trx = trx + + def parse_cmd(self, request): + # Custom command handlers (prioritized) + res = self.trx.ctrl_cmd_handler(request) + if res is not None: + return res + + # Power control + if self.verify_cmd(request, "POWERON", 0): + log.debug("Recv POWERON CMD") + + # Ensure transceiver isn't working + if self.trx.running: + log.error("Transceiver already started") + return -1 + + # Ensure RX / TX freq. are set + if (self.trx.rx_freq is None) or (self.trx.tx_freq is None): + log.error("RX / TX freq. are not set") + return -1 + + log.info("Starting transceiver...") + self.trx.running = True + + # Notify transceiver about that + self.trx.power_event_handler("POWERON") + + return 0 + + elif self.verify_cmd(request, "POWEROFF", 0): + log.debug("Recv POWEROFF cmd") + + log.info("Stopping transceiver...") + self.trx.running = False + + # Notify transceiver about that + self.trx.power_event_handler("POWEROFF") + + return 0 + + # Tuning Control + elif self.verify_cmd(request, "RXTUNE", 1): + log.debug("Recv RXTUNE cmd") + + # TODO: check freq range + self.trx.rx_freq = int(request[1]) * 1000 + return 0 + + elif self.verify_cmd(request, "TXTUNE", 1): + log.debug("Recv TXTUNE cmd") + + # TODO: check freq range + self.trx.tx_freq = int(request[1]) * 1000 + return 0 + + elif self.verify_cmd(request, "SETSLOT", 2): + log.debug("Recv SETSLOT cmd") + + # Obtain TS index + ts = int(request[1]) + if ts not in range(0, 8): + log.error("TS index should be in range: 0..7") + return -1 + + # Parse TS type + ts_type = int(request[2]) + + # TS activation / deactivation + # We don't care about ts_type + if ts_type == 0: + # Deactivate TS (remove from the list of active timeslots) + if ts in self.trx.ts_list: + self.trx.ts_list.remove(ts) + else: + # Activate TS (add to the list of active timeslots) + if ts not in self.trx.ts_list: + self.trx.ts_list.append(ts) + + return 0 + + # Power measurement + if self.verify_cmd(request, "MEASURE", 1): + log.debug("Recv MEASURE cmd") + + # Power Measurement interface is optional + # for Transceiver, thus may be uninitialized + if self.trx.pwr_meas is None: + log.error("Power Measurement interface " + "is not initialized => rejecting command") + return -1 + + # TODO: check freq range + meas_freq = int(request[1]) * 1000 + meas_dbm = self.trx.pwr_meas.measure(meas_freq) + + return (0, [str(meas_dbm)]) + + # Wrong / unknown command + else: + # We don't care about other commands, + # so let's merely ignore them ;) + log.debug("Ignore CMD %s" % request[0]) + return 0 diff --git a/src/target/trx_toolkit/fake_pm.py b/src/target/trx_toolkit/fake_pm.py index 840b4e4..1992f8d 100644 --- a/src/target/trx_toolkit/fake_pm.py +++ b/src/target/trx_toolkit/fake_pm.py @@ -2,9 +2,9 @@ # -*- coding: utf-8 -*- # TRX Toolkit -# Power measurement emulation for BB +# Power measurement emulation # -# (C) 2017 by Vadim Yanitskiy +# (C) 2017-2018 by Vadim Yanitskiy # # All Rights Reserved # @@ -25,29 +25,53 @@ from random import randint class FakePM: - # Freq. list for good power level - bts_list = [] + """ Power measurement emulation for fake transceivers. - def __init__(self, noise_min, noise_max, bts_min, bts_max): - # Save power level ranges + There is no such thing like RF signal level in fake Um-interface, + so we need to emulate this. The main idea is to have a list of + all running and idle transceivers. As soon as a measurement + request is received, FakePM will attempt to find a running + transceiver on a given frequency. + + The result of such "measurement" is a random RSSI value + in one of the following ranges: + + - trx_min ... trx_max - if at least one TRX was found, + - noise_min ... noise_max - no TRX instances were found. + + FIXME: it would be great to average the rate of bursts + and indicated power / attenuation values for all + matching transceivers, so "pure traffic" ARFCNs + would be handled properly. + + """ + + def __init__(self, noise_min, noise_max, trx_min, trx_max): + # Init list of transceivers + self.trx_list = [] + + # RSSI randomization ranges self.noise_min = noise_min self.noise_max = noise_max - self.bts_min = bts_min - self.bts_max = bts_max + self.trx_min = trx_min + self.trx_max = trx_max - def measure(self, bts): - if bts in self.bts_list: - return randint(self.bts_min, self.bts_max) - else: - return randint(self.noise_min, self.noise_max) + @property + def rssi_noise(self): + return randint(self.noise_min, self.noise_max) - def update_bts_list(self, new_list): - self.bts_list = new_list + @property + def rssi_trx(self): + return randint(self.trx_min, self.trx_max) - def add_bts_list(self, add_list): - self.bts_list += add_list + def measure(self, freq): + # Iterate over all known transceivers + for trx in self.trx_list: + if not trx.running: + continue - def del_bts_list(self, del_list): - for item in del_list: - if item in self.bts_list: - self.bts_list.remove(item) + # Match by given frequency + if trx.tx_freq == freq: + return self.rssi_trx + + return self.rssi_noise diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 95261df..46b413a 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -27,17 +27,237 @@ import logging as log import signal import argparse +import random import select import sys from app_common import ApplicationBase -from ctrl_if_bts import CTRLInterfaceBTS -from ctrl_if_bb import CTRLInterfaceBB from burst_fwd import BurstForwarder +from transceiver import Transceiver +from clck_gen import CLCKGen from fake_pm import FakePM -from udp_link import UDPLink -from clck_gen import CLCKGen +class FakeTRX(Transceiver): + """ Fake transceiver with RF path (burst loss, RSSI, TA, ToA) simulation. + + == ToA / RSSI measurement simulation + + Since this is a virtual environment, we can simulate different + parameters of the physical RF interface: + + - ToA (Timing of Arrival) - measured difference between expected + and actual time of burst arrival in units of 1/256 of GSM symbol + periods. A pair of both base and threshold values defines a range + of ToA value randomization: + + from (toa256_base - toa256_rand_threshold) + to (toa256_base + toa256_rand_threshold). + + - RSSI (Received Signal Strength Indication) - measured "power" of + the signal (per burst) in dBm. A pair of both base and threshold + values defines a range of RSSI value randomization: + + from (rssi_base - rssi_rand_threshold) + to (rssi_base + rssi_rand_threshold). + + Please note that randomization of both RSSI and ToA is optional, + and can be enabled from the control interface. + + == Timing Advance handling + + The BTS is using ToA measurements for UL bursts in order to calculate + Timing Advance value, that is then indicated to a MS, which in its turn + shall apply this value to the transmitted signal in order to compensate + the delay. Basically, every burst is transmitted in advance defined by + the indicated Timing Advance value. The valid range is 0..63, where + each unit means one GSM symbol advance. The actual Timing Advance value + is set using SETTA control command from MS. By default, it's set to 0. + + == Path loss simulation + + === Burst dropping + + In some cases, e.g. due to a weak signal or high interference, a burst + can be lost, i.e. not detected by the receiver. This can also be + simulated using FAKE_DROP command on the control interface: + + - burst_drop_amount - the amount of DL/UL bursts + to be dropped (i.e. not forwarded towards the MS/BTS), + + - burst_drop_period - drop a DL/UL burst if its (fn % period) == 0. + + == Configuration + + All simulation parameters mentioned above can be changed at runtime + using the commands with prefix 'FAKE_' on the control interface. + All of them are handled by our custom CTRL command handler. + + """ + + TOA256_BASE_DEFAULT = 0 + RSSI_BASE_DEFAULT = -60 + + def __init__(self, *trx_args, **trx_kwargs): + Transceiver.__init__(self, *trx_args, **trx_kwargs) + + # Actual ToA / RSSI / TA values + self.toa256_base = self.TOA256_BASE_DEFAULT + self.rssi_base = self.RSSI_BASE_DEFAULT + self.ta = 0 + + # ToA / RSSI randomization threshold + self.toa256_rand_threshold = 0 + self.rssi_rand_threshold = 0 + + # Path loss simulation (burst dropping) + self.burst_drop_amount = 0 + self.burst_drop_period = 1 + + @property + def toa256(self): + # Check if randomization is required + if self.toa256_rand_threshold is 0: + return self.toa256_base + + # Generate a random ToA value in required range + toa256_min = self.toa256_base - self.toa256_rand_threshold + toa256_max = self.toa256_base + self.toa256_rand_threshold + return random.randint(toa256_min, toa256_max) + + @property + def rssi(self): + # Check if randomization is required + if self.rssi_rand_threshold is 0: + return self.rssi_base + + # Generate a random RSSI value in required range + rssi_min = self.rssi_base - self.rssi_rand_threshold + rssi_max = self.rssi_base + self.rssi_rand_threshold + return random.randint(rssi_min, rssi_max) + + # Path loss simulation: burst dropping + # Returns: True - drop, False - keep + def sim_burst_drop(self, msg): + # Check if dropping is required + if self.burst_drop_amount is 0: + return False + + if msg.fn % self.burst_drop_period == 0: + log.info("Simulation: dropping burst (fn=%u %% %u == 0)" + % (msg.fn, self.burst_drop_period)) + self.burst_drop_amount -= 1 + return True + + return False + + # Takes (partially initialized) TRX2L1 message, + # simulates RF path parameters (such as RSSI), + # and sends towards the L1 + def send_data_msg(self, src_trx, msg): + # Complete message header + msg.toa256 = self.toa256 + msg.rssi = self.rssi + + # Apply optional Timing Advance + if src_trx.ta is not 0: + msg.toa256 -= src_trx.ta * 256 + + # Path loss simulation + if self.sim_burst_drop(msg): + return + + # TODO: make legacy mode configurable (via argv?) + self.data_if.send_msg(msg, legacy = True) + + # Simulation specific CTRL command handler + def ctrl_cmd_handler(self, request): + # Timing Advance + # Syntax: CMD SETTA + if self.ctrl_if.verify_cmd(request, "SETTA", 1): + log.debug("Recv SETTA cmd") + + # Store indicated value + self.ta = int(request[1]) + return 0 + + # Timing of Arrival simulation + # Absolute form: CMD FAKE_TOA + elif self.ctrl_if.verify_cmd(request, "FAKE_TOA", 2): + log.debug("Recv FAKE_TOA cmd") + + # Parse and apply both base and threshold + self.toa256_base = int(request[1]) + self.toa256_rand_threshold = int(request[2]) + return 0 + + # Timing of Arrival simulation + # Relative form: CMD FAKE_TOA <+-BASE_DELTA> + elif self.ctrl_if.verify_cmd(request, "FAKE_TOA", 1): + log.debug("Recv FAKE_TOA cmd") + + # Parse and apply delta + self.toa256_base += int(request[1]) + return 0 + + # RSSI simulation + # Absolute form: CMD FAKE_RSSI + elif self.ctrl_if.verify_cmd(request, "FAKE_RSSI", 2): + log.debug("Recv FAKE_RSSI cmd") + + # Parse and apply both base and threshold + self.rssi_base = int(request[1]) + self.rssi_rand_threshold = int(request[2]) + return 0 + + # RSSI simulation + # Relative form: CMD FAKE_RSSI <+-BASE_DELTA> + elif self.ctrl_if.verify_cmd(request, "FAKE_RSSI", 1): + log.debug("Recv FAKE_RSSI cmd") + + # Parse and apply delta + self.rssi_base += int(request[1]) + return 0 + + # Path loss simulation: burst dropping + # Syntax: CMD FAKE_DROP + # Dropping pattern: fn % 1 == 0 + elif self.ctrl_if.verify_cmd(request, "FAKE_DROP", 1): + log.debug("Recv FAKE_DROP cmd") + + # Parse / validate amount of bursts + num = int(request[1]) + if num < 0: + log.error("FAKE_DROP amount shall not be negative") + return -1 + + self.burst_drop_amount = num + self.burst_drop_period = 1 + return 0 + + # Path loss simulation: burst dropping + # Syntax: CMD FAKE_DROP + # Dropping pattern: fn % period == 0 + elif self.ctrl_if.verify_cmd(request, "FAKE_DROP", 2): + log.debug("Recv FAKE_DROP cmd") + + # Parse / validate amount of bursts + num = int(request[1]) + if num < 0: + log.error("FAKE_DROP amount shall not be negative") + return -1 + + # Parse / validate period + period = int(request[2]) + if period <= 0: + log.error("FAKE_DROP period shall be greater than zero") + return -1 + + self.burst_drop_amount = num + self.burst_drop_period = period + return 0 + + # Unhandled command + return None class Application(ApplicationBase): def __init__(self): @@ -51,72 +271,58 @@ self.app_init_logging(self.argv) def run(self): - # Init TRX CTRL interface for BTS - self.bts_ctrl = CTRLInterfaceBTS( - self.argv.bts_addr, self.argv.bts_base_port + 101, - self.argv.trx_bind_addr, self.argv.bts_base_port + 1) - - # Init TRX CTRL interface for BB - self.bb_ctrl = CTRLInterfaceBB( - self.argv.bb_addr, self.argv.bb_base_port + 101, - self.argv.trx_bind_addr, self.argv.bb_base_port + 1) + # Init shared clock generator + self.clck_gen = CLCKGen([]) # Power measurement emulation # Noise: -120 .. -105 # BTS: -75 .. -50 - self.pm = FakePM(-120, -105, -75, -50) + self.fake_pm = FakePM(-120, -105, -75, -50) - # Share a FakePM instance between both BTS and BB - self.bts_ctrl.pm = self.pm - self.bb_ctrl.pm = self.pm + # Init TRX instance for BTS + self.bts_trx = FakeTRX(self.argv.trx_bind_addr, + self.argv.bts_addr, self.argv.bts_base_port, + clck_gen = self.clck_gen) - # Init DATA links - self.bts_data = UDPLink( - self.argv.bts_addr, self.argv.bts_base_port + 102, - self.argv.trx_bind_addr, self.argv.bts_base_port + 2) - self.bb_data = UDPLink( - self.argv.bb_addr, self.argv.bb_base_port + 102, - self.argv.trx_bind_addr, self.argv.bb_base_port + 2) + # Init TRX instance for BB + self.bb_trx = FakeTRX(self.argv.trx_bind_addr, + self.argv.bb_addr, self.argv.bb_base_port, + pwr_meas = self.fake_pm) - # BTS <-> BB burst forwarding - self.burst_fwd = BurstForwarder(self.bts_data, self.bb_data) - - # Share a BurstForwarder instance between BTS and BB - self.bts_ctrl.burst_fwd = self.burst_fwd - self.bb_ctrl.burst_fwd = self.burst_fwd - - # Provide clock to BTS - self.bts_clck = UDPLink( - self.argv.bts_addr, self.argv.bts_base_port + 100, - self.argv.trx_bind_addr, self.argv.bts_base_port) - self.clck_gen = CLCKGen([self.bts_clck]) - self.bts_ctrl.clck_gen = self.clck_gen + # Burst forwarding between transceivers + self.burst_fwd = BurstForwarder() + self.burst_fwd.add_trx(self.bts_trx) + self.burst_fwd.add_trx(self.bb_trx) log.info("Init complete") # Enter main loop while True: - socks = [self.bts_ctrl.sock, self.bb_ctrl.sock, - self.bts_data.sock, self.bb_data.sock] + socks = [self.bts_trx.ctrl_if.sock, self.bb_trx.ctrl_if.sock, + self.bts_trx.data_if.sock, self.bb_trx.data_if.sock] # Wait until we get any data on any socket r_event, w_event, x_event = select.select(socks, [], []) # Downlink: BTS -> BB - if self.bts_data.sock in r_event: - self.burst_fwd.bts2bb() + if self.bts_trx.data_if.sock in r_event: + msg = self.bts_trx.recv_data_msg() + if msg is not None: + self.burst_fwd.forward_msg(self.bts_trx, msg) # Uplink: BB -> BTS - if self.bb_data.sock in r_event: - self.burst_fwd.bb2bts() + if self.bb_trx.data_if.sock in r_event: + msg = self.bb_trx.recv_data_msg() + if msg is not None: + self.burst_fwd.forward_msg(self.bb_trx, msg) # CTRL commands from BTS - if self.bts_ctrl.sock in r_event: - self.bts_ctrl.handle_rx() + if self.bts_trx.ctrl_if.sock in r_event: + self.bts_trx.ctrl_if.handle_rx() # CTRL commands from BB - if self.bb_ctrl.sock in r_event: - self.bb_ctrl.handle_rx() + if self.bb_trx.ctrl_if.sock in r_event: + self.bb_trx.ctrl_if.handle_rx() def shutdown(self): log.info("Shutting down...") diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py new file mode 100644 index 0000000..edd4d31 --- /dev/null +++ b/src/target/trx_toolkit/transceiver.py @@ -0,0 +1,155 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# TRX Toolkit +# Transceiver implementation +# +# (C) 2018 by Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import logging as log + +from ctrl_if_trx import CTRLInterfaceTRX +from data_if import DATAInterface +from udp_link import UDPLink + +class Transceiver: + """ Base transceiver implementation. + + Represents a single transceiver, that can be used as for the BTS side, + as for the MS side. Each individual instance of Transceiver unifies + three basic interfaces built on three independent UDP connections: + + - CLCK (base port + 100/0) - clock indications from TRX to L1, + - CTRL (base port + 101/1) - control interface for L1, + - DATA (base port + 102/2) - bidirectional data interface for bursts. + + A transceiver can be either in active (i.e. working), or in idle mode. + The active mode should ensure that both RX/TX frequencies are set. + + NOTE: CLCK is not required for some L1 implementations, so it is optional. + + == Timeslot configuration + + Transceiver has a list of active (i.e. configured) TDMA timeslots. + The L1 should configure a timeslot before sending or expecting any + data on it. This is done by SETSLOT control command, which also + indicates an associated channel combination (see GSM TS 05.02). + + NOTE: we don't store the associated channel combinations, + as they are only useful for burst detection and demodulation. + + == Clock distribution (optional) + + The clock indications are not expected by L1 when transceiver + is not running, so we monitor both POWERON / POWEROFF events + from the control interface, and keep the list of CLCK links + in a given CLCKGen instance updated. The clock generator is + started and stopped automatically. + + NOTE: a single instance of CLCKGen can be shared between multiple + transceivers, as well as multiple transceivers may use + individual CLCKGen instances. + + == Power Measurement (optional) + + Transceiver may have an optional power measurement interface, + that shall provide at least one method: measure(freq). This + is required for the MS side (i.e. OsmocomBB). + + """ + + def __init__(self, bind_addr, remote_addr, base_port, + clck_gen = None, pwr_meas = None): + # Connection info + self.remote_addr = remote_addr + self.bind_addr = bind_addr + self.base_port = base_port + + # Init DATA interface + self.data_if = DATAInterface( + remote_addr, base_port + 102, + bind_addr, base_port + 2) + + # Init CTRL interface + self.ctrl_if = CTRLInterfaceTRX(self, + remote_addr, base_port + 101, + bind_addr, base_port + 1) + + # Init optional CLCK interface + self.clck_gen = clck_gen + if clck_gen is not None: + self.clck_if = UDPLink( + remote_addr, base_port + 100, + bind_addr, base_port) + + # Optional Power Measurement interface + self.pwr_meas = pwr_meas + + # Internal state + self.running = False + + # Actual RX / TX frequencies + self.rx_freq = None + self.tx_freq = None + + # List of active (configured) timeslots + self.ts_list = [] + + # To be overwritten if required, + # no custom command handlers by default + def ctrl_cmd_handler(self, request): + return None + + def power_event_handler(self, event): + # Trigger clock generator if required + if self.clck_gen is not None: + clck_links = self.clck_gen.clck_links + if not self.running and (self.clck_if in clck_links): + # Transceiver was stopped + clck_links.remove(self.clck_if) + elif self.running and (self.clck_if not in clck_links): + # Transceiver was started + clck_links.append(self.clck_if) + + if not self.clck_gen.timer and len(clck_links) > 0: + log.info("Starting clock generator") + self.clck_gen.start() + elif self.clck_gen.timer and not clck_links: + log.info("Stopping clock generator") + self.clck_gen.stop() + + def recv_data_msg(self): + # Read and parse data from socket + msg = self.data_if.recv_l12trx_msg() + if not msg: + return None + + # Make sure that transceiver is configured and running + if not self.running: + log.warning("RX DATA message (%s), but transceiver " + "is not running => dropping..." % msg.desc_hdr()) + return None + + # Make sure that indicated timeslot is configured + if msg.tn not in self.ts_list: + log.warning("RX DATA message (%s), but timeslot " + "is not configured => dropping..." % msg.desc_hdr()) + return None + + return msg -- To view, visit https://gerrit.osmocom.org/12264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ice44e2b22566b3652ef6d43896055963b13ab185 Gerrit-Change-Number: 12264 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:47:53 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 14:47:53 +0000 Subject: Change in osmo-msc[master]: VLR tests: avoid leaking LAC access details In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12337 ) Change subject: VLR tests: avoid leaking LAC access details ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e Gerrit-Change-Number: 12337 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 14:47:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:47:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 14:47:55 +0000 Subject: Change in osmo-msc[master]: VLR tests: avoid leaking LAC access details In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12337 ) Change subject: VLR tests: avoid leaking LAC access details ...................................................................... VLR tests: avoid leaking LAC access details Avoid leaking details on accessing data structure for LAC value into test output: that's irrelevant clutter which forces unnecessary test output modifications. Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e --- M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_ss.err 4 files changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, approved diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index ef88c5a..4a4f243 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -154,7 +154,7 @@ vsub = vlr_subscr_find_by_imsi(net->vlr, IMSI); VERBOSE_ASSERT(vsub != NULL, == true, "%d"); VERBOSE_ASSERT(strcmp(vsub->imsi, IMSI), == 0, "%d"); - VERBOSE_ASSERT(vsub->lac, == 23, "%u"); + VAL_ASSERT("LAC", vsub->lac, == 23, "%u"); vlr_subscr_put(vsub); } diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 481a2db..db0d58c 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -175,7 +175,7 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:42342 usage decreases to: 1 --- - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector @@ -555,7 +555,7 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:42342 usage decreases to: 1 --- - after a while, MNCC asks us to setup a call, causing Paging @@ -934,7 +934,7 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:42342 usage decreases to: 1 --- - after a while, MNCC asks us to setup a call, causing Paging @@ -1279,7 +1279,7 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:42342 usage decreases to: 1 --- - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector @@ -1621,7 +1621,7 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:42342 usage decreases to: 1 --- - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c index 34aa634..4e8077e 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.c +++ b/tests/msc_vlr/msc_vlr_test_ss.c @@ -68,7 +68,7 @@ vsub = vlr_subscr_find_by_imsi(net->vlr, IMSI); VERBOSE_ASSERT(vsub != NULL, == true, "%d"); VERBOSE_ASSERT(strcmp(vsub->imsi, IMSI), == 0, "%d"); - VERBOSE_ASSERT(vsub->lac, == 23, "%u"); + VAL_ASSERT("LAC", vsub->lac, == 23, "%u"); vlr_subscr_put(vsub); bss_sends_clear_complete(); diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index fe869ad..1d4a0c6 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -91,7 +91,7 @@ DREF VLR subscr MSISDN:46071 usage increases to: 3 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:46071 usage decreases to: 2 - BSS sends BSSMAP Clear Complete DREF MSISDN:46071: MSC conn use - release == 0 (0x0: ) @@ -287,7 +287,7 @@ DREF VLR subscr MSISDN:46071 usage increases to: 3 vsub != NULL == 1 strcmp(vsub->imsi, IMSI) == 0 - vsub->lac == 23 + LAC == 23 DREF VLR subscr MSISDN:46071 usage decreases to: 2 - BSS sends BSSMAP Clear Complete DREF MSISDN:46071: MSC conn use - release == 0 (0x0: ) -- To view, visit https://gerrit.osmocom.org/12337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e Gerrit-Change-Number: 12337 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:49:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 14:49:08 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... chapters/gsup.adoc: document MO-/MT-forwardSM messages Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Related Change-Id: (core) Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Related Change-Id: (TTCN) Ibf49474a81235096c032ea21f217170f523bd94e Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 213 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 70295cf..56a6f9e 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -504,6 +504,113 @@ can be used to notify the MSC that a structured supplementary service is successfully activated or deactivated, etc. +==== MO-forwardSM Request + +Direction: MSC / SGSN => SMSC (via HLR) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|41|SM-RP-DA (Destination Address)|<>|M|TLV|2-... +|42|SM-RP-OA (Originating Address)|<>|M|TLV|2-... +|43|SM-RP-UI (SM TPDU)|<>|M|TLV|1-... +|=== + +This message is used to forward MO short messages from MSC / SGSN to an SMSC. +The corresponding MAP service is MAP-MO-FORWARD-SHORT-MESSAGE, +see 3GPP TS 29.002, section 12.2. + +==== MO-forwardSM Error + +Direction: SMSC (via HLR) => MSC / SGSN + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|44|SM-RP-Cause (Cause value)|<>|M|TLV|1 +|43|SM-RP-UI (diagnostic field)|<>|O|TLV|1-... +|=== + +This message is used to indicate a negative result of an earlier +MO short message delivery. The corresponding MAP service is +MAP-MO-FORWARD-SHORT-MESSAGE, see 3GPP TS 29.002, section 12.2. + +==== MO-forwardSM Result + +Direction: SMSC (via HLR) => MSC / SGSN + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|=== + +This message is used to indicate a successful result of an earlier +MO short message delivery. The corresponding MAP service is +MAP-MO-FORWARD-SHORT-MESSAGE, see 3GPP TS 29.002, section 12.2. + +==== MT-forwardSM Request + +Direction: SMSC (via HLR) => MSC / SGSN + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|41|SM-RP-DA (Destination Address)|<>|M|TLV|2-... +|42|SM-RP-OA (Originating Address)|<>|M|TLV|2-... +|43|SM-RP-UI (SM TPDU)|<>|M|TLV|1-... +|45|SM-RP-MMS (More Messages to Send)|<>|O|TLV|1 +|=== + +This message is used to forward MT short messages from an SMSC to MSC / SGSN. +The corresponding MAP service is MAP-MT-FORWARD-SHORT-MESSAGE, +see 3GPP TS 29.002, section 12.9. + +==== MT-forwardSM Error + +Direction: MSC / SGSN => SMSC (via HLR) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|44|SM-RP-Cause (Cause value)|<>|M|TLV|1 +|43|SM-RP-UI (diagnostic field)|<>|O|TLV|1-... +|=== + +This message is used to indicate a negative result of an earlier +MT short message delivery. The corresponding MAP service is +MAP-MT-FORWARD-SHORT-MESSAGE, see 3GPP TS 29.002, section 12.9. + +==== MT-forwardSM Result + +Direction: MSC / SGSN => SMSC (via HLR) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|=== + +This message is used to indicate a successful result of an earlier +MT short message delivery. The corresponding MAP service is +MAP-MT-FORWARD-SHORT-MESSAGE, see 3GPP TS 29.002, section 12.9. + === Information Elements [[gsup-ie-msgtype]] @@ -534,6 +641,12 @@ |0x20|Supplementary Service Request |0x21|Supplementary Service Error |0x22|Supplementary Service Result +|0x24|MO-forwardSM Request +|0x25|MO-forwardSM Error +|0x26|MO-forwardSM Result +|0x28|MT-forwardSM Request +|0x29|MT-forwardSM Error +|0x2a|MT-forwardSM Result |=== [[gsup-ie-ipaddr]] @@ -760,6 +873,12 @@ |0x30|Session ID|<> |0x31|Session State|<> |0x35|Supplementary Service Info|<> +|0x40|SM-RP-MR (Message Reference)|<> +|0x41|SM-RP-DA (Destination Address)|<> +|0x42|SM-RP-OA (Originating Address)|<> +|0x43|SM-RP-UI (SM TPDU)|<> +|0x44|SM-RP-Cause (RP Cause value)|<> +|0x45|SM-RP-MMS (More Messages to Send)|<> |=== [[gsup-ie-empty]] @@ -952,3 +1071,97 @@ |0x02|CONTINUE|Used to continue an existing session |0x03|END|Used to terminate an existing session |=== + +[[gsup-ie-sm-rp-mr]] +==== SM-RP-MR (Message Reference) + +According to TS GSM 04.11, section 8.2.3, every single message on the +SM-RL (SM Relay Layer) has a unique _message reference_, that is +used to link an _RP-ACK_ or _RP-ERROR_ message to the associated +(preceding) _RP-DATA_ or _RP-SMMA_ message transfer attempt. + +In case of TCAP/MAP, this message reference is being mapped to the +_Invoke ID_. But since GSUP has no _Invoke ID IE_, and it is not +required for other applications (other than SMS), a special +<> is used to carry the message reference +value \'as-is' (i.e. in range 0 through 255). + +[[gsup-ie-sm-rp-da]] +==== SM-RP-DA (Destination Address) + +This IE represents the destination address used by the short message service +relay sub-layer protocol. It can be one of the following: + +* IMSI (see 3GPP TS 29.002, clause 7.6.2.1); +* MSISDN (see 3GPP TS 29.002, clause 7.6.2.17); +* service centre address (see 3GPP TS 29.002, clause 7.6.2.27). + +Coding of this IE is described in <>. +See 3GPP TS 29.002, section 7.6.8.1 for details. + +[[gsup-ie-sm-rp-oa]] +==== SM-RP-OA (Originating Address) + +This IE represents the originating address used by the short message service +relay sub-layer protocol. It can be either of the following: + +* MSISDN (see 3GPP TS 29.002, clause 7.6.2.17); +* service centre address (see 3GPP TS 29.002, clause 7.6.2.27). + +Coding of this IE is described in <>. +See 3GPP TS 29.002, section 7.6.8.2 for details. + +[[gsup-sm-rp-oda]] +==== Coding of SM-RP-DA / SM-RP-OA IEs + +Basically, both <> / <> IEs +contain a single TV of the following format: + +.Coding of SM-RP-DA / SM-RP-OA IEs +[options="header",cols="5%,5%,10%,80%"] +|=== +|Field|Presence|Length|Description +|T|M|1|Identity type +|V|O|...|Encoded identity itself +|=== + +where the identity type can be one of the following: + +.Identity types of SM-RP-DA / SM-RP-OA IEs +[options="header",cols="15%,85%"] +|=== +|Type|Description +|0x01|IMSI (see 3GPP TS 29.002, clause 7.6.2.1) +|0x02|MSISDN (see 3GPP TS 29.002, clause 7.6.2.17) +|0x03|Service centre address (see 3GPP TS 29.002, clause 7.6.2.27) +|0xff|Omit value for noSM-RP-DA and noSM-RP-OA +|=== + +[[gsup-ie-sm-rp-ui]] +==== SM-RP-UI (SM TPDU) + +This IE represents the user data field carried by the short message service +relay sub-layer (i.e. SM-TL (Transfer Layer)) protocol. In case of errors +(i.e. MO-/MT-forwardSM Error messages), this IE may contain optional +diagnostic field payload from _RP-ERROR_ message. + +See 3GPP TS 29.002, section 7.6.8.4 for details. + +[[gsup-ie-sm-rp-cause]] +==== SM-RP-Cause (RP Cause value) + +According to TS GSM 04.11, _RP-Cause_ is a variable length element always +included in the _RP-ERROR_ message, conveying a negative result of an +_RP-DATA_ message transfer attempt or _RP-SMMA_ notification attempt. + +The mapping between error causes in TS GSM 04.11 and TS GSM 09.02 (MAP) +is specified in TS GSM 03.40. But since GSUP has no generic _User Error IE_, +and it is not required for other applications (other than SMS), a special +<> is used to carry the cause value \'as-is'. + +[[gsup-ie-sm-rp-mms]] +==== SM-RP-MMS (More Messages to Send) + +This is an optional IE of MT-ForwardSM-Req message, that is used by SMSC +to indicate that there are more MT SMS messages to be sent, so the network +should keep the RAN connection open. See 3GPP TS 29.002, section 7.6.8.7. -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:49:09 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 14:49:09 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... chapters/gsup.adoc: document READY-FOR-SM message Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Related Change-Id: (core) Ic37f3b2114b8095cfce22977e67133b9103942e3 Related Change-Id: (TTCN) If2256607527ecfcb10285583332fb8b0515d7c78 Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 73 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 56a6f9e..c48209d 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -611,6 +611,58 @@ MT short message delivery. The corresponding MAP service is MAP-MT-FORWARD-SHORT-MESSAGE, see 3GPP TS 29.002, section 12.9. +==== READY-FOR-SM Request + +Direction: MSC / SGSN => SMSC (via HLR) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|46|SM Alert Reason|<>|M|TLV|1-... +|=== + +This message is used between the MSC / SGSN and an SMSC when a subscriber +indicates memory available situation (see TS GSM 04.11, section 7.3.2). +The corresponding MAP service is MAP-READY-FOR-SM, +see 3GPP TS 29.002, section 12.4. + +==== READY-FOR-SM Error + +Direction: SMSC (via HLR) => MSC / SGSN + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|44|SM-RP-Cause (Cause value)|<>|M|TLV|1 +|43|SM-RP-UI (diagnostic field)|<>|O|TLV|1-... +|=== + +This message is used to indicate a negative result of an earlier +MO SMMA (Memory Available) indication. The corresponding MAP +service is MAP-READY-FOR-SM, see 3GPP TS 29.002, section 12.4. + +==== READY-FOR-SM Result + +Direction: SMSC (via HLR) => MSC / SGSN + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|=== + +This message is used to indicate a successful result of an earlier +MO SMMA (Memory Available) indication. The corresponding MAP +service is MAP-READY-FOR-SM, see 3GPP TS 29.002, section 12.4. + === Information Elements [[gsup-ie-msgtype]] @@ -647,6 +699,9 @@ |0x28|MT-forwardSM Request |0x29|MT-forwardSM Error |0x2a|MT-forwardSM Result +|0x2c|READY-FOR-SM Request +|0x2d|READY-FOR-SM Error +|0x2e|READY-FOR-SM Result |=== [[gsup-ie-ipaddr]] @@ -879,6 +934,7 @@ |0x43|SM-RP-UI (SM TPDU)|<> |0x44|SM-RP-Cause (RP Cause value)|<> |0x45|SM-RP-MMS (More Messages to Send)|<> +|0x46|SM Alert Reason|<> |=== [[gsup-ie-empty]] @@ -1165,3 +1221,20 @@ This is an optional IE of MT-ForwardSM-Req message, that is used by SMSC to indicate that there are more MT SMS messages to be sent, so the network should keep the RAN connection open. See 3GPP TS 29.002, section 7.6.8.7. + +[[gsup-ie-sm-alert-rsn]] +==== SM Alert Reason + +According to 3GPP TS 29.002, section 7.6.8.8, Alert Reason is used to +indicate the reason why the service centre is alerted, e.g. the MS has +got some memory to store previously rejected incoming SMS. + +It can take one of the following values: + +.SM Alert Reason values +[options="header",cols="15%,85%"] +|=== +|Type|Description +|0x01|MS present +|0x02|Memory Available +|=== -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:53:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 14:53:25 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Hello Stefan Sperling, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11069 to look at the new patch set (#12). Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages ...................................................................... GSUP/SMS: introduce MO-/MT-FORWARD-SM messages According to 3GPP TS 29.002, there are two services: - MAP-MO-FORWARD-SHORT-MESSAGE (see 12.2), - MAP-MT-FORWARD-SHORT-MESSAGE (see 12.9), which are used to forward MO/MT short messages. This change replicates both services as GSUP messages: - OSMO_GSUP_MSGT_MO_FORWARD_SM_*, - OSMO_GSUP_MSGT_MT_FORWARD_SM_*. Please note, that only the 'must-have' IEs are introduced by this change, in particular the following: - OSMO_GSUP_SM_RP_MR_IE (see note below), - OSMO_GSUP_SM_RP_DA_IE (see 7.6.8.1), - OSMO_GSUP_SM_RP_OA_IE (see 7.6.8.2), - OSMO_GSUP_SM_RP_UI_IE (see 7.6.8.4), - OSMO_GSUP_SM_RP_MMS_IE (see 7.6.8.7), - OSMO_GSUP_SM_RP_CAUSE_IE (see GSM TS 04.11, 8.2.5.4), where both SM_RP_DA and SM_RP_OA IEs basically contain a single nested TV of the following format: - T: identity type (see 'osmo_gsup_sms_sm_rp_oda_t'), - V: encoded identity itself (optional). According to GSM TS 04.11, every single message on the SM-RL has an unique message reference (see 8.2.3), that is used to link an RP-ACK or RP-ERROR message to the associated (preceding) RP-DATA or RP-SMMA message transfer attempt. In case of TCAP/MAP, this message reference is being mapped to the Invoke ID. But since GSUP has no 'Invoke ID' IE, and it is not required for other applications (other than SMS), this change introduces a special 'SM_RP_MR' IE that doesn't exist in MAP. Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Related Change-Id: (docs) Ie0150756c33c1352bc4eb49421824542c711175c Related Change-Id: (TTCN) Ibf49474a81235096c032ea21f217170f523bd94e Related: OS#3587 --- M TODO-RELEASE M include/Makefile.am M include/osmocom/gsm/gsup.h A include/osmocom/gsm/gsup_sms.h M src/gsm/Makefile.am M src/gsm/gsup.c A src/gsm/gsup_sms.c M src/gsm/libosmogsm.map M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 11 files changed, 527 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/11069/12 -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 12 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 14:53:40 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 14:53:40 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages ...................................................................... Patch Set 11: (3 comments) https://gerrit.osmocom.org/#/c/11069/11/src/gsm/gsup.c File src/gsm/gsup.c: https://gerrit.osmocom.org/#/c/11069/11/src/gsm/gsup.c at 668 PS11, Line 668: sizeof(u8), gsup_msg->sm_rp_mr); > Use sizeof(*gsup_msg->sm_rp_mr) here? Done https://gerrit.osmocom.org/#/c/11069/11/src/gsm/gsup.c at 694 PS11, Line 694: sizeof(u8), gsup_msg->sm_rp_mms); > Use sizeof(*gsup_msg->sm_rp_mms)? Done https://gerrit.osmocom.org/#/c/11069/11/src/gsm/gsup.c at 699 PS11, Line 699: sizeof(u8), gsup_msg->sm_rp_cause); > Use sizeof(*gsup_msg->sm_rp_cause)? Done -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 11 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 14:53:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Dec 18 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 18 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#343?= In-Reply-To: <1648347215.44.1545059407475.JavaMail.jenkins@jenkins.osmocom.org> References: <1648347215.44.1545059407475.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <645221152.60.1545145807482.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Dec 18 15:17:37 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 15:17:37 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 12 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 15:17:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 15:23:32 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 15:23:32 +0000 Subject: Change in osmo-msc[master]: Remove redundancy in LAC processing In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12338 ) Change subject: Remove redundancy in LAC processing ...................................................................... Patch Set 3: Code-Review+1 Yes makes sense. -- To view, visit https://gerrit.osmocom.org/12338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e Gerrit-Change-Number: 12338 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 15:23:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 15:25:09 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 15:25:09 +0000 Subject: Change in osmo-msc[master]: MNCC: use log wrapper for call processing In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12329 ) Change subject: MNCC: use log wrapper for call processing ...................................................................... Patch Set 2: Yep, looks fine. -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 15:25:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 15:27:53 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 15:27:53 +0000 Subject: Change in osmo-msc[master]: Use proper type for tch_rtp_connect() parameter In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12330 ) Change subject: Use proper type for tch_rtp_connect() parameter ...................................................................... Patch Set 2: Code-Review+1 Yeah ok. -- To view, visit https://gerrit.osmocom.org/12330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e2efcd2e25d6ec2ff35a4b8cfcda02abe97fa59 Gerrit-Change-Number: 12330 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 15:27:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 15:29:07 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 15:29:07 +0000 Subject: Change in osmo-msc[master]: VLR: drop unused struct members In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12335 ) Change subject: VLR: drop unused struct members ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12335/3/include/osmocom/msc/vlr.h File include/osmocom/msc/vlr.h: https://gerrit.osmocom.org/#/c/12335/3/include/osmocom/msc/vlr.h at 174 PS3, Line 174: } ps; Any reason we keep 'ps' around if there's only one list left as a struct member? -- To view, visit https://gerrit.osmocom.org/12335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 Gerrit-Change-Number: 12335 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 15:29:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 15:31:12 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 15:31:12 +0000 Subject: Change in osmo-msc[master]: VLR: drop unused struct members In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12335 ) Change subject: VLR: drop unused struct members ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12335/3/include/osmocom/msc/vlr.h File include/osmocom/msc/vlr.h: https://gerrit.osmocom.org/#/c/12335/3/include/osmocom/msc/vlr.h at 174 PS3, Line 174: } ps; > Any reason we keep 'ps' around if there's only one list left as a struct member? See my earlier comment on this patch. -- To view, visit https://gerrit.osmocom.org/12335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 Gerrit-Change-Number: 12335 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 15:31:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 15:33:02 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 15:33:02 +0000 Subject: Change in osmo-msc[master]: MNCC: use log wrapper for call processing In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12329 ) Change subject: MNCC: use log wrapper for call processing ...................................................................... Patch Set 2: > Patch Set 2: > > Yep, looks fine. Feel free to add +1/+2 than :) -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 15:33:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:07:08 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 18 Dec 2018 16:07:08 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: use VTY bind addr from config, deprecate cmd line opt... In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12208 ) Change subject: Revert "mobile: use VTY bind addr from config, deprecate cmd line options" ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-1 > > The removed options were marked as deprecated so I also don't think reverting the change is the right way. Unfortunately we don't have releases in osmocom-bb which would allow us to handle deprecations better. With Linux Kernel project in our genes let me appeal to the "no userspace regression" mentality... Something that was actively used got broken. Instead of trying to explain of how it was just "deprecated" or how gray the snow is and this three headed monkey behind you..., let's own the problem. Don't be afraid to revert quickly and show some sympathy/empathy with the users of a system. And on the topic of deprecation: 1st) Passing --vty_port=X will fail config parsing and lead to the process to exit. This was noticeable to third party applications. 2nd) Deprecation gives a grace period o someone to move somewhere else, find a replacement. None was given... -- To view, visit https://gerrit.osmocom.org/12208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie89bc16b667dbe05baa76cfa4f86b4946f8019e8 Gerrit-Change-Number: 12208 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 18 Dec 2018 16:07:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:21:55 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 16:21:55 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: use VTY bind addr from config, deprecate cmd line opt... In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12208 ) Change subject: Revert "mobile: use VTY bind addr from config, deprecate cmd line options" ...................................................................... Patch Set 1: Hi Holger, > Something that was actively used got broken. My apologies, I didn't know that this feature has been actively used. Since we have an alternative solution: https://gerrit.osmocom.org/#/c/libosmocore/+/12321/ https://gerrit.osmocom.org/#/c/osmocom-bb/+/12326/ which I've already tested (and I really like it), let's merge both patches and abandon this one. If review would take too long, then ok... let's revert this one and come back to it later. -- To view, visit https://gerrit.osmocom.org/12208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie89bc16b667dbe05baa76cfa4f86b4946f8019e8 Gerrit-Change-Number: 12208 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 18 Dec 2018 16:21:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:24:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 16:24:34 +0000 Subject: Change in libosmocore[master]: cleanup: remove unused define In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12272 ) Change subject: cleanup: remove unused define ...................................................................... Abandoned Superseded by new revision of parent patch. -- To view, visit https://gerrit.osmocom.org/12272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ibff603dd581f60b600f2469ad464a0bf77e24bfe Gerrit-Change-Number: 12272 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:24:48 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 16:24:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12346 Change subject: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher ...................................................................... wait for subscriber conn in TC_cipher_complete_with_invalid_cipher Ensure that tests running after TC_cipher_complete_with_invalid_cipher won't see a left-over subscriber connection at the MSC. Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706 Related: OS#2872 --- M msc/MSC_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/12346/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index adaeea3..828620d 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2812,6 +2812,7 @@ mtc.stop; } } + f_expect_clear(); } testcase TC_cipher_complete_with_invalid_cipher() runs on MTC_CT { -- To view, visit https://gerrit.osmocom.org/12346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706 Gerrit-Change-Number: 12346 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:27:43 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 16:27:43 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 16:27:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:30:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 16:30:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add three tests for CIPHER MODE COMPLETE without algo Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12347 Change subject: add three tests for CIPHER MODE COMPLETE without algo ...................................................................... add three tests for CIPHER MODE COMPLETE without algo Add three tests which exercise MSC behaviour when a CIPHER MODE COMPLETE command lacks the optional chosenEncryptionAlgorithm IE. Check for behaviour with A5/1, A5/3, and A5/1 + A5/3 configured in the network, and expect the location update to succeed. These tests pass on master, but they should somehow verify the cipher the MSC ends up using. I am not quite sure how to do that. Would inspecting the MSC's VTY be a reasonable approach? How could his be done by code which runs on BSC_ConnectionHandler? Change-Id: I1a2a126795c544613a7a87e238e1fc8c4e943885 Related: OS#2872 --- M library/BSSMAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.cfg M msc/MSC_Tests.ttcn M msc/expected-results.xml 5 files changed, 142 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/12347/1 diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index ff151f0..0db61b2 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -1032,6 +1032,19 @@ } } +template PDU_BSSAP ts_BSSMAP_CipherModeComplAlg(template BSSMAP_IE_ChosenEncryptionAlgorithm chosenEncryptionAlgorithm := ?) +modifies ts_BSSAP_BSSMAP := { + pdu := { + bssmap := { + cipherModeComplete := { + messageType := '55'O, + layer3MessageContents := omit, + chosenEncryptionAlgorithm := chosenEncryptionAlgorithm + } + } + } +} + template PDU_BSSAP tr_BSSMAP_CipherModeCompl(template OCT1 alg := ?) modifies tr_BSSAP_BSSMAP := { pdu := { bssmap := { diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index f005e02..c6029b7 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -295,28 +295,17 @@ } } -function f_perform_lu() -runs on BSC_ConnHdlr { - var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi) - var PDU_DTAP_MT dtap_mt; - - /* tell GSUP dispatcher to send this IMSI to us */ - f_create_gsup_expect(hex2str(g_pars.imsi)); - - /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ - f_bssap_compl_l3(l3_lu); - - if (g_pars.send_early_cm) { - BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3)); - } - - f_mm_common(); - +function f_msc_lu_hlr() runs on BSC_ConnHdlr +{ /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); GSUP.send(ts_GSUP_ISD_REQ(g_pars.imsi, g_pars.msisdn)); GSUP.receive(tr_GSUP_ISD_RES(g_pars.imsi)); GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); +} + +function f_accept_reject_lu() runs on BSC_ConnHdlr { + var PDU_DTAP_MT dtap_mt; alt { [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) -> value dtap_mt { @@ -343,10 +332,34 @@ mtc.stop; } } - /* FIXME: there could be pending SMS or other common procedures by the MSC, let's ignore them */ +} + +function f_bssap_clear() runs on BSC_ConnHdlr { BSSAP.receive(tr_BSSMAP_ClearCommand); BSSAP.send(ts_BSSMAP_ClearComplete); BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND); +} + +function f_perform_lu() +runs on BSC_ConnHdlr { + var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi) + + /* tell GSUP dispatcher to send this IMSI to us */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ + f_bssap_compl_l3(l3_lu); + + if (g_pars.send_early_cm) { + BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3)); + } + + f_mm_common(); + f_msc_lu_hlr(); + f_accept_reject_lu(); + /* FIXME: there could be pending SMS or other common procedures by the MSC, let's ignore them */ + f_bssap_clear(); + setverdict(pass); } diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg index b412889..b852bac 100644 --- a/msc/MSC_Tests.cfg +++ b/msc/MSC_Tests.cfg @@ -61,3 +61,6 @@ #MSC_Tests.TC_reset_two #MSC_Tests.TC_lu_and_mt_call #MSC_Tests.TC_cipher_complete_with_invalid_cipher +#MSC_Tests.TC_cipher_complete_1_without_cipher +#MSC_Tests.TC_cipher_complete_3_without_cipher +#MSC_Tests.TC_cipher_complete_13_without_cipher diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index adaeea3..3b40f50 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2814,6 +2814,68 @@ } } +private function f_tc_cipher_complete_without_alg(charstring id, BSC_ConnHdlrPars pars, octetstring kc_support) runs on BSC_ConnHdlr { + pars.net.expect_auth := true; + pars.net.expect_ciph := true; + pars.net.kc_support := kc_support; + f_init_handler(pars); + + g_pars.vec := f_gen_auth_vec_2g(); + + /* Can't use f_perform_lu() directly. Code below is based on it. */ + + /* tell GSUP dispatcher to send this IMSI to us */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ + var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi) + f_bssap_compl_l3(l3_lu); + + f_mm_auth(); + + var OCT1 a5_net := f_alg_mask_from_cm(g_pars.cm2); + var OCT1 a5_intersect := g_pars.net.kc_support and4b a5_net; + alt { + [] BSSAP.receive(tr_BSSMAP_CipherModeCmd(a5_intersect, g_pars.vec.kc)) { + BSSAP.send(ts_BSSMAP_CipherModeComplAlg(omit)); + } + [] BSSAP.receive(tr_BSSMAP_ClassmarkReq) { + BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3)); + repeat; + } + [] BSSAP.receive(tr_BSSMAP_CipherModeCmd(?, g_pars.vec.kc)) { + setverdict(fail, "Wrong ciphering algorithm mask in CiphModCmd"); + mtc.stop; + } + [] BSSAP.receive { + setverdict(fail, "Unknown/unexpected BSSAP received"); + mtc.stop; + } + } + + /* TODO: Verify MSC is using the best cipher available! How? */ + + f_msc_lu_hlr(); + f_accept_reject_lu(); + f_bssap_clear(); + setverdict(pass); +} + +/* A5/1 only permitted on network side; attempt CIPHER MODE COMPLETE without specifying the accepted algorithm. */ +private function f_tc_cipher_complete_1_without_cipher(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_tc_cipher_complete_without_alg(id, pars, '02'O /* A5/1 only */); +} + +/* A5/3 only permitted on network side; attempt CIPHER MODE COMPLETE without specifying the accepted algorithm. */ +private function f_tc_cipher_complete_3_without_cipher(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_tc_cipher_complete_without_alg(id, pars, '08'O /* A5/3 only */); +} + +/* A5/1 + A5/3 permitted on network side; attempt CIPHER MODE COMPLETE without specifying the accepted algorithm. */ +private function f_tc_cipher_complete_13_without_cipher(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_tc_cipher_complete_without_alg(id, pars, '0A'O /* A5/1 and A5/3 enabled */); +} + testcase TC_cipher_complete_with_invalid_cipher() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(); @@ -2823,6 +2885,33 @@ vc_conn.done; } +testcase TC_cipher_complete_1_without_cipher() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + f_vty_config(MSCVTY, "network", "encryption a5 1"); + + vc_conn := f_start_handler(refers(f_tc_cipher_complete_1_without_cipher), 53); + vc_conn.done; +} + +testcase TC_cipher_complete_3_without_cipher() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + f_vty_config(MSCVTY, "network", "encryption a5 3"); + + vc_conn := f_start_handler(refers(f_tc_cipher_complete_3_without_cipher), 54); + vc_conn.done; +} + +testcase TC_cipher_complete_13_without_cipher() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + f_vty_config(MSCVTY, "network", "encryption a5 1 3"); + + vc_conn := f_start_handler(refers(f_tc_cipher_complete_13_without_cipher), 55); + vc_conn.done; +} + /* TODO (SMS): * different user data lengths * SMPP transaction mode with unsuccessful delivery @@ -2912,6 +3001,9 @@ execute( TC_lu_and_ss_session_timeout() ); execute( TC_cipher_complete_with_invalid_cipher() ); + execute( TC_cipher_complete_1_without_cipher() ); + execute( TC_cipher_complete_3_without_cipher() ); + execute( TC_cipher_complete_13_without_cipher() ); /* Run this last: at the time of writing this test crashes the MSC */ execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 83c8010..1a9d68a 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -70,6 +70,9 @@ + + + -- To view, visit https://gerrit.osmocom.org/12347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1a2a126795c544613a7a87e238e1fc8c4e943885 Gerrit-Change-Number: 12347 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:30:38 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 18 Dec 2018 16:30:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: Add SGs testcases In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: Add SGs testcases ...................................................................... Patch Set 17: (3 comments) > Patch Set 17: Code-Review+2 Note: We must not merge this before we have merged the related osmo-msc code. The reason for this is that the tests will try to access the SGs interface always on startup. So all tests will start to fail. https://gerrit.osmocom.org/#/c/11488/3/msc/MSC_Tests.default File msc/MSC_Tests.default: https://gerrit.osmocom.org/#/c/11488/3/msc/MSC_Tests.default at 25 PS3, Line 25: > why did you remove the SGsAP. [?] I probably dropped this unintentionally, however it works fine without. When I add the line again I get this warning: TC_sgsap_lu(23)@lobotron: Warning: Test port parameter sctp_stack is not supported on port SGsAP. https://gerrit.osmocom.org/#/c/11488/8/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11488/8/msc/MSC_Tests.ttcn at 3108 PS8, Line 3108: testcase TC_sgsap_lu_and_nothing() runs on MTC_CT { : var BSC_ConnHdlr vc_conn; : f_init(); : : vc_conn := f_start_handler(refers(f_tc_sgsap_lu_and_nothing), 3); : vc_conn.done; : } : : private function f_tc_sgsap_expl_imsi_det_eps(charstring id, BSC_ConnHdlrPars pars) : runs on BSC_ConnHdlr { : f_init_handler(pars); : f_sgs_perform_lu(); : f_sleep(3.0); : : var octetstring mme_name := f_enc_dns_hostname(mp_mme_name); : SGsAP.send(ts_SGsAP_EPS_DETACH_IND(g_pars.imsi, mme_name, UE_initiated)); : SGsAP.receive(tr_SGsAP_EPS_DETACH_ACK(g_pars.imsi)); : f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-NULL"); : > Same here, what is the purpose of that?!? o_O As long as this is work in progress you can ignore such quirks. I will remove this when everything is ready. https://gerrit.osmocom.org/#/c/11488/8/msc/MSC_Tests.ttcn at 3186 PS8, Line 3186: : /* Wait for the states inside the MSC to settle and check the state : * of the SGs Association */ : > Here too... If both parts of this file are tooo unrelated, [?] Done -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 17 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: dexter Gerrit-Comment-Date: Tue, 18 Dec 2018 16:30:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:30:51 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 18 Dec 2018 16:30:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: Add SGs testcases In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#18) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: Add SGs testcases ...................................................................... WIP: MSC_Tests: Add SGs testcases This extens MSC_Tests.ttcn with an initial set of SGs interface test cases for RESET, LU, DETACH, PAGING, SMS and CSFB procedures In particular the following testcases are added: - TC_sgsap_reset: isolated reset procedure test - TC_sgsap_lu: isolated location update with TMSI realloc - TC_sgsap_lu_imsi_reject: location update, reject case - TC_sgsap_lu_and_nothing: location update with failed TMSI realloc - TC_sgsap_expl_imsi_det_eps: detach from EPS serveces - TC_sgsap_expl_imsi_det_noneps: detach from non-EPS services - TC_sgsap_paging_rej: isolated paging, reject case - TC_sgsap_paging_subscr_rej: isolated paging, subscr rejects call - TC_sgsap_paging_ue_unr: isolated paging, ue is unreachable - TC_sgsap_paging_and_nothing: page, but don't respond - TC_sgsap_mt_sms: mobile terminated SMS through SGs Interface - TC_sgsap_mo_sms: mobile originated SMS through SGs Interface - TC_sgsap_mt_sms_and_nothing: trigger SMS, but don't respond to paging - TC_sgsap_mt_sms_and_reject: trigger SMS, but reject paging - TC_sgsap_unexp_ud: Send unexpected unitdata (SGs Association: NULL) - TC_sgsap_unsol_ud: Send unsolicited unitdata (subscriber not in VLR) - TC_bssap_lu_sgsap_lu_and_mt_call: LU on 2G, LU on SGs and CSFB call - TC_sgsap_lu_and_mt_call: LU on SGs, and CSFB call Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Depends: osmo-msc I73359925fc1ca72b33a1466e6ac41307f2f0b11d Related: OS#3645 --- M library/SGsAP_Emulation.ttcn M library/SGsAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/expected-results.xml M msc/gen_links.sh M msc/regen_makefile.sh 7 files changed, 1,105 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11488/18 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 18 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:30:52 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 18 Dec 2018 16:30:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_CTRL_Adapter: Let the OS decide over the local port number Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12348 Change subject: Osmocom_CTRL_Adapter: Let the OS decide over the local port number ...................................................................... Osmocom_CTRL_Adapter: Let the OS decide over the local port number At the moment the function f_ipa_ctrl_start() is starting the IPA emulation client with parameter -1 for local port. This is internally translated to port number 9999, which is a fixed number. This makes it impossible to have two control interfaces at the same time. Lets use 0 as local port, so that the OS is selecting a free port number automatically. Change-Id: Ie6648f8f4c1e065c174868c35eb64ee034ace3ce Related: OS#3645 --- M library/Osmocom_CTRL_Adapter.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/12348/1 diff --git a/library/Osmocom_CTRL_Adapter.ttcn b/library/Osmocom_CTRL_Adapter.ttcn index a98ac29..f1002bd 100644 --- a/library/Osmocom_CTRL_Adapter.ttcn +++ b/library/Osmocom_CTRL_Adapter.ttcn @@ -29,7 +29,7 @@ map(vc_CTRL_IPA:IPA_PORT, system:IPA_CODEC_PT); connect(vc_CTRL_IPA:IPA_CTRL_PORT, self:IPA_CTRL); - vc_CTRL_IPA.start(IPA_Emulation.main_client(bsc_host, bsc_port, "", -1, + vc_CTRL_IPA.start(IPA_Emulation.main_client(bsc_host, bsc_port, "", 0, c_IPA_default_ccm_pars, false)); /* wait for IPA CTRL link to connect and send UP */ -- To view, visit https://gerrit.osmocom.org/12348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6648f8f4c1e065c174868c35eb64ee034ace3ce Gerrit-Change-Number: 12348 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:31:29 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 16:31:29 +0000 Subject: Change in osmo-msc[master]: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12349 Change subject: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE ...................................................................... improve handling of BSC-chosen algo in CIPHER MODE COMPLETE The BSC may choose to omit the chosenEntryptionAlgorithm IE in the CIPHER MODE COMPLETE command. When this happens, we used to default to A5/1 and disregarded the list of ciphers which we requested in the CIPHER MODE CMD. Fall back to the best cipher instead of hard-coding a fallback to A5/1. If the BSC does specify an algorithm, ensure that the chosen value falls within the range allowed by GSM 04.08, and ensure that the chosen value matches one of the values we sent in CIPHER MODE CMD. Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81 Related: OS#2872 --- M include/osmocom/msc/gsm_04_08.h M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c 3 files changed, 53 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/49/12349/1 diff --git a/include/osmocom/msc/gsm_04_08.h b/include/osmocom/msc/gsm_04_08.h index 5ff16de..79f7e0f 100644 --- a/include/osmocom/msc/gsm_04_08.h +++ b/include/osmocom/msc/gsm_04_08.h @@ -77,5 +77,7 @@ int gsm48_tch_rtp_create(struct gsm_trans *trans); int gsm48_conn_sendmsg(struct msgb *msg, struct ran_conn *conn, struct gsm_trans *trans); +struct gsm_classmark; +int gsm48_classmark_supports_a5(const struct gsm_classmark *cm, uint8_t a5); #endif diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index d84a234..69824c7 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -35,6 +35,7 @@ #include #include #include +#include #include @@ -386,14 +387,59 @@ * is not able to deal with msg = NULL and apperently * ran_conn_cipher_mode_compl() was never meant to be used without L3 data. * This needs to be discussed further! */ - - uint8_t alg_id = 1; + struct gsm_network *net = conn->network; + int alg_id = -1; struct rate_ctr_group *msc = conn->network->msc_ctrs; + struct gsm0808_encrypt_info ei = { 0 }; + int i, j = 0; LOGPCONN(conn, LOGL_DEBUG, "Rx BSSMAP CIPHER MODE COMPLETE\n"); if (TLVP_PRESENT(tp, GSM0808_IE_CHOSEN_ENCR_ALG)) { - alg_id = TLVP_VAL(tp, GSM0808_IE_CHOSEN_ENCR_ALG)[0] - 1; + uint8_t val = TLVP_VAL(tp, GSM0808_IE_CHOSEN_ENCR_ALG)[0]; + if (val < GSM0808_ALG_ID_A5_0 || val > GSM0808_ALG_ID_A5_7) { + LOGPCONN(conn, LOGL_ERROR, "Invalid encryption algorithm in CIPHER MODE COMPLETE: 0x%x\n", val); + return -EINVAL; + } + alg_id = val - 1; + } else { + /* The BSC did not choose an algorithm. We sort this out below. */ + } + + /* Recompute the ENCRYPTION INFORMATION IE we sent in CIPHER MODE CMD. */ + for (i = 0; i < 8; i++) { + int supported; + + /* A5/n permitted by osmo-msc.cfg? */ + if (!(net->a5_encryption_mask & (1 << i))) + continue; + + /* A5/n supported by MS? */ + supported = gsm48_classmark_supports_a5(&conn->vsub->classmark, i); + if (supported == 1) + ei.perm_algo[j++] = vlr_ciph_to_gsm0808_alg_id(i); + } + ei.perm_algo_len = j; + + if (alg_id == -1) { + if (ei.perm_algo_len > 0) { + /* Pick the best available algorithm. */ + alg_id = ei.perm_algo[ei.perm_algo_len - 1] - 1; + } else + alg_id = VLR_CIPH_NONE; + LOGPCONN(conn, LOGL_NOTICE, "BSC didn't specify algorithm in CIHPER MODE COMPLETE; falling back to A5/%d\n", alg_id); + } else { + int chosen = -1; + for (j = 0; j < ei.perm_algo_len; j++) { + if (ei.perm_algo[j] == alg_id) { + chosen = j; + break; + } + } + if (chosen == -1) { + LOGPCONN(conn, LOGL_ERROR, "Unsupported encryption algorithm in CIHPER MODE COMPLETE: A5/%d\n", alg_id); + return -EINVAL; + } } if (TLVP_PRESENT(tp, GSM0808_IE_LAYER_3_MESSAGE_CONTENTS)) { diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index dc0476b..bfad853 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -122,7 +122,7 @@ * Return 1 when the given A5/n is permitted, 0 when not, and negative if the respective MS CLASSMARK is * not known, where the negative number indicates the classmark type: -2 means Classmark 2 is not * available. */ -static int classmark_supports_a5(const struct gsm_classmark *cm, uint8_t a5) +int gsm48_classmark_supports_a5(const struct gsm_classmark *cm, uint8_t a5) { switch (a5) { case 0: @@ -1618,7 +1618,7 @@ continue; /* A5/n supported by MS? */ - supported = classmark_supports_a5(&conn->vsub->classmark, i); + supported = gsm48_classmark_supports_a5(&conn->vsub->classmark, i); if (supported == 1) { ei.perm_algo[j++] = vlr_ciph_to_gsm0808_alg_id(i); /* A higher A5/n is supported, so no need to request a Classmark -- To view, visit https://gerrit.osmocom.org/12349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81 Gerrit-Change-Number: 12349 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:31:50 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 18 Dec 2018 16:31:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Abandoned I have revisited the problem and managed to solve it. Now we have the control interface on both sides. -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:42:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 16:42:50 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 12 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 16:42:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:43:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 16:43:28 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11751 ) Change subject: GSUP/SMS: introduce READY-FOR-SM message ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Gerrit-Change-Number: 11751 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 16:43:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:43:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 16:43:29 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages ...................................................................... GSUP/SMS: introduce MO-/MT-FORWARD-SM messages According to 3GPP TS 29.002, there are two services: - MAP-MO-FORWARD-SHORT-MESSAGE (see 12.2), - MAP-MT-FORWARD-SHORT-MESSAGE (see 12.9), which are used to forward MO/MT short messages. This change replicates both services as GSUP messages: - OSMO_GSUP_MSGT_MO_FORWARD_SM_*, - OSMO_GSUP_MSGT_MT_FORWARD_SM_*. Please note, that only the 'must-have' IEs are introduced by this change, in particular the following: - OSMO_GSUP_SM_RP_MR_IE (see note below), - OSMO_GSUP_SM_RP_DA_IE (see 7.6.8.1), - OSMO_GSUP_SM_RP_OA_IE (see 7.6.8.2), - OSMO_GSUP_SM_RP_UI_IE (see 7.6.8.4), - OSMO_GSUP_SM_RP_MMS_IE (see 7.6.8.7), - OSMO_GSUP_SM_RP_CAUSE_IE (see GSM TS 04.11, 8.2.5.4), where both SM_RP_DA and SM_RP_OA IEs basically contain a single nested TV of the following format: - T: identity type (see 'osmo_gsup_sms_sm_rp_oda_t'), - V: encoded identity itself (optional). According to GSM TS 04.11, every single message on the SM-RL has an unique message reference (see 8.2.3), that is used to link an RP-ACK or RP-ERROR message to the associated (preceding) RP-DATA or RP-SMMA message transfer attempt. In case of TCAP/MAP, this message reference is being mapped to the Invoke ID. But since GSUP has no 'Invoke ID' IE, and it is not required for other applications (other than SMS), this change introduces a special 'SM_RP_MR' IE that doesn't exist in MAP. Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Related Change-Id: (docs) Ie0150756c33c1352bc4eb49421824542c711175c Related Change-Id: (TTCN) Ibf49474a81235096c032ea21f217170f523bd94e Related: OS#3587 --- M TODO-RELEASE M include/Makefile.am M include/osmocom/gsm/gsup.h A include/osmocom/gsm/gsup_sms.h M src/gsm/Makefile.am M src/gsm/gsup.c A src/gsm/gsup_sms.c M src/gsm/libosmogsm.map M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 11 files changed, 527 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 00720f6..16d96ec 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -16,3 +16,6 @@ libosmogsm gsm0808_cause_ext() check for cause extended bit libosmogsm gsm0808_cause_name() use enum as parameter libosmogsm gsm0808_create_cipher_reject() use enum as parameter +libosmogsm osmo_gsup_message extended with SMS related fields +libosmogsm osmo_gsup_sms_{en|de}code_sm_rp_da GSUP SM-RP-DA coding helpers +libosmogsm osmo_gsup_sms_{en|de}code_sm_rp_oa GSUP SM-RP-OA coding helpers diff --git a/include/Makefile.am b/include/Makefile.am index ccf9e10..86d8d15 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -94,6 +94,7 @@ osmocom/gsm/gsm48_ie.h \ osmocom/gsm/gsm_utils.h \ osmocom/gsm/gsup.h \ + osmocom/gsm/gsup_sms.h \ osmocom/gsm/ipa.h \ osmocom/gsm/lapd_core.h \ osmocom/gsm/lapdm.h \ diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index cd6fd31..192b877 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -40,6 +40,7 @@ #include #include +#include #include #include #include @@ -88,6 +89,14 @@ /*! Supplementary Services payload */ OSMO_GSUP_SS_INFO_IE = 0x35, + + /* SM related IEs (see 3GPP TS 29.002, section 7.6.8) */ + OSMO_GSUP_SM_RP_MR_IE = 0x40, + OSMO_GSUP_SM_RP_DA_IE = 0x41, + OSMO_GSUP_SM_RP_OA_IE = 0x42, + OSMO_GSUP_SM_RP_UI_IE = 0x43, + OSMO_GSUP_SM_RP_CAUSE_IE = 0x44, + OSMO_GSUP_SM_RP_MMS_IE = 0x45, }; /*! GSUP message type */ @@ -121,6 +130,14 @@ OSMO_GSUP_MSGT_PROC_SS_REQUEST = 0b00100000, OSMO_GSUP_MSGT_PROC_SS_ERROR = 0b00100001, OSMO_GSUP_MSGT_PROC_SS_RESULT = 0b00100010, + + OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST = 0b00100100, + OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR = 0b00100101, + OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT = 0b00100110, + + OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST = 0b00101000, + OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR = 0b00101001, + OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT = 0b00101010, }; #define OSMO_GSUP_IS_MSGT_REQUEST(msgt) (((msgt) & 0b00000011) == 0b00) @@ -213,6 +230,26 @@ /*! ASN.1 encoded MAP payload for Supplementary Services */ uint8_t *ss_info; size_t ss_info_len; + + /*! SM-RP-MR (see 3GPP TS 29.002, 7.6.1.1), Message Reference. + * Please note that there is no SM-RP-MR in TCAP/MAP! SM-RP-MR + * is usually mapped to TCAP's InvokeID, but we don't need it. */ + const uint8_t *sm_rp_mr; + /*! SM-RP-DA (see 3GPP TS 29.002, 7.6.8.1), Destination Address */ + enum osmo_gsup_sms_sm_rp_oda_t sm_rp_da_type; + size_t sm_rp_da_len; + const uint8_t *sm_rp_da; + /*! SM-RP-OA (see 3GPP TS 29.002, 7.6.8.2), Originating Address */ + enum osmo_gsup_sms_sm_rp_oda_t sm_rp_oa_type; + size_t sm_rp_oa_len; + const uint8_t *sm_rp_oa; + /*! SM-RP-UI (see 3GPP TS 29.002, 7.6.8.4), SMS TPDU */ + const uint8_t *sm_rp_ui; + size_t sm_rp_ui_len; + /*! SM-RP-Cause value (1 oct.) as per GSM TS 04.11, section 8.2.5.4 */ + const uint8_t *sm_rp_cause; + /*! SM-RP-MMS (More Messages to Send), section 7.6.8.7 */ + const uint8_t *sm_rp_mms; }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, diff --git a/include/osmocom/gsm/gsup_sms.h b/include/osmocom/gsm/gsup_sms.h new file mode 100644 index 0000000..521412d --- /dev/null +++ b/include/osmocom/gsm/gsup_sms.h @@ -0,0 +1,38 @@ +#pragma once + +/*! \addtogroup gsup + * @{ + * + * This header defines SMS (Short Message Service) extensions for + * Osmocom GSUP (Generic Subscriber Update Protocol). The scope of + * this module is defined by 3GPP TS 29.002, section 12. + * + * \file gsup_sms.h + * SMS (Short Message Service) extensions for Osmocom GSUP. */ + +#include + +/*! Possible identity types for SM-RP-{OA|DA} */ +enum osmo_gsup_sms_sm_rp_oda_t { + OSMO_GSUP_SMS_SM_RP_ODA_NONE = 0x00, + OSMO_GSUP_SMS_SM_RP_ODA_IMSI = 0x01, + OSMO_GSUP_SMS_SM_RP_ODA_MSISDN = 0x02, + OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR = 0x03, + /*! Special value for noSM-RP-DA and noSM-RP-OA */ + OSMO_GSUP_SMS_SM_RP_ODA_NULL = 0xff, +}; + +struct osmo_gsup_message; +struct msgb; + +int osmo_gsup_sms_encode_sm_rp_da(struct msgb *msg, + const struct osmo_gsup_message *gsup_msg); +int osmo_gsup_sms_decode_sm_rp_da(struct osmo_gsup_message *gsup_msg, + uint8_t *data, size_t data_len); + +int osmo_gsup_sms_encode_sm_rp_oa(struct msgb *msg, + const struct osmo_gsup_message *gsup_msg); +int osmo_gsup_sms_decode_sm_rp_oa(struct osmo_gsup_message *gsup_msg, + uint8_t *data, size_t data_len); + +/*! @} */ diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index ccb38ad..3d2c560 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -29,7 +29,7 @@ auth_milenage.c milenage/aes-encblock.c gea.c \ milenage/aes-internal.c milenage/aes-internal-enc.c \ milenage/milenage.c gan.c ipa.c gsm0341.c apn.c \ - gsup.c gprs_gea.c gsm0503_conv.c oap.c gsm0808_utils.c \ + gsup.c gsup_sms.c gprs_gea.c gsm0503_conv.c oap.c gsm0808_utils.c \ gsm23003.c mncc.c bts_features.c oap_client.c \ gsm29118.c libgsmint_la_LDFLAGS = -no-undefined diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 18b3580..e433997 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -67,6 +67,14 @@ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_PROC_SS_ERROR), OSMO_VALUE_STRING(OSMO_GSUP_MSGT_PROC_SS_RESULT), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT), + + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT), + { 0, NULL } }; @@ -434,6 +442,35 @@ gsup_msg->ss_info_len = value_len; break; + case OSMO_GSUP_SM_RP_MR_IE: + gsup_msg->sm_rp_mr = value; + break; + + case OSMO_GSUP_SM_RP_DA_IE: + rc = osmo_gsup_sms_decode_sm_rp_da(gsup_msg, value, value_len); + if (rc) + return rc; + break; + + case OSMO_GSUP_SM_RP_OA_IE: + rc = osmo_gsup_sms_decode_sm_rp_oa(gsup_msg, value, value_len); + if (rc) + return rc; + break; + + case OSMO_GSUP_SM_RP_UI_IE: + gsup_msg->sm_rp_ui = value; + gsup_msg->sm_rp_ui_len = value_len; + break; + + case OSMO_GSUP_SM_RP_MMS_IE: + gsup_msg->sm_rp_mms = value; + break; + + case OSMO_GSUP_SM_RP_CAUSE_IE: + gsup_msg->sm_rp_cause = value; + break; + default: LOGP(DLGSUP, LOGL_NOTICE, "GSUP IE type %d unknown\n", iei); @@ -529,7 +566,7 @@ int osmo_gsup_encode(struct msgb *msg, const struct osmo_gsup_message *gsup_msg) { uint8_t u8; - int idx; + int idx, rc; uint8_t bcd_buf[GSM48_MI_SIZE] = {0}; size_t bcd_len; @@ -626,6 +663,42 @@ gsup_msg->ss_info_len, gsup_msg->ss_info); } + if (gsup_msg->sm_rp_mr) { + msgb_tlv_put(msg, OSMO_GSUP_SM_RP_MR_IE, + sizeof(*gsup_msg->sm_rp_mr), gsup_msg->sm_rp_mr); + } + + if (gsup_msg->sm_rp_da_type) { + rc = osmo_gsup_sms_encode_sm_rp_da(msg, gsup_msg); + if (rc) { + LOGP(DLGSUP, LOGL_ERROR, "Failed to encode SM-RP-DA IE\n"); + return -EINVAL; + } + } + + if (gsup_msg->sm_rp_oa_type) { + rc = osmo_gsup_sms_encode_sm_rp_oa(msg, gsup_msg); + if (rc) { + LOGP(DLGSUP, LOGL_ERROR, "Failed to encode SM-RP-OA IE\n"); + return -EINVAL; + } + } + + if (gsup_msg->sm_rp_ui) { + msgb_tlv_put(msg, OSMO_GSUP_SM_RP_UI_IE, + gsup_msg->sm_rp_ui_len, gsup_msg->sm_rp_ui); + } + + if (gsup_msg->sm_rp_mms) { + msgb_tlv_put(msg, OSMO_GSUP_SM_RP_MMS_IE, + sizeof(*gsup_msg->sm_rp_mms), gsup_msg->sm_rp_mms); + } + + if (gsup_msg->sm_rp_cause) { + msgb_tlv_put(msg, OSMO_GSUP_SM_RP_CAUSE_IE, + sizeof(*gsup_msg->sm_rp_cause), gsup_msg->sm_rp_cause); + } + return 0; } diff --git a/src/gsm/gsup_sms.c b/src/gsm/gsup_sms.c new file mode 100644 index 0000000..d49cf20 --- /dev/null +++ b/src/gsm/gsup_sms.c @@ -0,0 +1,256 @@ +/* + * (C) 2018 by Vadim Yanitskiy + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include + +#include +#include + +#include +#include + +/*! \addtogroup gsup + * @{ + * \file gsup_sms.c + * SMS (Short Message Service) extensions for Osmocom GSUP. + */ + +/*! Encode SM-RP-DA IE (see 7.6.8.1), Destination Address. + * \param[out] msg target message buffer (caller-allocated) + * \param[in] gsup_msg abstract GSUP message structure + * \returns 0 in case of success, negative in case of error + */ +int osmo_gsup_sms_encode_sm_rp_da(struct msgb *msg, + const struct osmo_gsup_message *gsup_msg) +{ + uint8_t *id_enc; + + switch (gsup_msg->sm_rp_da_type) { + case OSMO_GSUP_SMS_SM_RP_ODA_IMSI: + case OSMO_GSUP_SMS_SM_RP_ODA_MSISDN: + case OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR: + /* Prevent NULL-pointer (or empty) dereference */ + if (gsup_msg->sm_rp_da == NULL || gsup_msg->sm_rp_da_len == 0) { + LOGP(DLGSUP, LOGL_ERROR, "Empty?!? SM-RP-DA ID " + "(type=0x%02x)!\n", gsup_msg->sm_rp_da_type); + return -EINVAL; + } + break; + + /* Special case for noSM-RP-DA */ + case OSMO_GSUP_SMS_SM_RP_ODA_NULL: + break; + + case OSMO_GSUP_SMS_SM_RP_ODA_NONE: + default: + LOGP(DLGSUP, LOGL_ERROR, "Unexpected SM-RP-DA ID " + "(type=0x%02x)!\n", gsup_msg->sm_rp_da_type); + return -EINVAL; + } + + /* SM-RP-DA tag | len | ... */ + msgb_tv_put(msg, OSMO_GSUP_SM_RP_DA_IE, gsup_msg->sm_rp_da_len + 1); + msgb_v_put(msg, gsup_msg->sm_rp_da_type); /* ... | id_type */ + + if (gsup_msg->sm_rp_da_type == OSMO_GSUP_SMS_SM_RP_ODA_NULL) + return 0; + + /* ... | id_enc */ + id_enc = msgb_put(msg, gsup_msg->sm_rp_da_len); + memcpy(id_enc, gsup_msg->sm_rp_da, gsup_msg->sm_rp_da_len); + + return 0; +} + +/*! Decode SM-RP-DA IE (see 7.6.8.1), Destination Address. + * \param[out] gsup_msg abstract GSUP message structure + * \param[in] data pointer to the raw IE payload + * \param[in] data_len length of IE pointed by \ref data + * \returns 0 in case of success, negative in case of error + */ +int osmo_gsup_sms_decode_sm_rp_da(struct osmo_gsup_message *gsup_msg, + uint8_t *data, size_t data_len) +{ + uint8_t *ptr = data; + uint8_t id_type; + + /* There should be at least id_type */ + if (data_len < 1) { + LOGP(DLGSUP, LOGL_ERROR, "Corrupted SM-RP-DA IE " + "(missing identity type)\n"); + return -EINVAL; + } + + /* ... | id_type | id_enc (optional) */ + id_type = *ptr++; + data_len--; + + /* Parse ID type */ + switch (id_type) { + case OSMO_GSUP_SMS_SM_RP_ODA_IMSI: + case OSMO_GSUP_SMS_SM_RP_ODA_MSISDN: + case OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR: + if (!data_len) { + /* ID shall not be empty (if its type != NULL) */ + LOGP(DLGSUP, LOGL_ERROR, "Corrupted SM-RP-DA IE " + "(missing encoded identity)\n"); + return -EINVAL; + } + + gsup_msg->sm_rp_da_type = id_type; + gsup_msg->sm_rp_da_len = data_len; + gsup_msg->sm_rp_da = ptr; + break; + + /* Special case for noSM-RP-DA */ + case OSMO_GSUP_SMS_SM_RP_ODA_NULL: + if (data_len != 0) { + LOGP(DLGSUP, LOGL_ERROR, "Unexpected SM-RP-DA ID, " + "(id_len != 0) for noSM-RP-DA!\n"); + return -EINVAL; + } + + gsup_msg->sm_rp_da_type = id_type; + gsup_msg->sm_rp_da_len = 0; + gsup_msg->sm_rp_da = NULL; + break; + + case OSMO_GSUP_SMS_SM_RP_ODA_NONE: + default: + LOGP(DLGSUP, LOGL_ERROR, "Unexpected SM-RP-DA ID " + "(type=0x%02x)!\n", id_type); + return -EINVAL; + } + + return 0; +} + +/*! Encode SM-RP-OA IE (see 7.6.8.2), Originating Address. + * \param[out] msg target message buffer (caller-allocated) + * \param[in] gsup_msg abstract GSUP message structure + * \returns 0 in case of success, negative in case of error + */ +int osmo_gsup_sms_encode_sm_rp_oa(struct msgb *msg, + const struct osmo_gsup_message *gsup_msg) +{ + uint8_t *id_enc; + + switch (gsup_msg->sm_rp_oa_type) { + case OSMO_GSUP_SMS_SM_RP_ODA_MSISDN: + case OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR: + /* Prevent NULL-pointer (or empty) dereference */ + if (gsup_msg->sm_rp_oa == NULL || gsup_msg->sm_rp_oa_len == 0) { + LOGP(DLGSUP, LOGL_ERROR, "Empty?!? SM-RP-OA ID " + "(type=0x%02x)!\n", gsup_msg->sm_rp_oa_type); + return -EINVAL; + } + break; + + /* Special case for noSM-RP-OA */ + case OSMO_GSUP_SMS_SM_RP_ODA_NULL: + break; + + case OSMO_GSUP_SMS_SM_RP_ODA_NONE: + default: + LOGP(DLGSUP, LOGL_ERROR, "Unexpected SM-RP-OA ID " + "(type=0x%02x)!\n", gsup_msg->sm_rp_oa_type); + return -EINVAL; + } + + /* SM-RP-OA tag | len | ... */ + msgb_tv_put(msg, OSMO_GSUP_SM_RP_OA_IE, gsup_msg->sm_rp_oa_len + 1); + msgb_v_put(msg, gsup_msg->sm_rp_oa_type); /* ... | id_type */ + + if (gsup_msg->sm_rp_oa_type == OSMO_GSUP_SMS_SM_RP_ODA_NULL) + return 0; + + /* ... | id_enc */ + id_enc = msgb_put(msg, gsup_msg->sm_rp_oa_len); + memcpy(id_enc, gsup_msg->sm_rp_oa, gsup_msg->sm_rp_oa_len); + + return 0; +} + +/*! Decode SM-RP-OA IE (see 7.6.8.2), Originating Address. + * \param[out] gsup_msg abstract GSUP message structure + * \param[in] data pointer to the raw IE payload + * \param[in] data_len length of IE pointed by \ref data + * \returns 0 in case of success, negative in case of error + */ +int osmo_gsup_sms_decode_sm_rp_oa(struct osmo_gsup_message *gsup_msg, + uint8_t *data, size_t data_len) +{ + uint8_t *ptr = data; + uint8_t id_type; + + /* There should be at least id_type */ + if (data_len < 1) { + LOGP(DLGSUP, LOGL_ERROR, "Corrupted SM-RP-OA IE " + "(missing identity type)\n"); + return -EINVAL; + } + + /* ... | id_type | id_enc (optional) */ + id_type = *ptr++; + data_len--; + + /* Parse ID type */ + switch (id_type) { + case OSMO_GSUP_SMS_SM_RP_ODA_IMSI: + case OSMO_GSUP_SMS_SM_RP_ODA_MSISDN: + case OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR: + if (!data_len) { + /* ID shall not be empty (if its type != NULL) */ + LOGP(DLGSUP, LOGL_ERROR, "Corrupted SM-RP-OA IE " + "(missing encoded identity)\n"); + return -EINVAL; + } + + gsup_msg->sm_rp_oa_type = id_type; + gsup_msg->sm_rp_oa_len = data_len; + gsup_msg->sm_rp_oa = ptr; + break; + + /* Special case for noSM-RP-DA */ + case OSMO_GSUP_SMS_SM_RP_ODA_NULL: + if (data_len != 0) { + LOGP(DLGSUP, LOGL_ERROR, "Unexpected SM-RP-OA ID, " + "(id_len != 0) for noSM-RP-DA!\n"); + return -EINVAL; + } + + gsup_msg->sm_rp_oa_type = id_type; + gsup_msg->sm_rp_oa_len = 0; + gsup_msg->sm_rp_oa = NULL; + break; + + case OSMO_GSUP_SMS_SM_RP_ODA_NONE: + default: + LOGP(DLGSUP, LOGL_ERROR, "Unexpected SM-RP-OA ID " + "(type=0x%02x)!\n", id_type); + return -EINVAL; + } + + return 0; +} + +/*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 959d182..90c2195 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -523,6 +523,11 @@ osmo_gsup_session_state_names; osmo_gsup_get_err_msg_type; +osmo_gsup_sms_encode_sm_rp_da; +osmo_gsup_sms_decode_sm_rp_da; +osmo_gsup_sms_encode_sm_rp_oa; +osmo_gsup_sms_decode_sm_rp_oa; + osmo_oap_encode; osmo_oap_decode; diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index 9712d77..0936893 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -217,6 +217,69 @@ 0x02, 0x01, 0x47, }; + static const uint8_t send_mo_forward_sm_req[] = { + 0x24, /* OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST */ + TEST_IMSI_IE, + + /* SM related IEs */ + 0x40, 0x01, /* SM-RP-MR (Message Reference) */ + 0xfa, + 0x41, 0x08, /* SM-RP-DA (Destination Address) */ + 0x03, /* SMSC address */ + 0x91, 0x52, 0x75, 0x47, 0x99, 0x09, 0x82, + 0x42, 0x01, /* SM-RP-OA (Originating Address) */ + 0xff, /* Special case: noSM-RP-OA */ + 0x43, 0x04, /* SM-RP-UI (TPDU) */ + 0xde, 0xad, 0xbe, 0xef, + }; + + static const uint8_t send_mt_forward_sm_req[] = { + 0x28, /* OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST */ + TEST_IMSI_IE, + + /* SM related IEs */ + 0x40, 0x01, /* SM-RP-MR (Message Reference) */ + 0xfa, + 0x41, 0x09, /* SM-RP-DA (Destination Address) */ + 0x01, /* IMSI */ + 0x21, 0x43, 0x65, 0x87, 0x09, 0x21, 0x43, 0xf5, + 0x42, 0x08, /* SM-RP-OA (Originating Address) */ + 0x03, /* SMSC address */ + 0x91, 0x52, 0x75, 0x47, 0x99, 0x09, 0x82, + 0x43, 0x04, /* SM-RP-UI (TPDU) */ + 0xde, 0xad, 0xbe, 0xef, + 0x45, 0x01, /* SM-RP-MMS (More Messages to Send) */ + 0x01, + }; + + static const uint8_t send_mo_mt_forward_sm_err[] = { + 0x25, /* OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR */ + TEST_IMSI_IE, + + /* Session related IEs */ + 0x30, 0x04, /* Session ID */ + 0xde, 0xad, 0xbe, 0xef, + 0x31, 0x01, /* Session state (END) */ + 0x03, + + /* SM related IEs */ + 0x40, 0x01, /* SM-RP-MR (Message Reference) */ + 0xfa, + 0x44, 0x01, /* SM-RP-Cause value */ + 0xaf, + }; + + static const uint8_t send_mo_mt_forward_sm_rsp[] = { + 0x2a, /* OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT */ + TEST_IMSI_IE, + + /* SM related IEs */ + 0x40, 0x01, /* SM-RP-MR (Message Reference) */ + 0xfa, + 0x43, 0x04, /* SM-RP-UI (TPDU) */ + 0xde, 0xad, 0xbe, 0xef, + }; + static const struct test { char *name; const uint8_t *data; @@ -256,6 +319,14 @@ send_ussd_req, sizeof(send_ussd_req)}, {"SS/USSD processUnstructuredSS-Request / ReturnResult", send_ussd_res, sizeof(send_ussd_res)}, + {"MO-ForwardSM (MSC -> SMSC) Request", + send_mo_forward_sm_req, sizeof(send_mo_forward_sm_req)}, + {"MT-ForwardSM (MSC -> SMSC) Request", + send_mt_forward_sm_req, sizeof(send_mt_forward_sm_req)}, + {"MO-/MT-ForwardSM Response", + send_mo_mt_forward_sm_rsp, sizeof(send_mo_mt_forward_sm_rsp)}, + {"MO-/MT-ForwardSM Error", + send_mo_mt_forward_sm_err, sizeof(send_mo_mt_forward_sm_err)}, }; printf("Test GSUP message decoding/encoding\n"); @@ -323,7 +394,7 @@ * FIXME: share the maximal IE value somehow * in order to avoid manual updating of this */ - OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SS_INFO_IE); + OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SM_RP_MMS_IE); OSMO_ASSERT(t->data[j+1] <= ie_end - j - 2); ie_end = j; diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index ac71ac2..4a1357c 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -49,6 +49,18 @@ generated message: 22 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 35 08 a3 06 02 01 01 02 01 47 original message: 22 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 35 08 a3 06 02 01 01 02 01 47 IMSI: 123456789012345 + generated message: 24 01 08 21 43 65 87 09 21 43 f5 40 01 fa 41 08 03 91 52 75 47 99 09 82 42 01 ff 43 04 de ad be ef + original message: 24 01 08 21 43 65 87 09 21 43 f5 40 01 fa 41 08 03 91 52 75 47 99 09 82 42 01 ff 43 04 de ad be ef + IMSI: 123456789012345 + generated message: 28 01 08 21 43 65 87 09 21 43 f5 40 01 fa 41 09 01 21 43 65 87 09 21 43 f5 42 08 03 91 52 75 47 99 09 82 43 04 de ad be ef 45 01 01 + original message: 28 01 08 21 43 65 87 09 21 43 f5 40 01 fa 41 09 01 21 43 65 87 09 21 43 f5 42 08 03 91 52 75 47 99 09 82 43 04 de ad be ef 45 01 01 + IMSI: 123456789012345 + generated message: 2a 01 08 21 43 65 87 09 21 43 f5 40 01 fa 43 04 de ad be ef + original message: 2a 01 08 21 43 65 87 09 21 43 f5 40 01 fa 43 04 de ad be ef + IMSI: 123456789012345 + generated message: 25 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 40 01 fa 44 01 af + original message: 25 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 40 01 fa 44 01 af + IMSI: 123456789012345 message 0: tested 11 truncations, 11 parse failures message 1: tested 14 truncations, 13 parse failures message 2: tested 83 truncations, 81 parse failures @@ -66,21 +78,29 @@ message 14: tested 20 truncations, 18 parse failures message 15: tested 42 truncations, 39 parse failures message 16: tested 30 truncations, 27 parse failures + message 17: tested 33 truncations, 29 parse failures + message 18: tested 44 truncations, 39 parse failures + message 19: tested 20 truncations, 18 parse failures + message 20: tested 26 truncations, 22 parse failures DLGSUP Stopping DLGSUP logging message 0: tested 2816 modifications, 510 parse failures - message 1: tested 3584 modifications, 768 parse failures - message 2: tested 21248 modifications, 2571 parse failures + message 1: tested 3584 modifications, 770 parse failures + message 2: tested 21248 modifications, 2575 parse failures message 3: tested 2816 modifications, 510 parse failures - message 4: tested 3584 modifications, 768 parse failures - message 5: tested 20736 modifications, 4010 parse failures - message 6: tested 3584 modifications, 769 parse failures - message 7: tested 3584 modifications, 768 parse failures + message 4: tested 3584 modifications, 770 parse failures + message 5: tested 20736 modifications, 4022 parse failures + message 6: tested 3584 modifications, 771 parse failures + message 7: tested 3584 modifications, 770 parse failures message 8: tested 2816 modifications, 510 parse failures message 9: tested 2816 modifications, 510 parse failures - message 10: tested 3584 modifications, 768 parse failures - message 11: tested 3328 modifications, 767 parse failures - message 12: tested 54016 modifications, 4622 parse failures + message 10: tested 3584 modifications, 770 parse failures + message 11: tested 3328 modifications, 769 parse failures + message 12: tested 54016 modifications, 4626 parse failures message 13: tested 11520 modifications, 1026 parse failures - message 14: tested 5120 modifications, 1026 parse failures - message 15: tested 10752 modifications, 1256 parse failures - message 16: tested 7680 modifications, 1265 parse failures + message 14: tested 5120 modifications, 1030 parse failures + message 15: tested 10752 modifications, 1262 parse failures + message 16: tested 7680 modifications, 1271 parse failures + message 17: tested 8448 modifications, 2053 parse failures + message 18: tested 11264 modifications, 2307 parse failures + message 19: tested 5120 modifications, 1031 parse failures + message 20: tested 6656 modifications, 1546 parse failures diff --git a/tests/gsup/gsup_test.ok b/tests/gsup/gsup_test.ok index d63dd2d..7a9455d 100644 --- a/tests/gsup/gsup_test.ok +++ b/tests/gsup/gsup_test.ok @@ -33,4 +33,12 @@ SS/USSD processUnstructuredSS-Request / Invoke OK Testing SS/USSD processUnstructuredSS-Request / ReturnResult SS/USSD processUnstructuredSS-Request / ReturnResult OK + Testing MO-ForwardSM (MSC -> SMSC) Request + MO-ForwardSM (MSC -> SMSC) Request OK + Testing MT-ForwardSM (MSC -> SMSC) Request + MT-ForwardSM (MSC -> SMSC) Request OK + Testing MO-/MT-ForwardSM Response + MO-/MT-ForwardSM Response OK + Testing MO-/MT-ForwardSM Error + MO-/MT-ForwardSM Error OK Done. -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 12 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:43:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 16:43:30 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11751 ) Change subject: GSUP/SMS: introduce READY-FOR-SM message ...................................................................... GSUP/SMS: introduce READY-FOR-SM message According to 3GPP TS 29.002, section 12.4, MAP-READY-FOR-SM is used between the MSC and VLR as well as between the VLR and the HLR to indicate that a subscriber has memory available for SMS. This change replicates this service in GSUP as READY_FOR_SM_*. The only mandatory IE for this service (excluding Invoke ID) is 'Alert Reason' that is replicated by OSMO_GSUP_SM_ALERT_RSN_IE. Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Related Change-Id: (docs) I549b6c8840a1e86caac09e77fb8bc5042d939e62 Related Change-Id: (TTCN) If2256607527ecfcb10285583332fb8b0515d7c78 Related: OS#3587 --- M include/osmocom/gsm/gsup.h M include/osmocom/gsm/gsup_sms.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 6 files changed, 46 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 192b877..51871e4 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -97,6 +97,7 @@ OSMO_GSUP_SM_RP_UI_IE = 0x43, OSMO_GSUP_SM_RP_CAUSE_IE = 0x44, OSMO_GSUP_SM_RP_MMS_IE = 0x45, + OSMO_GSUP_SM_ALERT_RSN_IE = 0x46, }; /*! GSUP message type */ @@ -138,6 +139,10 @@ OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST = 0b00101000, OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR = 0b00101001, OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT = 0b00101010, + + OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST = 0b00101100, + OSMO_GSUP_MSGT_READY_FOR_SM_ERROR = 0b00101101, + OSMO_GSUP_MSGT_READY_FOR_SM_RESULT = 0b00101110, }; #define OSMO_GSUP_IS_MSGT_REQUEST(msgt) (((msgt) & 0b00000011) == 0b00) @@ -250,6 +255,8 @@ const uint8_t *sm_rp_cause; /*! SM-RP-MMS (More Messages to Send), section 7.6.8.7 */ const uint8_t *sm_rp_mms; + /*! Alert reason (see 3GPP TS 29.002, 7.6.8.8) */ + enum osmo_gsup_sms_sm_alert_rsn_t sm_alert_rsn; }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, diff --git a/include/osmocom/gsm/gsup_sms.h b/include/osmocom/gsm/gsup_sms.h index 521412d..480971e 100644 --- a/include/osmocom/gsm/gsup_sms.h +++ b/include/osmocom/gsm/gsup_sms.h @@ -22,6 +22,13 @@ OSMO_GSUP_SMS_SM_RP_ODA_NULL = 0xff, }; +/*! Alert reason values, see 7.6.8.8 */ +enum osmo_gsup_sms_sm_alert_rsn_t { + OSMO_GSUP_SMS_SM_ALERT_RSN_NONE = 0x00, + OSMO_GSUP_SMS_SM_ALERT_RSN_MS_PRESENT = 0x01, + OSMO_GSUP_SMS_SM_ALERT_RSN_MEM_AVAIL = 0x02, +}; + struct osmo_gsup_message; struct msgb; diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index e433997..c1c9992 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -75,6 +75,10 @@ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR), OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_ERROR), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_RESULT), + { 0, NULL } }; @@ -471,6 +475,10 @@ gsup_msg->sm_rp_cause = value; break; + case OSMO_GSUP_SM_ALERT_RSN_IE: + gsup_msg->sm_alert_rsn = *value; + break; + default: LOGP(DLGSUP, LOGL_NOTICE, "GSUP IE type %d unknown\n", iei); @@ -699,6 +707,11 @@ sizeof(*gsup_msg->sm_rp_cause), gsup_msg->sm_rp_cause); } + if ((u8 = gsup_msg->sm_alert_rsn)) { + msgb_tlv_put(msg, OSMO_GSUP_SM_ALERT_RSN_IE, + sizeof(u8), &u8); + } + return 0; } diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index 0936893..b3a8c77 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -280,6 +280,15 @@ 0xde, 0xad, 0xbe, 0xef, }; + static const uint8_t send_ready_for_sm_ind[] = { + 0x2c, /* OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST */ + TEST_IMSI_IE, + + /* SM related IEs */ + 0x46, 0x01, /* Alert reason */ + 0x02, /* Memory Available (SMMA) */ + }; + static const struct test { char *name; const uint8_t *data; @@ -327,6 +336,8 @@ send_mo_mt_forward_sm_rsp, sizeof(send_mo_mt_forward_sm_rsp)}, {"MO-/MT-ForwardSM Error", send_mo_mt_forward_sm_err, sizeof(send_mo_mt_forward_sm_err)}, + {"ReadyForSM (MSC -> SMSC) Indication", + send_ready_for_sm_ind, sizeof(send_ready_for_sm_ind)}, }; printf("Test GSUP message decoding/encoding\n"); @@ -394,7 +405,7 @@ * FIXME: share the maximal IE value somehow * in order to avoid manual updating of this */ - OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SM_RP_MMS_IE); + OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SM_ALERT_RSN_IE); OSMO_ASSERT(t->data[j+1] <= ie_end - j - 2); ie_end = j; diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index 4a1357c..236c38a 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -61,6 +61,9 @@ generated message: 25 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 40 01 fa 44 01 af original message: 25 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 40 01 fa 44 01 af IMSI: 123456789012345 + generated message: 2c 01 08 21 43 65 87 09 21 43 f5 46 01 02 + original message: 2c 01 08 21 43 65 87 09 21 43 f5 46 01 02 + IMSI: 123456789012345 message 0: tested 11 truncations, 11 parse failures message 1: tested 14 truncations, 13 parse failures message 2: tested 83 truncations, 81 parse failures @@ -82,6 +85,7 @@ message 18: tested 44 truncations, 39 parse failures message 19: tested 20 truncations, 18 parse failures message 20: tested 26 truncations, 22 parse failures + message 21: tested 14 truncations, 13 parse failures DLGSUP Stopping DLGSUP logging message 0: tested 2816 modifications, 510 parse failures message 1: tested 3584 modifications, 770 parse failures @@ -104,3 +108,4 @@ message 18: tested 11264 modifications, 2307 parse failures message 19: tested 5120 modifications, 1031 parse failures message 20: tested 6656 modifications, 1546 parse failures + message 21: tested 3584 modifications, 771 parse failures diff --git a/tests/gsup/gsup_test.ok b/tests/gsup/gsup_test.ok index 7a9455d..36e35c8 100644 --- a/tests/gsup/gsup_test.ok +++ b/tests/gsup/gsup_test.ok @@ -41,4 +41,6 @@ MO-/MT-ForwardSM Response OK Testing MO-/MT-ForwardSM Error MO-/MT-ForwardSM Error OK + Testing ReadyForSM (MSC -> SMSC) Indication + ReadyForSM (MSC -> SMSC) Indication OK Done. -- To view, visit https://gerrit.osmocom.org/11751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Gerrit-Change-Number: 11751 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:44:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 16:44:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_CTRL_Adapter: Let the OS decide over the local port number In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12348 ) Change subject: Osmocom_CTRL_Adapter: Let the OS decide over the local port number ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6648f8f4c1e065c174868c35eb64ee034ace3ce Gerrit-Change-Number: 12348 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 18 Dec 2018 16:44:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:44:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 16:44:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_CTRL_Adapter: Let the OS decide over the local port number In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12348 ) Change subject: Osmocom_CTRL_Adapter: Let the OS decide over the local port number ...................................................................... Osmocom_CTRL_Adapter: Let the OS decide over the local port number At the moment the function f_ipa_ctrl_start() is starting the IPA emulation client with parameter -1 for local port. This is internally translated to port number 9999, which is a fixed number. This makes it impossible to have two control interfaces at the same time. Lets use 0 as local port, so that the OS is selecting a free port number automatically. Change-Id: Ie6648f8f4c1e065c174868c35eb64ee034ace3ce Related: OS#3645 --- M library/Osmocom_CTRL_Adapter.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/Osmocom_CTRL_Adapter.ttcn b/library/Osmocom_CTRL_Adapter.ttcn index a98ac29..f1002bd 100644 --- a/library/Osmocom_CTRL_Adapter.ttcn +++ b/library/Osmocom_CTRL_Adapter.ttcn @@ -29,7 +29,7 @@ map(vc_CTRL_IPA:IPA_PORT, system:IPA_CODEC_PT); connect(vc_CTRL_IPA:IPA_CTRL_PORT, self:IPA_CTRL); - vc_CTRL_IPA.start(IPA_Emulation.main_client(bsc_host, bsc_port, "", -1, + vc_CTRL_IPA.start(IPA_Emulation.main_client(bsc_host, bsc_port, "", 0, c_IPA_default_ccm_pars, false)); /* wait for IPA CTRL link to connect and send UP */ -- To view, visit https://gerrit.osmocom.org/12348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie6648f8f4c1e065c174868c35eb64ee034ace3ce Gerrit-Change-Number: 12348 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:44:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 16:44:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 12 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 18 Dec 2018 16:44:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:44:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 16:44:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: make VTY interface available In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11701 ) Change subject: BSC_ConnectionHandler: make VTY interface available ...................................................................... Patch Set 11: Code-Review+1 I like this change, but the MSC's VTY interface and the BSC Connection Handler are unrelated to each other in general, right? -- To view, visit https://gerrit.osmocom.org/11701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Gerrit-Change-Number: 11701 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 16:44:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:44:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 16:44:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... BSC_ConnectionHandler: introduce ctrl interface There are some upcomming tests which require to access the control interface of the MSC while the actual test is running. Future test cases (e.g. Paging, see also Change Id: a6a1a6bd6da1bf46d6d703be495795d3610ca431) will use this. Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Related: OS#3615 Related: OS#3187 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 18 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index f005e02..e97b97d 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -31,8 +31,13 @@ import from SMPP_Emulation all; +import from IPA_Emulation all; +import from Osmocom_CTRL_Functions all; +import from Osmocom_CTRL_Types all; +import from Osmocom_CTRL_Adapter all; + /* this component represents a single subscriber connection */ -type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr { +type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT { var BSC_ConnHdlrPars g_pars; timer g_Tguard := 60.0; } @@ -57,7 +62,10 @@ BSSMAP_IE_ClassmarkInformationType3 cm3 optional, AuthVector vec optional, BSC_ConnHdlrNetworkPars net, - boolean send_early_cm + boolean send_early_cm, + charstring ipa_ctrl_ip, + integer ipa_ctrl_port, + boolean ipa_ctrl_enable }; /* get a one-octet bitmaks of supported algorithms based on Classmark information */ @@ -122,6 +130,10 @@ activate(as_Tguard()); /* Route all SMPP messages for our MSISDN to us */ f_create_smpp_expect(hex2str(pars.msisdn)); + + if (g_pars.ipa_ctrl_enable == true) { + f_ipa_ctrl_start(g_pars.ipa_ctrl_ip, g_pars.ipa_ctrl_port); + } } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index adaeea3..1b37329 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -454,7 +454,10 @@ cm3 := omit, vec := omit, net := net_pars, - send_early_cm := true + send_early_cm := true, + ipa_ctrl_ip := mp_msc_ip, + ipa_ctrl_port := mp_msc_ctrl_port, + ipa_ctrl_enable := true }; return pars; } -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 12 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:44:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 16:44:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: make VTY interface available In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11701 ) Change subject: BSC_ConnectionHandler: make VTY interface available ...................................................................... BSC_ConnectionHandler: make VTY interface available The BSC_ConnectionHandler currently has no access to the VTY interface. Lets make it available so that upcoming tests can use the VTY interface to trigger actions (e.g. Paging, see also Change Id: 6a1a6bd6da1bf46d6d703be495795d3610ca431) Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Related: OS#3615 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index e97b97d..1b31f75 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -36,10 +36,14 @@ import from Osmocom_CTRL_Types all; import from Osmocom_CTRL_Adapter all; +import from TELNETasp_PortType all; +import from Osmocom_VTY_Functions all; + /* this component represents a single subscriber connection */ type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT { var BSC_ConnHdlrPars g_pars; timer g_Tguard := 60.0; + port TELNETasp_PT MSCVTY; } type record BSC_ConnHdlrNetworkPars { @@ -134,6 +138,10 @@ if (g_pars.ipa_ctrl_enable == true) { f_ipa_ctrl_start(g_pars.ipa_ctrl_ip, g_pars.ipa_ctrl_port); } + + map(self:MSCVTY, system:MSCVTY); + f_vty_set_prompts(MSCVTY); + f_vty_transceive(MSCVTY, "enable"); } -- To view, visit https://gerrit.osmocom.org/11701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Gerrit-Change-Number: 11701 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:49:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 16:49:27 +0000 Subject: Change in osmo-msc[master]: MNCC: use log wrapper for call processing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12329 ) Change subject: MNCC: use log wrapper for call processing ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12329/3/src/libmsc/mncc_builtin.c File src/libmsc/mncc_builtin.c: https://gerrit.osmocom.org/#/c/12329/3/src/libmsc/mncc_builtin.c at 38 PS3, Line 38: "\n" Can you show me any examples in existing osmocom code where a log/debug helper macro prints the \n, rather than the caller/user of that macro? I don't think so, but feel free to prove me wrong. Intorducing this kind of inconsistency across programs/macros makes work harder for developers for no good reason. -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 16:49:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:50:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 16:50:51 +0000 Subject: Change in osmocom-bb[master]: host/layer23: don't init SAP interface by default Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12350 Change subject: host/layer23: don't init SAP interface by default ...................................................................... host/layer23: don't init SAP interface by default Almost all layer23 applications, excluding mobile, have nothing to do with SAP interface. Moreover, the current implementation does initialize SAP connection automatically, as soon as the first message is sent. Change-Id: I62cc69c06fa15468a55bb0a9d408267d0745174c --- M src/host/layer23/src/common/main.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/50/12350/1 diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 2920cd9..8abd3f7 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -258,10 +258,6 @@ exit(1); } - rc = sap_open(ms, sap_socket_path); - if (rc < 0) - fprintf(stderr, "Failed during sap_open(), no SIM reader\n"); - ms->lapdm_channel.lapdm_dcch.l1_ctx = ms; ms->lapdm_channel.lapdm_dcch.l3_ctx = ms; ms->lapdm_channel.lapdm_acch.l1_ctx = ms; -- To view, visit https://gerrit.osmocom.org/12350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I62cc69c06fa15468a55bb0a9d408267d0745174c Gerrit-Change-Number: 12350 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:50:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 16:50:51 +0000 Subject: Change in osmocom-bb[master]: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12351 Change subject: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() ...................................................................... host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() Change-Id: I3a2908bf11300ec681beddb5a54f9a62ca5430ae --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/51/12351/1 diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 936beb3..a32c3aa 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -177,7 +177,7 @@ get_value_string(sap_result_names, param->value[0])); } - if(param->value[0] > sizeof(sap_result_names)/sizeof(struct value_string)){ + if(param->value[0] > ARRAY_SIZE(sap_result_names)){ return -1; } -- To view, visit https://gerrit.osmocom.org/12351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3a2908bf11300ec681beddb5a54f9a62ca5430ae Gerrit-Change-Number: 12351 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:58:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 16:58:01 +0000 Subject: Change in osmocom-bb[master]: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12351 ) Change subject: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12351/1/src/host/layer23/src/common/sap_interface.c File src/host/layer23/src/common/sap_interface.c: https://gerrit.osmocom.org/#/c/12351/1/src/host/layer23/src/common/sap_interface.c at 180 PS1, Line 180: if(param->value[0] > ARRAY_SIZE(sap_result_names)){ Next time take the chance to clean the formatting of the line too. -- To view, visit https://gerrit.osmocom.org/12351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a2908bf11300ec681beddb5a54f9a62ca5430ae Gerrit-Change-Number: 12351 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 16:58:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 16:59:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 16:59:24 +0000 Subject: Change in osmocom-bb[master]: host/layer23: don't init SAP interface by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12350 ) Change subject: host/layer23: don't init SAP interface by default ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62cc69c06fa15468a55bb0a9d408267d0745174c Gerrit-Change-Number: 12350 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 16:59:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:07:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 17:07:51 +0000 Subject: Change in osmocom-bb[master]: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12351 ) Change subject: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12351/1/src/host/layer23/src/common/sap_interface.c File src/host/layer23/src/common/sap_interface.c: https://gerrit.osmocom.org/#/c/12351/1/src/host/layer23/src/common/sap_interface.c at 180 PS1, Line 180: if(param->value[0] > ARRAY_SIZE(sap_result_names)){ > Next time take the chance to clean the formatting of the line too. Actually, the whole file needs such reformatting ;) -- To view, visit https://gerrit.osmocom.org/12351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a2908bf11300ec681beddb5a54f9a62ca5430ae Gerrit-Change-Number: 12351 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 17:07:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:10:23 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:10:23 +0000 Subject: Change in osmo-msc[master]: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12349 to look at the new patch set (#2). Change subject: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE ...................................................................... improve handling of BSC-chosen algo in CIPHER MODE COMPLETE The BSC may choose to omit the chosenEntryptionAlgorithm IE in the CIPHER MODE COMPLETE command. When this happens, we used to default to A5/1 and disregarded the list of ciphers which we requested in the CIPHER MODE CMD. Fall back to the best cipher instead of hard-coding a fallback to A5/1. If the BSC does specify an algorithm, ensure that the chosen value falls within the range allowed by GSM 04.08, and ensure that the chosen value matches one of the values we sent in CIPHER MODE CMD. Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81 Related: OS#2872 --- M include/osmocom/msc/gsm_04_08.h M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c 3 files changed, 53 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/49/12349/2 -- To view, visit https://gerrit.osmocom.org/12349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81 Gerrit-Change-Number: 12349 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:12:50 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 17:12:50 +0000 Subject: Change in osmo-msc[master]: Use proper type for tch_rtp_connect() parameter In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12330 ) Change subject: Use proper type for tch_rtp_connect() parameter ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e2efcd2e25d6ec2ff35a4b8cfcda02abe97fa59 Gerrit-Change-Number: 12330 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 17:12:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:12:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 17:12:56 +0000 Subject: Change in osmo-msc[master]: Use proper type for tch_rtp_connect() parameter In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12330 ) Change subject: Use proper type for tch_rtp_connect() parameter ...................................................................... Use proper type for tch_rtp_connect() parameter Change-Id: I6e2efcd2e25d6ec2ff35a4b8cfcda02abe97fa59 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 15c6d9d..5500f6f 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1761,10 +1761,9 @@ return 0; } -static int tch_rtp_connect(struct gsm_network *net, void *arg) +static int tch_rtp_connect(struct gsm_network *net, struct gsm_mncc_rtp *rtp) { struct gsm_trans *trans; - struct gsm_mncc_rtp *rtp = arg; struct in_addr addr; /* FIXME: in *rtp we should get the codec information of the remote -- To view, visit https://gerrit.osmocom.org/12330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6e2efcd2e25d6ec2ff35a4b8cfcda02abe97fa59 Gerrit-Change-Number: 12330 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:17:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:17:19 +0000 Subject: Change in osmo-msc[master]: VLR: drop unused struct members In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12335 ) Change subject: VLR: drop unused struct members ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 Gerrit-Change-Number: 12335 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:17:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:18:33 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:18:33 +0000 Subject: Change in osmocom-bb[master]: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12351 ) Change subject: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a2908bf11300ec681beddb5a54f9a62ca5430ae Gerrit-Change-Number: 12351 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 17:18:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:22:16 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:22:16 +0000 Subject: Change in osmocom-bb[master]: host/layer23: don't init SAP interface by default In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12350 ) Change subject: host/layer23: don't init SAP interface by default ...................................................................... Patch Set 1: Code-Review+1 There is code which calls sap_open() in mobile/app_mobile.c as well, and it's inside #if 0 ; should that dead code also be removed? -- To view, visit https://gerrit.osmocom.org/12350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62cc69c06fa15468a55bb0a9d408267d0745174c Gerrit-Change-Number: 12350 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:22:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:27:31 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:27:31 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Prepare code for gpsd < 2.96 support In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12339 ) Change subject: sysmobts_mgr: Prepare code for gpsd < 2.96 support ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f Gerrit-Change-Number: 12339 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:27:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:29:46 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:29:46 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Add support for gpsd < 2.96 In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12340 ) Change subject: sysmobts_mgr: Add support for gpsd < 2.96 ...................................................................... Patch Set 4: Code-Review+1 Silly of them to break the API without backwards compat... -- To view, visit https://gerrit.osmocom.org/12340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b Gerrit-Change-Number: 12340 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:29:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:31:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:31:27 +0000 Subject: Change in osmo-msc[master]: msc_vty: display subscriber flags In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12344 ) Change subject: msc_vty: display subscriber flags ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12344/2/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12344/2/src/libmsc/msc_vty.c at 659 PS2, Line 659: vty_out(vty, " Received cancel locataion: %s%s", typo: "location" -- To view, visit https://gerrit.osmocom.org/12344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I59a9145a4daad50d68de3fd5c3291f027256917f Gerrit-Change-Number: 12344 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:31:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:31:47 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:31:47 +0000 Subject: Change in osmo-msc[master]: msc_vty: display subscriber flags In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12344 ) Change subject: msc_vty: display subscriber flags ...................................................................... Patch Set 2: -Code-Review -- To view, visit https://gerrit.osmocom.org/12344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I59a9145a4daad50d68de3fd5c3291f027256917f Gerrit-Change-Number: 12344 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:31:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:33:47 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:33:47 +0000 Subject: Change in osmo-msc[master]: msc_vty: display current RAN type In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12345 ) Change subject: msc_vty: display current RAN type ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I000cafd5e41b9951d51b6bd6672ee68a224b8212 Gerrit-Change-Number: 12345 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:33:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:33:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 17:33:50 +0000 Subject: Change in osmocom-bb[master]: host/layer23: don't init SAP interface by default In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12350 ) Change subject: host/layer23: don't init SAP interface by default ...................................................................... Patch Set 1: > There is code which calls sap_open() in mobile/app_mobile.c as > well, and it's inside #if 0 ; should that dead code also be > removed? WOW, yes, definitely! But, in a separate change ;) -- To view, visit https://gerrit.osmocom.org/12350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62cc69c06fa15468a55bb0a9d408267d0745174c Gerrit-Change-Number: 12350 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 17:33:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:35:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:35:39 +0000 Subject: Change in osmo-msc[master]: msc_vty: also show IMEI and IMEISV In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12343 ) Change subject: msc_vty: also show IMEI and IMEISV ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12343/2/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12343/2/src/libmsc/msc_vty.c at 642 PS2, Line 642: if (strlen(vsub->imei)) > Simply check like this: [?] Yeah that would be a better idiom but not critical from my point of view. -- To view, visit https://gerrit.osmocom.org/12343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedd75dbb9850388ec1fedb984ed0b8bf4c62e780 Gerrit-Change-Number: 12343 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:35:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:38:35 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 17:38:35 +0000 Subject: Change in osmo-sgsn[master]: Store GSN address in libosmocore struct Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12352 Change subject: Store GSN address in libosmocore struct ...................................................................... Store GSN address in libosmocore struct That's automated code change made using following program: //spatch --in-place --sp-file dup.spatch -I include --dir ./ --all-includes @@ @@ struct - gsn_addr + osmo_gsn_address @@ struct osmo_gsn_address a; @@ ( a. - len + length | a. - buf + addr ) Note that --all-includes is necessary because affected functions are defined and implemented in files with different subdirectory names under include and src correspondingly. Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a --- M include/osmocom/sgsn/gtphub.h M src/gprs/gtphub.c M src/gprs/gtphub_ares.c M tests/gtphub/gtphub_test.c 4 files changed, 61 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/52/12352/1 diff --git a/include/osmocom/sgsn/gtphub.h b/include/osmocom/sgsn/gtphub.h index 8fd9f38..7afe83c 100644 --- a/include/osmocom/sgsn/gtphub.h +++ b/include/osmocom/sgsn/gtphub.h @@ -163,22 +163,25 @@ uint8_t buf[16]; }; -void gsn_addr_copy(struct gsn_addr *gsna, const struct gsn_addr *src); -int gsn_addr_from_str(struct gsn_addr *gsna, const char *numeric_addr_str); +void gsn_addr_copy(struct osmo_gsn_address *gsna, + const struct osmo_gsn_address *src); +int gsn_addr_from_str(struct osmo_gsn_address *gsna, + const char *numeric_addr_str); /* Return gsna in numeric string form, in a static buffer. */ -const char *gsn_addr_to_str(const struct gsn_addr *gsna); +const char *gsn_addr_to_str(const struct osmo_gsn_address *gsna); /* note: strbuf_len doesn't need to be larger than INET6_ADDRSTRLEN + 1. */ -const char *gsn_addr_to_strb(const struct gsn_addr *gsna, +const char *gsn_addr_to_strb(const struct osmo_gsn_address *gsna, char *strbuf, int strbuf_len); /* Return 1 on match, zero otherwise. */ -int gsn_addr_same(const struct gsn_addr *a, const struct gsn_addr *b); +int gsn_addr_same(const struct osmo_gsn_address *a, + const struct osmo_gsn_address *b); /* Decode sa to gsna. Return 0 on success. If port is non-NULL, the port number * from sa is also returned. */ -int gsn_addr_from_sockaddr(struct gsn_addr *gsna, uint16_t *port, +int gsn_addr_from_sockaddr(struct osmo_gsn_address *gsna, uint16_t *port, const struct osmo_sockaddr *sa); /* expiry */ @@ -379,7 +382,7 @@ struct llist_head entry; struct gtphub_peer *peer; - struct gsn_addr addr; + struct osmo_gsn_address addr; struct llist_head ports; }; @@ -411,7 +414,7 @@ }; struct gtphub_bind { - struct gsn_addr local_addr; + struct osmo_gsn_address local_addr; uint16_t local_port; struct osmo_fd ofd; @@ -506,14 +509,14 @@ struct gtphub_peer_port *gtphub_port_have(struct gtphub *hub, struct gtphub_bind *bind, - const struct gsn_addr *addr, + const struct osmo_gsn_address *addr, uint16_t port); struct gtphub_peer_port *gtphub_port_find_sa(const struct gtphub_bind *bind, const struct osmo_sockaddr *addr); void gtphub_resolved_ggsn(struct gtphub *hub, const char *apn_oi_str, - struct gsn_addr *resolved_addr, + struct osmo_gsn_address *resolved_addr, time_t now); const char *gtphub_port_str(struct gtphub_peer_port *port); diff --git a/src/gprs/gtphub.c b/src/gprs/gtphub.c index ca5857b..a17306e 100644 --- a/src/gprs/gtphub.c +++ b/src/gprs/gtphub.c @@ -161,12 +161,13 @@ } } -void gsn_addr_copy(struct gsn_addr *gsna, const struct gsn_addr *src) +void gsn_addr_copy(struct osmo_gsn_address *gsna, + const struct osmo_gsn_address *src) { *gsna = *src; } -int gsn_addr_from_sockaddr(struct gsn_addr *gsna, uint16_t *port, +int gsn_addr_from_sockaddr(struct osmo_gsn_address *gsna, uint16_t *port, const struct osmo_sockaddr *sa) { char addr_str[256]; @@ -185,23 +186,24 @@ return gsn_addr_from_str(gsna, addr_str); } -int gsn_addr_from_str(struct gsn_addr *gsna, const char *numeric_addr_str) +int gsn_addr_from_str(struct osmo_gsn_address *gsna, + const char *numeric_addr_str) { if ((!gsna) || (!numeric_addr_str)) return -1; int af = AF_INET; - gsna->len = 4; + gsna->length = 4; const char *pos = numeric_addr_str; for (; *pos; pos++) { if (*pos == ':') { af = AF_INET6; - gsna->len = 16; + gsna->length = 16; break; } } - int rc = inet_pton(af, numeric_addr_str, gsna->buf); + int rc = inet_pton(af, numeric_addr_str, gsna->addr); if (rc != 1) { LOG(LOGL_ERROR, "Cannot resolve numeric address: '%s'\n", numeric_addr_str); @@ -210,18 +212,18 @@ return 0; } -const char *gsn_addr_to_str(const struct gsn_addr *gsna) +const char *gsn_addr_to_str(const struct osmo_gsn_address *gsna) { static char buf[INET6_ADDRSTRLEN + 1]; return gsn_addr_to_strb(gsna, buf, sizeof(buf)); } -const char *gsn_addr_to_strb(const struct gsn_addr *gsna, +const char *gsn_addr_to_strb(const struct osmo_gsn_address *gsna, char *strbuf, int strbuf_len) { int af; - switch (gsna->len) { + switch (gsna->length) { case 4: af = AF_INET; break; @@ -232,29 +234,31 @@ return NULL; } - const char *r = inet_ntop(af, gsna->buf, strbuf, strbuf_len); + const char *r = inet_ntop(af, gsna->addr, strbuf, strbuf_len); if (!r) { LOG(LOGL_ERROR, "Cannot convert gsn_addr to string:" " %s: len=%d, buf=%s\n", strerror(errno), - (int)gsna->len, - osmo_hexdump(gsna->buf, sizeof(gsna->buf))); + (int)gsna->length, + osmo_hexdump(gsna->addr, sizeof(gsna->addr))); } return r; } -int gsn_addr_same(const struct gsn_addr *a, const struct gsn_addr *b) +int gsn_addr_same(const struct osmo_gsn_address *a, + const struct osmo_gsn_address *b) { if (a == b) return 1; if ((!a) || (!b)) return 0; - if (a->len != b->len) + if (a->length != b->length) return 0; - return (memcmp(a->buf, b->buf, a->len) == 0)? 1 : 0; + return (memcmp(a->addr, b->addr, a->length) == 0)? 1 : 0; } -static int gsn_addr_get(struct gsn_addr *gsna, const struct gtp_packet_desc *p, +static int gsn_addr_get(struct osmo_gsn_address *gsna, + const struct gtp_packet_desc *p, int idx) { if (p->rc != GTP_RC_PDU_C) @@ -263,14 +267,15 @@ unsigned int len; /* gtpie.h fails to declare gtpie_gettlv()'s first arg as const. */ if (gtpie_gettlv((union gtpie_member**)p->ie, GTPIE_GSN_ADDR, idx, - &len, gsna->buf, sizeof(gsna->buf)) + &len, gsna->addr, sizeof(gsna->addr)) != 0) return -1; - gsna->len = len; + gsna->length = len; return 0; } -static int gsn_addr_put(const struct gsn_addr *gsna, struct gtp_packet_desc *p, +static int gsn_addr_put(const struct osmo_gsn_address *gsna, + struct gtp_packet_desc *p, int idx) { if (p->rc != GTP_RC_PDU_C) @@ -284,14 +289,14 @@ struct gtpie_tlv *ie = &p->ie[ie_idx]->tlv; int ie_l = ntoh16(ie->l); - if (ie_l != gsna->len) { + if (ie_l != gsna->length) { LOG(LOGL_ERROR, "Not implemented:" " replace an IE address of different size:" - " replace %d with %d\n", (int)ie_l, (int)gsna->len); + " replace %d with %d\n", (int)ie_l, (int)gsna->length); return -1; } - memcpy(ie->v, gsna->buf, (int)ie_l); + memcpy(ie->v, gsna->addr, (int)ie_l); return 0; } @@ -574,7 +579,7 @@ } for (i = 0; i < 2; i++) { - struct gsn_addr addr; + struct osmo_gsn_address addr; if (gsn_addr_get(&addr, res, i) == 0) LOG(LOGL_DEBUG, "| addr %s\n", gsn_addr_to_str(&addr)); } @@ -1535,7 +1540,7 @@ for_each_plane(plane_idx) { int rc; - struct gsn_addr use_addr; + struct osmo_gsn_address use_addr; uint16_t use_port; uint32_t tei_from_ie; int ie_idx; @@ -1552,7 +1557,7 @@ LOG(LOGL_DEBUG, "Read %s GSN addr %s (%d)\n", gtphub_plane_idx_names[plane_idx], gsn_addr_to_str(&use_addr), - use_addr.len); + use_addr.length); ie_idx = gtpie_getie(p->ie, ie_type[plane_idx], 0); if (ie_idx < 0) { @@ -2069,7 +2074,7 @@ return 0; } -static int gsn_addr_to_sockaddr(struct gsn_addr *src, +static int gsn_addr_to_sockaddr(struct osmo_gsn_address *src, uint16_t port, struct osmo_sockaddr *dst) { @@ -2220,7 +2225,7 @@ return -1; } - struct gsn_addr from_gsna; + struct osmo_gsn_address from_gsna; uint16_t from_port; if (gsn_addr_from_sockaddr(&from_gsna, &from_port, from_addr) != 0) return -1; @@ -2354,7 +2359,7 @@ } void gtphub_resolved_ggsn(struct gtphub *hub, const char *apn_oi_str, - struct gsn_addr *resolved_addr, + struct osmo_gsn_address *resolved_addr, time_t now) { struct gtphub_peer_port *pp; @@ -2524,7 +2529,7 @@ if (!addr->addr_str) return 0; - struct gsn_addr gsna; + struct osmo_gsn_address gsna; if (gsn_addr_from_str(&gsna, addr->addr_str) != 0) return -1; @@ -2600,7 +2605,7 @@ } static struct gtphub_peer_addr *gtphub_peer_find_addr(const struct gtphub_peer *peer, - const struct gsn_addr *addr) + const struct osmo_gsn_address *addr) { struct gtphub_peer_addr *a; llist_for_each_entry(a, &peer->addresses, entry) { @@ -2623,7 +2628,7 @@ } static struct gtphub_peer_addr *gtphub_addr_find(const struct gtphub_bind *bind, - const struct gsn_addr *addr) + const struct osmo_gsn_address *addr) { struct gtphub_peer *peer; llist_for_each_entry(peer, &bind->peers, entry) { @@ -2635,7 +2640,7 @@ } static struct gtphub_peer_port *gtphub_port_find(const struct gtphub_bind *bind, - const struct gsn_addr *addr, + const struct osmo_gsn_address *addr, uint16_t port) { struct gtphub_peer_addr *a = gtphub_addr_find(bind, addr); @@ -2647,7 +2652,7 @@ struct gtphub_peer_port *gtphub_port_find_sa(const struct gtphub_bind *bind, const struct osmo_sockaddr *addr) { - struct gsn_addr gsna; + struct osmo_gsn_address gsna; uint16_t port; if (gsn_addr_from_sockaddr(&gsna, &port, addr) != 0) return NULL; @@ -2677,7 +2682,7 @@ } static struct gtphub_peer_addr *gtphub_peer_add_addr(struct gtphub_peer *peer, - const struct gsn_addr *addr) + const struct osmo_gsn_address *addr) { struct gtphub_peer_addr *a; a = talloc_zero(osmo_gtphub_ctx, struct gtphub_peer_addr); @@ -2692,7 +2697,7 @@ static struct gtphub_peer_addr *gtphub_addr_have(struct gtphub *hub, struct gtphub_bind *bind, - const struct gsn_addr *addr) + const struct osmo_gsn_address *addr) { struct gtphub_peer_addr *a = gtphub_addr_find(bind, addr); if (a) @@ -2747,7 +2752,7 @@ struct gtphub_peer_port *gtphub_port_have(struct gtphub *hub, struct gtphub_bind *bind, - const struct gsn_addr *addr, + const struct osmo_gsn_address *addr, uint16_t port) { struct gtphub_peer_addr *a = gtphub_addr_have(hub, bind, addr); @@ -2767,7 +2772,7 @@ struct gtphub_peer_addr *pa; struct gtphub_peer_port *pp; - struct gsn_addr gsna; + struct osmo_gsn_address gsna; uint16_t port; int rc = gsn_addr_from_sockaddr(&gsna, &port, addr); if (rc < 0) diff --git a/src/gprs/gtphub_ares.c b/src/gprs/gtphub_ares.c index 87dc860..be26f55 100644 --- a/src/gprs/gtphub_ares.c +++ b/src/gprs/gtphub_ares.c @@ -85,10 +85,10 @@ goto remove_from_queue; } - struct gsn_addr resolved_addr; - if (hostent->h_length > sizeof(resolved_addr.buf)) { + struct osmo_gsn_address resolved_addr; + if (hostent->h_length > sizeof(resolved_addr.addr)) { LOGP(DGTPHUB, LOGL_ERROR, "Addr size too large: %d > %d\n", - (int)hostent->h_length, (int)sizeof(resolved_addr.buf)); + (int)hostent->h_length, (int)sizeof(resolved_addr.addr)); goto remove_from_queue; } @@ -99,8 +99,8 @@ goto remove_from_queue; } - memcpy(resolved_addr.buf, addr0, hostent->h_length); - resolved_addr.len = hostent->h_length; + memcpy(resolved_addr.addr, addr0, hostent->h_length); + resolved_addr.length = hostent->h_length; LOGP(DGTPHUB, LOGL_NOTICE, "resolved addr %s\n", osmo_hexdump((unsigned char*)&resolved_addr, diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c index 2e48bb1..214b7d4 100644 --- a/tests/gtphub/gtphub_test.c +++ b/tests/gtphub/gtphub_test.c @@ -424,7 +424,7 @@ const char *imsi_str, const char *apn_ni_str) { - struct gsn_addr resolved_gsna; + struct osmo_gsn_address resolved_gsna; uint16_t resolved_port; OSMO_ASSERT(gsn_addr_from_sockaddr(&resolved_gsna, &resolved_port, -- To view, visit https://gerrit.osmocom.org/12352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a Gerrit-Change-Number: 12352 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:40:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 17:40:15 +0000 Subject: Change in osmo-sgsn[master]: gtphub: remove code duplication In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12230 ) Change subject: gtphub: remove code duplication ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I75645fd5cd1016bd9a08096e3ee4101b2560cefd Gerrit-Change-Number: 12230 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:41:28 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:41:28 +0000 Subject: Change in libosmocore[master]: add to osmo_sock_get_name*() API In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12268 ) Change subject: add to osmo_sock_get_name*() API ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12268/2/src/socket.c File src/socket.c: https://gerrit.osmocom.org/#/c/12268/2/src/socket.c at 825 PS2, Line 825: /* "r=1.2.3.4:123<->l=5.6.7.8:987" */ Could we keep this comment in osmo_sock_get_name() also? Without that command the 1 + 5 + 3 + 2 is impossible to understand. -- To view, visit https://gerrit.osmocom.org/12268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 Gerrit-Change-Number: 12268 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:41:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:42:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 17:42:34 +0000 Subject: Change in osmo-msc[master]: msc_vty: also show IMEI and IMEISV In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12343 ) Change subject: msc_vty: also show IMEI and IMEISV ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12343/2/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12343/2/src/libmsc/msc_vty.c at 642 PS2, Line 642: if (strlen(vsub->imei)) > Yeah that would be a better idiom but not critical from my point of view. Not critical but better for performance reasons, and it only requires one line change, so I think it's fair I ask for it :) -- To view, visit https://gerrit.osmocom.org/12343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedd75dbb9850388ec1fedb984ed0b8bf4c62e780 Gerrit-Change-Number: 12343 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:42:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:43:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 17:43:26 +0000 Subject: Change in libosmocore[master]: add to osmo_sock_get_name*() API In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12268 ) Change subject: add to osmo_sock_get_name*() API ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 Gerrit-Change-Number: 12268 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:43:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:43:38 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:43:38 +0000 Subject: Change in osmo-bsc[master]: LCLS: update parameter representation In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11820 ) Change subject: LCLS: update parameter representation ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 17:43:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:46:34 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:46:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: adjust gsup log level to error In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12298 ) Change subject: MSC: adjust gsup log level to error ...................................................................... Patch Set 1: Code-Review+1 > Patch Set 1: > > I am not sure if this is a very good idea. Shouldn't the integration tests log as much as possible to allow investigation afterwards. What if there is a bug hiding in the gsub code? > > Maybe we should try to find a more reasonable logging level for the related GSUP logging in osmo-msc? I agree that the message is annoying, I also see it a lot: Tue Dec 18 18:45:47 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:47 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:48 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:48 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:49 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:49 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:50 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:50 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:51 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:51 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:52 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:52 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:53 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:53 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Tue Dec 18 18:45:54 2018 DLGSUP <001b> gsup_client.c:73 GSUP connecting to 127.0.0.1:4222 Tue Dec 18 18:45:54 2018 DLGSUP <001b> gsup_client.c:131 GSUP link to 127.0.0.1:4222 DOWN Simply changing the log level of this message in osmo-msc might be fine indeed. -- To view, visit https://gerrit.osmocom.org/12298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If79db99ceb7a9d4e2ec8d8b375aa628c4088c65c Gerrit-Change-Number: 12298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 18 Dec 2018 17:46:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:46:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:46:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: adjust gsup log level to error In-Reply-To: References: Message-ID: Stefan Sperling has removed a vote on this change. Change subject: MSC: adjust gsup log level to error ...................................................................... Removed Code-Review+1 by Stefan Sperling -- To view, visit https://gerrit.osmocom.org/12298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: If79db99ceb7a9d4e2ec8d8b375aa628c4088c65c Gerrit-Change-Number: 12298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:46:53 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 17:46:53 +0000 Subject: Change in osmo-sgsn[master]: Store GSN address in libosmocore struct In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12352 to look at the new patch set (#2). Change subject: Store GSN address in libosmocore struct ...................................................................... Store GSN address in libosmocore struct That's automated code change made using following program: //spatch --in-place --sp-file dup.spatch -I include --dir ./ --all-includes @@ @@ struct - gsn_addr + osmo_gsn_address @@ struct osmo_gsn_address a; @@ ( a. - len + length | a. - buf + addr ) @@ @@ - /* ... */ - struct gsn_addr {...}; Note that --all-includes is necessary because affected functions are defined and implemented in files with different subdirectory names under include and src correspondingly. Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a --- M include/osmocom/sgsn/gtphub.h M src/gprs/gtphub.c M src/gprs/gtphub_ares.c M tests/gtphub/gtphub_test.c 4 files changed, 61 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/52/12352/2 -- To view, visit https://gerrit.osmocom.org/12352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a Gerrit-Change-Number: 12352 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:48:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 17:48:44 +0000 Subject: Change in osmo-bsc[master]: LCLS: update parameter representation In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11820 ) Change subject: LCLS: update parameter representation ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 17:48:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:48:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 17:48:46 +0000 Subject: Change in osmo-bsc[master]: LCLS: update parameter representation In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11820 ) Change subject: LCLS: update parameter representation ...................................................................... LCLS: update parameter representation * use osmo_lcls struct from libosmocore * use enum values instead of magic numbers Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Related: OS#3659 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/osmo_bsc_lcls.c 3 files changed, 15 insertions(+), 21 deletions(-) Approvals: Max: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 738bad3..cf34c6f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -275,8 +275,8 @@ struct { uint8_t global_call_ref[15]; uint8_t global_call_ref_len; /* length of global_call_ref */ - uint8_t config; /* TS 48.008 3.2.2.116 */ - uint8_t control;/* TS 48.008 3.2.2.117 */ + enum gsm0808_lcls_config config; /* TS 48.008 3.2.2.116 */ + enum gsm0808_lcls_control control; /* TS 48.008 3.2.2.117 */ /* LCLS FSM */ struct osmo_fsm_inst *fi; /* pointer to "other" connection, if Call Leg Relocation was successful */ diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index fac0bc0..85e754f 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -883,9 +883,9 @@ return NULL; } - /* initialize to some magic values that indicate "IE not [yet] received" */ - conn->lcls.config = 0xff; - conn->lcls.control = 0xff; + /* indicate "IE not [yet] received" */ + conn->lcls.config = GSM0808_LCLS_CFG_NA; + conn->lcls.control = GSM0808_LCLS_CSC_NA; conn->lcls.fi = osmo_fsm_inst_alloc_child(&lcls_fsm, conn->fi, GSCON_EV_LCLS_FAIL); if (!conn->lcls.fi) { osmo_fsm_inst_term(conn->fi, OSMO_FSM_TERM_ERROR, NULL); diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index cdd6557..622611d 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -156,22 +156,16 @@ return 0; } - -struct lcls_cfg_csc { - enum gsm0808_lcls_config config; - enum gsm0808_lcls_control control; -}; - /* Update the connections LCLS configuration and return old/previous configuration. * \returns (staticallly allocated) old configuration; NULL if new config not supported */ -static struct lcls_cfg_csc *update_lcls_cfg_csc(struct gsm_subscriber_connection *conn, - struct lcls_cfg_csc *new_cfg_csc) +static struct osmo_lcls *update_lcls_cfg_csc(struct gsm_subscriber_connection *conn, + struct osmo_lcls *new_cfg_csc) { - static struct lcls_cfg_csc old_cfg_csc; + static struct osmo_lcls old_cfg_csc = { 0 }; old_cfg_csc.config = conn->lcls.config; old_cfg_csc.control = conn->lcls.control; - if (new_cfg_csc->config != 0xff) { + if (new_cfg_csc->config != GSM0808_LCLS_CFG_NA) { if (!lcls_is_supported_config(new_cfg_csc->config)) return NULL; if (conn->lcls.config != new_cfg_csc->config) { @@ -179,7 +173,7 @@ conn->lcls.config = new_cfg_csc->config; } } - if (new_cfg_csc->control != 0xff) { + if (new_cfg_csc->control != GSM0808_LCLS_CSC_NA) { if (conn->lcls.control != new_cfg_csc->control) { /* TODO: logging */ conn->lcls.control = new_cfg_csc->control; @@ -193,9 +187,9 @@ * unsupported, change into LCLS NOT SUPPORTED state and return -EINVAL. */ static int lcls_handle_cfg_update(struct gsm_subscriber_connection *conn, void *data) { - struct lcls_cfg_csc *new_cfg_csc, *old_cfg_csc; + struct osmo_lcls *new_cfg_csc, *old_cfg_csc; - new_cfg_csc = (struct lcls_cfg_csc *) data; + new_cfg_csc = (struct osmo_lcls *) data; old_cfg_csc = update_lcls_cfg_csc(conn, new_cfg_csc); if (!old_cfg_csc) { osmo_fsm_inst_state_chg(conn->lcls.fi, ST_REQ_LCLS_NOT_SUPP, 0, 0); @@ -208,9 +202,9 @@ void lcls_update_config(struct gsm_subscriber_connection *conn, const uint8_t *config, const uint8_t *control) { - struct lcls_cfg_csc new_cfg = { - .config = 0xff, - .control = 0xff, + struct osmo_lcls new_cfg = { + .config = GSM0808_LCLS_CFG_NA, + .control = GSM0808_LCLS_CSC_NA, }; /* nothing to update, skip it */ if (!config && !control) -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:49:54 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:49:54 +0000 Subject: Change in osmocom-bb[master]: host/layer23: don't init SAP interface by default In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12350 ) Change subject: host/layer23: don't init SAP interface by default ...................................................................... Patch Set 1: > Patch Set 1: > > > There is code which calls sap_open() in mobile/app_mobile.c as > > well, and it's inside #if 0 ; should that dead code also be > > removed? > > WOW, yes, definitely! But, in a separate change ;) Sure, a separate patch is appropriate. -- To view, visit https://gerrit.osmocom.org/12350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62cc69c06fa15468a55bb0a9d408267d0745174c Gerrit-Change-Number: 12350 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 17:49:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:54:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 17:54:40 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/3/src/gprs/sgsn_vty.c at 1195 PS3, Line 1195: if (!parsing_config_file) { > if (vty->type != VTY_FILE) Neat, didn't know about it. Aside of that, Just copy-pasting part of last Stefan reply as either commit message or comment next to vty type check should be enough to get this merged. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 17:54:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:56:02 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 17:56:02 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12243 to look at the new patch set (#4). Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... make gsup ipa name configurable in osmo-sgsn.cfg Add a 'ipa-name' VTY command which overrides the default IPA name used by the SGSN on the GSUP link towards the HLR. This is required for GSUP routing in multi-SGSN networks. The 'ipa-name' option can only be set via the configuration file because changing the IPA name at run-time conflicts with active GSUP connections and routes configured in the HLR. The osmo-sgsn program must be restarted if its IPA name needs to change. Related: OS#3356 Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_subscriber.c M src/gprs/sgsn_vty.c 3 files changed, 36 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/12243/4 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:57:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 17:57:25 +0000 Subject: Change in osmo-msc[master]: VLR: drop unused struct members In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12335 ) Change subject: VLR: drop unused struct members ...................................................................... Patch Set 3: Code-Review+2 Since there're 2 votes for it already, let's merge this and nuke entire thing in a separate commit if possible/necessary. -- To view, visit https://gerrit.osmocom.org/12335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 Gerrit-Change-Number: 12335 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 17:57:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:57:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 17:57:28 +0000 Subject: Change in osmo-msc[master]: VLR: drop unused struct members In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12335 ) Change subject: VLR: drop unused struct members ...................................................................... VLR: drop unused struct members Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 --- M include/osmocom/msc/vlr.h 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Max: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 68e0759..2f31063 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -171,9 +171,6 @@ /* PS (SGSN) specific parts */ struct { struct llist_head pdp_list; - uint8_t rac; - uint8_t sac; - struct gprs_mm_ctx *mmctx; } ps; /* CS (NITB/CSCN) specific parts */ struct { -- To view, visit https://gerrit.osmocom.org/12335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I322072653b41cf250aa2c1e346e00bae884feb84 Gerrit-Change-Number: 12335 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:58:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 17:58:06 +0000 Subject: Change in osmo-sgsn[master]: Store GSN address in libosmocore struct In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12352 ) Change subject: Store GSN address in libosmocore struct ...................................................................... Patch Set 2: Code-Review-1 (1 comment) I see no good reason for this change. You are breaking the ABI and basically not using the extra field "type" of the new struct. https://gerrit.osmocom.org/#/c/12352/2/include/osmocom/sgsn/gtphub.h File include/osmocom/sgsn/gtphub.h: https://gerrit.osmocom.org/#/c/12352/2/include/osmocom/sgsn/gtphub.h at 377 PS2, Line 377: struct osmo_gsn_address addr; You are breaking ABI here, length of struct is different. include/osmocom/gsm/gsm23003.h 59:struct osmo_gsn_address { 60- enum osmo_gsn_addr_type type; 61- uint8_t length; 62- uint8_t addr[16]; 63-}; -- To view, visit https://gerrit.osmocom.org/12352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a Gerrit-Change-Number: 12352 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 17:58:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 17:59:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 17:59:27 +0000 Subject: Change in osmo-bsc[master]: LCLS: update parameter representation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11820 ) Change subject: LCLS: update parameter representation ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11820/3/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/11820/3/src/osmo-bsc/osmo_bsc_lcls.c at 163 PS3, Line 163: static struct osmo_lcls old_cfg_csc = { 0 }; > I still have the filling this variable being static (aka global) is most probably wrong, since I gue [?] @Max, did you have a look at my comment here? I saw no answer. -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 17:59:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 18:00:07 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 18 Dec 2018 18:00:07 +0000 Subject: Change in osmo-msc[master]: use vty->type instead of local variable Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12353 Change subject: use vty->type instead of local variable ...................................................................... use vty->type instead of local variable We can check if we're parsing the config file by checking whether vty->type equals VTY_FILE. This avoids the use of an extra local variable to track the parsing state. Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75 Fixes: 1051c4208834c22d344dd92d25addfd8e5d95993 Related: OS#3355 --- M include/osmocom/msc/vty.h M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c 3 files changed, 1 insertion(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/12353/1 diff --git a/include/osmocom/msc/vty.h b/include/osmocom/msc/vty.h index 60a36d7..6a55df7 100644 --- a/include/osmocom/msc/vty.h +++ b/include/osmocom/msc/vty.h @@ -31,6 +31,4 @@ struct gsm_network *gsmnet_from_vty(struct vty *vty); -extern bool msc_parsing_config_file; - #endif diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 87adc82..13790bb 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -466,7 +466,7 @@ "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. " "The default is 'MSC-00-00-00-00-00-00'.\n") { - if (!msc_parsing_config_file) { + if (vty->type != VTY_FILE) { vty_out(vty, "The IPA name cannot be changed at run-time; " "It can only be set in the configuraton file.%s", VTY_NEWLINE); return CMD_WARNING; diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 4dce2b8..6eecf46 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -515,8 +515,6 @@ extern void *tall_call_ctx; extern void *tall_trans_ctx; -bool msc_parsing_config_file = false; - int main(int argc, char **argv) { int rc; @@ -569,9 +567,7 @@ return -1; #endif - msc_parsing_config_file = true; rc = vty_read_config_file(msc_cmdline_config.config_file, NULL); - msc_parsing_config_file = false; if (rc < 0) { LOGP(DMSC, LOGL_FATAL, "Failed to parse the config file: '%s'\n", msc_cmdline_config.config_file); -- To view, visit https://gerrit.osmocom.org/12353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75 Gerrit-Change-Number: 12353 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 18:01:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 18:01:21 +0000 Subject: Change in osmo-msc[master]: vty: show subscriber: put() before printing the use count In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12266 ) Change subject: vty: show subscriber: put() before printing the use count ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id02b57b7ed299b010b9f8b9e809548eb1e6aa699 Gerrit-Change-Number: 12266 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Max Gerrit-Comment-Date: Tue, 18 Dec 2018 18:01:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 18:01:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 18 Dec 2018 18:01:26 +0000 Subject: Change in osmo-msc[master]: vty: show subscriber: put() before printing the use count In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12266 ) Change subject: vty: show subscriber: put() before printing the use count ...................................................................... vty: show subscriber: put() before printing the use count Do not show the VTY command's own use count during 'show subscriber '. When using 'show subscriber msisdn 2023', I was surprised to see a use count of 2 and suspected a use count leak. With 'show subscriber cache' however, the use count is 1. So I realized it is the vty command's own use count that makes it two, besides the lu_complete=true one. Change-Id: Id02b57b7ed299b010b9f8b9e809548eb1e6aa699 --- M src/libmsc/msc_vty.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 87adc82..4e71e26 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -832,10 +832,13 @@ return CMD_WARNING; } - subscr_dump_full_vty(vty, vsub); - + /* In the vty output to the user, exclude this local use count added by vlr_subscr_get() in get_vsub_by_argv(). + * This works, because: for get_vsub_by_argv() to succeed, there *must* have been at least one use count before + * this, and since this is not multi-threaded, this vlr_subscr_put() cannot possibly reach a count of 0. */ vlr_subscr_put(vsub); + subscr_dump_full_vty(vty, vsub); + return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/12266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id02b57b7ed299b010b9f8b9e809548eb1e6aa699 Gerrit-Change-Number: 12266 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 18:02:53 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 18:02:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: adjust gsup log level to error In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12298 ) Change subject: MSC: adjust gsup log level to error ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+1 > Simply changing the log level of this message in osmo-msc might be fine indeed. I'm kinda partial about it: the main reason we see lots of those in TTCN tests is that we don't really have HLR but some GSUP emulation code which is called when necessary. That's why the link appears to be flapping: each test causes it to go UP/DOWN at least once (maybe more), and the number of tests will only increase. In the normal case where you have actual HLR up and running you'd see this message once. Unless smth is wrong with HLR or link to it but in this case you'll want to see this message, not suppress it. -- To view, visit https://gerrit.osmocom.org/12298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If79db99ceb7a9d4e2ec8d8b375aa628c4088c65c Gerrit-Change-Number: 12298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 18 Dec 2018 18:02:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 18:11:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 18:11:11 +0000 Subject: Change in osmo-sgsn[master]: Store GSN address in libosmocore struct In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12352 ) Change subject: Store GSN address in libosmocore struct ...................................................................... Patch Set 2: > You are breaking the ABI That's not a library - what kind of ABI breakage are you talking about? > basically not using the extra field "type" of the new struct. That's a subject for follow-up patches: I don't want to mix automated code changes with manual ones. -- To view, visit https://gerrit.osmocom.org/12352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a Gerrit-Change-Number: 12352 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 18:11:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 18:15:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 18:15:04 +0000 Subject: Change in osmo-sgsn[master]: Store GSN address in libosmocore struct In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12352 ) Change subject: Store GSN address in libosmocore struct ...................................................................... Patch Set 2: > > You are breaking the ABI > > That's not a library - what kind of ABI breakage are you talking > about? > My bad, I somehow had the impression the code was in libosmocore. > > basically not using the extra field "type" of the new struct. > > That's a subject for follow-up patches: I don't want to mix > automated code changes with manual ones. Then please state so in the commit description. Until I see a user for the "type" field in a forthcoming patch, I'll keep the -1. -- To view, visit https://gerrit.osmocom.org/12352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a Gerrit-Change-Number: 12352 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 18:15:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 18:19:45 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 18:19:45 +0000 Subject: Change in osmo-sgsn[master]: Store GSN address in libosmocore struct In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12352 ) Change subject: Store GSN address in libosmocore struct ...................................................................... Patch Set 2: > Then please state so in the commit description. Until I see a user for the "type" field in a forthcoming patch, I'll keep the -1. That's orthogonal to this patch I think: regardless of the use of extra field in the struct there's no point in keeping effectively a local duplicate of a struct available in a shared library we're linked against anyway. -- To view, visit https://gerrit.osmocom.org/12352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a Gerrit-Change-Number: 12352 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 18:19:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 18:21:42 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 18:21:42 +0000 Subject: Change in osmo-msc[master]: use vty->type instead of local variable In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12353 ) Change subject: use vty->type instead of local variable ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75 Gerrit-Change-Number: 12353 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Tue, 18 Dec 2018 18:21:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 18:23:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 18:23:23 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 18 Dec 2018 18:23:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 18:24:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 18:24:44 +0000 Subject: Change in osmocom-bb[master]: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12351 ) Change subject: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a2908bf11300ec681beddb5a54f9a62ca5430ae Gerrit-Change-Number: 12351 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 18:24:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 18:26:52 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 18 Dec 2018 18:26:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12346 ) Change subject: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher ...................................................................... Patch Set 1: Code-Review+1 Did some tests fail because of this? -- To view, visit https://gerrit.osmocom.org/12346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706 Gerrit-Change-Number: 12346 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Tue, 18 Dec 2018 18:26:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 18:27:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 18:27:13 +0000 Subject: Change in osmo-sgsn[master]: Store GSN address in libosmocore struct In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12352 ) Change subject: Store GSN address in libosmocore struct ...................................................................... Patch Set 2: > That's orthogonal to this patch I think: regardless of the use of > extra field in the struct there's no point in keeping effectively a > local duplicate of a struct available in a shared library we're > linked against anyway. It's not a local duplicate struct, it's a struct with an extra field not being used, so I so far no see a good reason to include this patch. Specially because I think that extra field is really not needed since the type can be inferred from length (like we do in most places in struct in46addr in osmo-ggsn and libgtp). Send forthcoming patches using that field and I'll re-check then. -- To view, visit https://gerrit.osmocom.org/12352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a Gerrit-Change-Number: 12352 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 18 Dec 2018 18:27:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 20:25:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 18 Dec 2018 20:25:50 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Prepare code for gpsd < 2.96 support In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12339 ) Change subject: sysmobts_mgr: Prepare code for gpsd < 2.96 support ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f Gerrit-Change-Number: 12339 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 20:25:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 20:27:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 20:27:23 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Prepare code for gpsd < 2.96 support In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12339 ) Change subject: sysmobts_mgr: Prepare code for gpsd < 2.96 support ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f Gerrit-Change-Number: 12339 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 20:27:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 20:27:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 20:27:26 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Add support for gpsd < 2.96 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12340 ) Change subject: sysmobts_mgr: Add support for gpsd < 2.96 ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b Gerrit-Change-Number: 12340 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 18 Dec 2018 20:27:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 20:54:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 20:54:24 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Prepare code for gpsd < 2.96 support In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12339 ) Change subject: sysmobts_mgr: Prepare code for gpsd < 2.96 support ...................................................................... sysmobts_mgr: Prepare code for gpsd < 2.96 support API prior to that version allocates the pointer internally. Let's change current code to always use a pointer and in current supported code (gpsd >= 2.96) point it to a user-allocated struct. Follow-up patch will introduce necessary ifdefs to support older gpsd. Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f --- M src/osmo-bts-sysmo/misc/sysmobts_mgr.h M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c 2 files changed, 10 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h index 88f4e24..b62707c 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h @@ -96,7 +96,8 @@ /* gps structure to see if there is a fix */ int gps_open; struct osmo_fd gpsfd; - struct gps_data_t gpsdata; + struct gps_data_t *gpsdata; + struct gps_data_t gpsdata_buf; struct osmo_timer_list fix_timeout; /* Loop/Re-try control */ diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c index b0b5edd..c3e821e 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c @@ -86,14 +86,14 @@ osmo_timer_del(&mgr->calib.fix_timeout); osmo_fd_unregister(&mgr->calib.gpsfd); - gps_close(&mgr->calib.gpsdata); - memset(&mgr->calib.gpsdata, 0, sizeof(mgr->calib.gpsdata)); + gps_close(mgr->calib.gpsdata); + memset(mgr->calib.gpsdata, 0, sizeof(*(mgr->calib.gpsdata))); mgr->calib.gps_open = 0; } static void mgr_gps_checkfix(struct sysmobts_mgr_instance *mgr) { - struct gps_data_t *data = &mgr->calib.gpsdata; + struct gps_data_t *data = mgr->calib.gpsdata; /* No 2D fix yet */ if (data->fix.mode < MODE_2D) { @@ -119,7 +119,7 @@ { int rc; struct sysmobts_mgr_instance *mgr = fd->data; - rc = compat_gps_read(&mgr->calib.gpsdata); + rc = compat_gps_read(mgr->calib.gpsdata); if (rc == -1) { LOGP(DCALIB, LOGL_ERROR, "gpsd vanished during read.\n"); calib_state_reset(mgr, CALIB_FAIL_GPS); @@ -143,7 +143,8 @@ { int rc; - rc = gps_open("localhost", DEFAULT_GPSD_PORT, &mgr->calib.gpsdata); + mgr->calib.gpsdata = &mgr->calib.gpsdata_buf; + rc = gps_open("localhost", DEFAULT_GPSD_PORT, mgr->calib.gpsdata); if (rc != 0) { LOGP(DCALIB, LOGL_ERROR, "Failed to connect to GPS %d\n", rc); calib_state_reset(mgr, CALIB_FAIL_GPS); @@ -151,12 +152,12 @@ } mgr->calib.gps_open = 1; - gps_stream(&mgr->calib.gpsdata, WATCH_ENABLE, NULL); + gps_stream(mgr->calib.gpsdata, WATCH_ENABLE, NULL); mgr->calib.gpsfd.data = mgr; mgr->calib.gpsfd.cb = mgr_gps_read; mgr->calib.gpsfd.when = BSC_FD_READ | BSC_FD_EXCEPT; - mgr->calib.gpsfd.fd = mgr->calib.gpsdata.gps_fd; + mgr->calib.gpsfd.fd = mgr->calib.gpsdata->gps_fd; if (osmo_fd_register(&mgr->calib.gpsfd) < 0) { LOGP(DCALIB, LOGL_ERROR, "Failed to register GPSD fd\n"); calib_state_reset(mgr, CALIB_FAIL_GPS); -- To view, visit https://gerrit.osmocom.org/12339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f Gerrit-Change-Number: 12339 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 20:54:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 18 Dec 2018 20:54:25 +0000 Subject: Change in osmo-bts[master]: sysmobts_mgr: Add support for gpsd < 2.96 In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12340 ) Change subject: sysmobts_mgr: Add support for gpsd < 2.96 ...................................................................... sysmobts_mgr: Add support for gpsd < 2.96 This allows running sysmobts-mgr on systems with old gpsd releases (which may have other software depending on such old release). GPSD_API_MAJOR_VERSION define was first added in gpsd 2.39, before that it didn't exist (but this code is known to work against 2.38). GPSD_API_MAJOR_VERSION == 5 was set in version 2.96. Related gpsd commits: 3771dba081bd1175adab6096d7b6270d3822aaa1 e69bcb6b01af6b25c6a525fb1961b92ac04f5213 Related: SYS#4290 Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b --- M src/osmo-bts-sysmo/misc/sysmobts_mgr.h M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c 2 files changed, 21 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h index b62707c..668263d 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h @@ -9,6 +9,10 @@ #include +#if !defined(GPSD_API_MAJOR_VERSION) || GPSD_API_MAJOR_VERSION < 5 +#define USE_GPSD2_API 1 +#endif + #include enum { @@ -97,7 +101,9 @@ int gps_open; struct osmo_fd gpsfd; struct gps_data_t *gpsdata; +#if !USE_GPSD2_API struct gps_data_t gpsdata_buf; +#endif struct osmo_timer_list fix_timeout; /* Loop/Re-try control */ diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c index c3e821e..a0ba649 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c @@ -59,8 +59,10 @@ static inline int compat_gps_read(struct gps_data_t *data) { +#if USE_GPSD2_API + return gps_poll(data); /* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */ -#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0 +#elif GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0 return gps_read(data, NULL, 0); #else return gps_read(data); @@ -87,7 +89,9 @@ osmo_fd_unregister(&mgr->calib.gpsfd); gps_close(mgr->calib.gpsdata); +#if !USE_GPSD2_API memset(mgr->calib.gpsdata, 0, sizeof(*(mgr->calib.gpsdata))); +#endif mgr->calib.gps_open = 0; } @@ -143,8 +147,13 @@ { int rc; +#if USE_GPSD2_API + mgr->calib.gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT); + rc = mgr->calib.gpsdata ? 0 : -1; +#else mgr->calib.gpsdata = &mgr->calib.gpsdata_buf; rc = gps_open("localhost", DEFAULT_GPSD_PORT, mgr->calib.gpsdata); +#endif if (rc != 0) { LOGP(DCALIB, LOGL_ERROR, "Failed to connect to GPS %d\n", rc); calib_state_reset(mgr, CALIB_FAIL_GPS); @@ -152,8 +161,12 @@ } mgr->calib.gps_open = 1; - gps_stream(mgr->calib.gpsdata, WATCH_ENABLE, NULL); +#if USE_GPSD2_API + gps_query(mgr->calib.gpsdata, "w+x"); +#else + gps_stream(mgr->calib.gpsdata, WATCH_ENABLE, NULL); +#endif mgr->calib.gpsfd.data = mgr; mgr->calib.gpsfd.cb = mgr_gps_read; mgr->calib.gpsfd.when = BSC_FD_READ | BSC_FD_EXCEPT; -- To view, visit https://gerrit.osmocom.org/12340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If3c35021a020a61d5fa3cde5eebcd09908db822b Gerrit-Change-Number: 12340 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 18 21:44:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 18 Dec 2018 21:44:36 +0000 Subject: Change in osmo-msc[master]: msc_vty: display current RAN type In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12345 ) Change subject: msc_vty: display current RAN type ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I000cafd5e41b9951d51b6bd6672ee68a224b8212 Gerrit-Change-Number: 12345 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 18 Dec 2018 21:44:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 01:18:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 01:18:38 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: drop a bunch of dead code Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12354 Change subject: mgcp_client: drop a bunch of dead code ...................................................................... mgcp_client: drop a bunch of dead code Remove public API that makes no sense anymore and is dead code. I see the dropped API as a dead-end initial misconception of the early mgcp client, and it doesn't really make sense to drag this stuff along. It has not been used by osmo-msc,-bsc for a long time now, and just confuses the reader. It is public API, yes, and older versions of osmo-msc / osmo-bsc will not be able to compile against this, but even if it did, the resulting MGCP client would not work with the current osmo-mgw: this API is still based on the premise that the MGCP client dictates the MGW endpoint numbers, a concept that cannot be used with the current osmo-mgw. Instead, osmo-mgw expects a wildcarded endpoint upon CRCX and assigns its own endpoint names. Also, the bts-base configuration is unused and a legacy of when osmo-bsc_mgcp had explicit BTS and CN sides. Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 --- M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_vty.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 6 files changed, 11 insertions(+), 415 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/54/12354/1 diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index 79f2078..c1fd1b0 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -22,9 +22,6 @@ int local_port; const char *remote_addr; int remote_port; - uint16_t first_endpoint; - uint16_t last_endpoint; - uint16_t bts_base; }; typedef unsigned int mgcp_trans_id_t; @@ -123,9 +120,6 @@ uint16_t mgcp_client_remote_port(struct mgcp_client *mgcp); uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp); -int mgcp_client_next_endpoint(struct mgcp_client *client); -void mgcp_client_release_endpoint(uint16_t id, struct mgcp_client *client); - /* Invoked when an MGCP response is received or sending failed. When the * response is passed as NULL, this indicates failure during transmission. */ typedef void (* mgcp_response_cb_t )(struct mgcp_response *response, void *priv); @@ -137,20 +131,6 @@ enum mgcp_connection_mode; -struct msgb *mgcp_msg_crcx(struct mgcp_client *mgcp, - uint16_t rtp_endpoint, unsigned int call_id, - enum mgcp_connection_mode mode) -OSMO_DEPRECATED("Use mgcp_msg_gen() instead"); - -struct msgb *mgcp_msg_mdcx(struct mgcp_client *mgcp, - uint16_t rtp_endpoint, const char *rtp_conn_addr, - uint16_t rtp_port, enum mgcp_connection_mode mode) -OSMO_DEPRECATED("Use mgcp_msg_gen() instead"); - -struct msgb *mgcp_msg_dlcx(struct mgcp_client *mgcp, uint16_t rtp_endpoint, - unsigned int call_id) -OSMO_DEPRECATED("Use mgcp_msg_gen() instead"); - struct msgb *mgcp_msg_gen(struct mgcp_client *mgcp, struct mgcp_msg *mgcp_msg); mgcp_trans_id_t mgcp_msg_trans_id(struct msgb *msg); diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index fc9c5d3..2ceab3c 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -190,75 +190,9 @@ .local_port = -1, .remote_addr = NULL, .remote_port = -1, - .first_endpoint = 0, - .last_endpoint = 0, - .bts_base = 0, }; } -/* Test if a given endpoint id is currently in use */ -static bool endpoint_in_use(uint16_t id, struct mgcp_client *client) -{ - struct mgcp_inuse_endpoint *endpoint; - llist_for_each_entry(endpoint, &client->inuse_endpoints, entry) { - if (endpoint->id == id) - return true; - } - - return false; -} - -/*! Pick next free endpoint ID. - * \param[in,out] client MGCP client descriptor. - * \returns 0 on success, -EINVAL on error. */ -int mgcp_client_next_endpoint(struct mgcp_client *client) -{ - int i; - uint16_t first_endpoint = client->actual.first_endpoint; - uint16_t last_endpoint = client->actual.last_endpoint; - struct mgcp_inuse_endpoint *endpoint; - - /* Use the maximum permitted range if the VTY - * configuration does not specify a range */ - if (client->actual.last_endpoint == 0) { - first_endpoint = 1; - last_endpoint = 65534; - } - - /* Test the permitted endpoint range for an endpoint - * number that is not in use. When a suitable endpoint - * number can be found, seize it by adding it to the - * inuse list. */ - for (i=first_endpoint;iid = i; - llist_add_tail(&endpoint->entry, &client->inuse_endpoints); - return endpoint->id; - } - } - - /* All endpoints are busy! */ - return -EINVAL; -} - -/*! Release a seized endpoint ID to make it available again for other calls. - * \param[in] id Endpoint ID - * \param[in,out] client MGCP client descriptor. */ -/* Release a seized endpoint id to make it available again for other calls */ -void mgcp_client_release_endpoint(uint16_t id, struct mgcp_client *client) -{ - struct mgcp_inuse_endpoint *endpoint; - struct mgcp_inuse_endpoint *endpoint_tmp; - llist_for_each_entry_safe(endpoint, endpoint_tmp, &client->inuse_endpoints, entry) { - if (endpoint->id == id) { - llist_del(&endpoint->entry); - talloc_free(endpoint); - } - } -} - static void mgcp_client_handle_response(struct mgcp_client *mgcp, struct mgcp_response_pending *pending, struct mgcp_response *response) @@ -769,10 +703,6 @@ mgcp->actual.remote_port = conf->remote_port >= 0 ? (uint16_t)conf->remote_port : MGCP_CLIENT_REMOTE_PORT_DEFAULT; - mgcp->actual.first_endpoint = conf->first_endpoint > 0 ? (uint16_t)conf->first_endpoint : 0; - mgcp->actual.last_endpoint = conf->last_endpoint > 0 ? (uint16_t)conf->last_endpoint : 0; - mgcp->actual.bts_base = conf->bts_base > 0 ? (uint16_t)conf->bts_base : 4000; - return mgcp; } @@ -977,54 +907,6 @@ */ } -static struct msgb *mgcp_msg_from_buf(mgcp_trans_id_t trans_id, - const char *buf, int len) -{ - struct msgb *msg; - - if (len > (4096 - 128)) { - LOGP(DLMGCP, LOGL_ERROR, "Cannot send to MGCP GW:" - " message too large: %d\n", len); - return NULL; - } - - msg = msgb_alloc_headroom(4096, 128, "MGCP tx"); - OSMO_ASSERT(msg); - - char *dst = (char*)msgb_put(msg, len); - memcpy(dst, buf, len); - msg->l2h = msg->data; - msg->cb[MSGB_CB_MGCP_TRANS_ID] = trans_id; - - return msg; -} - -static struct msgb *mgcp_msg_from_str(mgcp_trans_id_t trans_id, - const char *fmt, ...) -{ - static char compose[4096 - 128]; - va_list ap; - int len; - OSMO_ASSERT(fmt); - - va_start(ap, fmt); - len = vsnprintf(compose, sizeof(compose), fmt, ap); - va_end(ap); - if (len >= sizeof(compose)) { - LOGP(DLMGCP, LOGL_ERROR, - "Message too large: trans_id=%u len=%d\n", - trans_id, len); - return NULL; - } - if (len < 1) { - LOGP(DLMGCP, LOGL_ERROR, - "Failed to compose message: trans_id=%u len=%d\n", - trans_id, len); - return NULL; - } - return mgcp_msg_from_buf(trans_id, compose, len); -} - static mgcp_trans_id_t mgcp_client_next_trans_id(struct mgcp_client *mgcp) { /* avoid zero trans_id to distinguish from unset trans_id */ @@ -1033,52 +915,6 @@ return mgcp->next_trans_id ++; } -struct msgb *mgcp_msg_crcx(struct mgcp_client *mgcp, - uint16_t rtp_endpoint, unsigned int call_id, - enum mgcp_connection_mode mode) -{ - mgcp_trans_id_t trans_id = mgcp_client_next_trans_id(mgcp); - return mgcp_msg_from_str(trans_id, - "CRCX %u %x at mgw MGCP 1.0\r\n" - "C: %x\r\n" - "L: p:20, a:AMR, nt:IN\r\n" - "M: %s\r\n" - , - trans_id, - rtp_endpoint, - call_id, - mgcp_client_cmode_name(mode)); -} - -struct msgb *mgcp_msg_mdcx(struct mgcp_client *mgcp, - uint16_t rtp_endpoint, const char *rtp_conn_addr, - uint16_t rtp_port, enum mgcp_connection_mode mode) - -{ - mgcp_trans_id_t trans_id = mgcp_client_next_trans_id(mgcp); - return mgcp_msg_from_str(trans_id, - "MDCX %u %x at mgw MGCP 1.0\r\n" - "M: %s\r\n" - "\r\n" - "c=IN IP4 %s\r\n" - "m=audio %u RTP/AVP 255\r\n" - , - trans_id, - rtp_endpoint, - mgcp_client_cmode_name(mode), - rtp_conn_addr, - rtp_port); -} - -struct msgb *mgcp_msg_dlcx(struct mgcp_client *mgcp, uint16_t rtp_endpoint, - unsigned int call_id) -{ - mgcp_trans_id_t trans_id = mgcp_client_next_trans_id(mgcp); - return mgcp_msg_from_str(trans_id, - "DLCX %u %x at mgw MGCP 1.0\r\n" - "C: %x\r\n", trans_id, rtp_endpoint, call_id); -} - #define MGCP_CRCX_MANDATORY (MGCP_MSG_PRESENCE_ENDPOINT | \ MGCP_MSG_PRESENCE_CALL_ID | \ MGCP_MSG_PRESENCE_CONN_MODE) diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index 48fcd70..e19dbee 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -99,23 +99,14 @@ MGW_STR "remote bind to connect to MGCP gateway with\n" "remote bind port\n") -DEFUN(cfg_mgw_endpoint_range, cfg_mgw_endpoint_range_cmd, +DEFUN_DEPRECATED(cfg_mgw_endpoint_range, cfg_mgw_endpoint_range_cmd, "mgw endpoint-range <1-65534> <1-65534>", - MGW_STR "usable range of endpoint identifiers\n" - "set first usable endpoint identifier\n" - "set last usable endpoint identifier\n") + MGW_STR "DEPRECATED: the endpoint range cannot be defined by the client\n" + "-\n" "-\n") { - uint16_t first_endpoint = atoi(argv[0]); - uint16_t last_endpoint = atoi(argv[1]); - - if (last_endpoint < first_endpoint) { - vty_out(vty, "last endpoint must be greater than first endpoint!%s", - VTY_NEWLINE); - return CMD_SUCCESS; - } - - global_mgcp_client_conf->first_endpoint = first_endpoint; - global_mgcp_client_conf->last_endpoint = last_endpoint; + vty_out(vty, "Please do not use legacy config 'mgw endpoint-range'" + " (the range can no longer be defined by the MGCP client)%s", + VTY_NEWLINE); return CMD_SUCCESS; } ALIAS_DEPRECATED(cfg_mgw_endpoint_range, cfg_mgcpgw_endpoint_range_cmd, @@ -126,14 +117,15 @@ #define BTS_START_STR "First UDP port allocated for the BTS side\n" #define UDP_PORT_STR "UDP Port number\n" -DEFUN(cfg_mgw_rtp_bts_base_port, +DEFUN_DEPRECATED(cfg_mgw_rtp_bts_base_port, cfg_mgw_rtp_bts_base_port_cmd, "mgw bts-base <0-65534>", MGW_STR - BTS_START_STR - UDP_PORT_STR) + "DEPRECATED: there is no explicit BTS side in current osmo-mgw\n" "-\n") { - global_mgcp_client_conf->bts_base = atoi(argv[0]); + vty_out(vty, "Please do not use legacy config 'mgw bts-base'" + " (there is no explicit BTS side in an MGW anymore)%s", + VTY_NEWLINE); return CMD_SUCCESS; } ALIAS_DEPRECATED(cfg_mgw_rtp_bts_base_port, @@ -147,9 +139,6 @@ { const char *addr; int port; - uint16_t first_endpoint; - uint16_t last_endpoint; - uint16_t bts_base; addr = global_mgcp_client_conf->local_addr; if (addr) @@ -169,19 +158,6 @@ vty_out(vty, "%smgw remote-port %u%s", indent, (uint16_t)port, VTY_NEWLINE); - first_endpoint = global_mgcp_client_conf->first_endpoint; - last_endpoint = global_mgcp_client_conf->last_endpoint; - if (last_endpoint != 0) { - vty_out(vty, "%smgw endpoint-range %u %u%s", indent, - first_endpoint, last_endpoint, VTY_NEWLINE); - } - - bts_base = global_mgcp_client_conf->bts_base; - if (bts_base) { - vty_out(vty, "%smgw bts-base %u%s", indent, - bts_base, VTY_NEWLINE); - } - return CMD_SUCCESS; } diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index e6982e4..1db70cf 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -135,87 +135,6 @@ return trans_id; } -void test_crcx(void) -{ - struct msgb *msg; - mgcp_trans_id_t trans_id; - - printf("\n===== %s =====\n", __func__); - - if (mgcp) - talloc_free(mgcp); - mgcp = mgcp_client_init(ctx, &conf); - - msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK); - trans_id = dummy_mgcp_send(msg); - - reply_to(trans_id, 200, "OK", - "I: 1\r\n\r\n" - "v=0\r\n" - "o=- 1 23 IN IP4 10.9.1.120\r\n" - "s=-\r\n" - "c=IN IP4 10.9.1.120\r\n" - "t=0 0\r\n" - "m=audio 16002 RTP/AVP 110 96\r\n" - "a=rtpmap:110 AMR/8000\r\n" - "a=rtpmap:96 GSM-EFR/8000\r\n" - "a=ptime:20\r\n"); -} - -void test_crcx_long_conn_id(void) -{ - struct msgb *msg; - mgcp_trans_id_t trans_id; - - printf("\n===== %s =====\n", __func__); - - if (mgcp) - talloc_free(mgcp); - mgcp = mgcp_client_init(ctx, &conf); - - msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK); - trans_id = dummy_mgcp_send(msg); - - reply_to(trans_id, 200, "OK", - "I: 123456789abcdef0123456789ABCDEF0\r\n\r\n" - "v=0\r\n" - "o=- 1 23 IN IP4 10.9.1.120\r\n" - "s=-\r\n" - "c=IN IP4 10.9.1.120\r\n" - "t=0 0\r\n" - "m=audio 16002 RTP/AVP 110 96\r\n" - "a=rtpmap:110 AMR/8000\r\n" - "a=rtpmap:96 GSM-EFR/8000\r\n" - "a=ptime:20\r\n"); -} - -void test_crcx_too_long_conn_id(void) -{ - struct msgb *msg; - mgcp_trans_id_t trans_id; - - printf("\n===== %s =====\n", __func__); - - if (mgcp) - talloc_free(mgcp); - mgcp = mgcp_client_init(ctx, &conf); - - msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK); - trans_id = dummy_mgcp_send(msg); - - reply_to(trans_id, 200, "OK", - "I: 123456789abcdef0123456789ABCDEF01001029\r\n\r\n" - "v=0\r\n" - "o=- 1 23 IN IP4 10.9.1.120\r\n" - "s=-\r\n" - "c=IN IP4 10.9.1.120\r\n" - "t=0 0\r\n" - "m=audio 16002 RTP/AVP 110 96\r\n" - "a=rtpmap:110 AMR/8000\r\n" - "a=rtpmap:96 GSM-EFR/8000\r\n" - "a=ptime:20\r\n"); -} - void test_mgcp_msg(void) { struct msgb *msg; @@ -618,14 +537,11 @@ mgcp_client_conf_init(&conf); - test_crcx(); test_mgcp_msg(); test_mgcp_client_cancel(); test_sdp_section_start(); test_map_codec_to_pt_and_map_pt_to_codec(); test_map_pt_to_codec(); - test_crcx_long_conn_id(); - test_crcx_too_long_conn_id(); printf("Done\n"); fprintf(stderr, "Done\n"); diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err index b20f93f..1d5a1a0 100644 --- a/tests/mgcp_client/mgcp_client_test.err +++ b/tests/mgcp_client/mgcp_client_test.err @@ -66,6 +66,4 @@ DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100 DLMGCP ptmap contains illegal mapping: codec=113 maps to pt=2 DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100 -DLMGCP Failed to parse MGCP response (parameter label: I): the received conn ID is too long: 39, maximum is 32 characters -DLMGCP Cannot parse MGCP response (head parameters) Done diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index 40e32ba..65b5298 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -1,46 +1,4 @@ -===== test_crcx ===== -composed: ------ -CRCX 1 17 at mgw MGCP 1.0 -C: 2a -L: p:20, a:AMR, nt:IN -M: loopback - ------ -composed response: ------ -200 1 OK -I: 1 - -v=0 -o=- 1 23 IN IP4 10.9.1.120 -s=- -c=IN IP4 10.9.1.120 -t=0 0 -m=audio 16002 RTP/AVP 110 96 -a=rtpmap:110 AMR/8000 -a=rtpmap:96 GSM-EFR/8000 -a=ptime:20 - ------ -response cb received: - head.response_code = 200 - head.trans_id = 1 - head.conn_id = 1 - head.comment = OK - audio_port = 16002 - audio_ip = 10.9.1.120 - ptime = 20 - codecs_len = 2 - codecs[0] = 112 - codecs[1] = 110 - ptmap_len = 2 - ptmap[0].codec = 112 - ptmap[0].pt = 110 - ptmap[1].codec = 110 - ptmap[1].pt = 96 - Generated CRCX message: CRCX 1 23 at mgw MGCP 1.0 C: 2f @@ -196,72 +154,4 @@ 2 <= 2 100 <= 100 - -===== test_crcx_long_conn_id ===== -composed: ------ -CRCX 1 17 at mgw MGCP 1.0 -C: 2a -L: p:20, a:AMR, nt:IN -M: loopback - ------ -composed response: ------ -200 1 OK -I: 123456789abcdef0123456789ABCDEF0 - -v=0 -o=- 1 23 IN IP4 10.9.1.120 -s=- -c=IN IP4 10.9.1.120 -t=0 0 -m=audio 16002 RTP/AVP 110 96 -a=rtpmap:110 AMR/8000 -a=rtpmap:96 GSM-EFR/8000 -a=ptime:20 - ------ -response cb received: - head.response_code = 200 - head.trans_id = 1 - head.conn_id = 123456789abcdef0123456789ABCDEF0 - head.comment = OK - audio_port = 16002 - audio_ip = 10.9.1.120 - ptime = 20 - codecs_len = 2 - codecs[0] = 112 - codecs[1] = 110 - ptmap_len = 2 - ptmap[0].codec = 112 - ptmap[0].pt = 110 - ptmap[1].codec = 110 - ptmap[1].pt = 96 - -===== test_crcx_too_long_conn_id ===== -composed: ------ -CRCX 1 17 at mgw MGCP 1.0 -C: 2a -L: p:20, a:AMR, nt:IN -M: loopback - ------ -composed response: ------ -200 1 OK -I: 123456789abcdef0123456789ABCDEF01001029 - -v=0 -o=- 1 23 IN IP4 10.9.1.120 -s=- -c=IN IP4 10.9.1.120 -t=0 0 -m=audio 16002 RTP/AVP 110 96 -a=rtpmap:110 AMR/8000 -a=rtpmap:96 GSM-EFR/8000 -a=ptime:20 - ------ Done -- To view, visit https://gerrit.osmocom.org/12354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 Gerrit-Change-Number: 12354 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 01:18:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 01:18:38 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_vty: fix missing talloc_free Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12355 Change subject: mgcp_client_vty: fix missing talloc_free ...................................................................... mgcp_client_vty: fix missing talloc_free If the vty client enters multiple local / remote addresses, that leaks talloc memory of the previously set addresses. Free those first, if any. Change-Id: I331b3d53b5eb330b87d798f952077a043674d409 --- M src/libosmo-mgcp-client/mgcp_client_vty.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/55/12355/1 diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index e19dbee..b81fcd0 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -43,6 +43,8 @@ if (!global_mgcp_client_conf) return CMD_ERR_NOTHING_TODO; OSMO_ASSERT(global_mgcp_client_ctx); + if (global_mgcp_client_conf->local_addr) + talloc_free((char*)global_mgcp_client_conf->local_addr); global_mgcp_client_conf->local_addr = talloc_strdup(global_mgcp_client_ctx, argv[0]); return CMD_SUCCESS; @@ -75,6 +77,8 @@ if (!global_mgcp_client_conf) return CMD_ERR_NOTHING_TODO; OSMO_ASSERT(global_mgcp_client_ctx); + if (global_mgcp_client_conf->remote_addr) + talloc_free((char*)global_mgcp_client_conf->remote_addr); global_mgcp_client_conf->remote_addr = talloc_strdup(global_mgcp_client_ctx, argv[0]); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/12355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I331b3d53b5eb330b87d798f952077a043674d409 Gerrit-Change-Number: 12355 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 01:18:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 01:18:39 +0000 Subject: Change in osmo-mgw[master]: osmo-mgw: err-log: include expected domain name Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12356 Change subject: osmo-mgw: err-log: include expected domain name ...................................................................... osmo-mgw: err-log: include expected domain name Add the expected domain name, and move the error log to where the expected domain name is compared. Change-Id: I59f40dc9263f686852f103ca904fc0a6702d7c8e --- M src/libosmo-mgcp/mgcp_msg.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/56/12356/1 diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index 648d86b..f98b9ee 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -223,8 +223,10 @@ if (!strcmp(cfg->domain, "*")) return 0; - if (strcmp(domain_to_check+1, cfg->domain) != 0) + if (strcmp(domain_to_check+1, cfg->domain) != 0) { + LOGP(DLMGCP, LOGL_ERROR, "Wrong domain name '%s', expecting '%s'\n", mgcp, cfg->domain); return -EINVAL; + } return 0; } @@ -244,7 +246,6 @@ /* Check if the domainname in the request is correct */ if (check_domain_name(cfg, mgcp)) { - LOGP(DLMGCP, LOGL_ERROR, "Wrong domain name '%s'\n", mgcp); *cause = -500; return NULL; } -- To view, visit https://gerrit.osmocom.org/12356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I59f40dc9263f686852f103ca904fc0a6702d7c8e Gerrit-Change-Number: 12356 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 01:18:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 01:18:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12357 Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... mgcp_client: make domain part of endpoint configurable So far, both osmo-msc and osmo-bsc always pass endpoint names of the form '... at mgw' to osmo-mgw. Allow configuring the 'mgw' part. Note that the actual way to pass a differing name is to pass a composed 'rtpbridge/*@foo' to mgcp_msg_gen() in the struct mgcp_msg. So this merely adds a common VTY config for the domain name part, changes to clients are necessary. - add mgcp_client_rtpbridge_wildcard() (useful for AoIP endpoints) - add mgcp_client_endpoint_domain() (useful for SCCPlite endpoints) - add mgcp client vty cfg 'mgw endpoint-domain NAME' Rationale: reading pcaps becomes so much easier when each of osmo-bsc and osmo-msc address their MGW with differing domain names. Otherwise, both will have a '0 at mgw' endpoint and it gets really confusing. Also: our MGCP clients osmo-bsc and osmo-msc use code dup to compose the initial 'rtpbridge/*@mgw' rtpbridge wildcard. It should be defined by this API instead. This will be used by: * osmo-msc I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 * osmo-bsc I492023e9dca0233ec0a077032455d9f2e3880f78 After these, with according configuration, there can be a '0 at bsc' and a '0 at msc' endpoint. osmo-mgw-for-bsc.cfg: mgcp domain bsc osmo-bsc.cfg: msc 0 mgw endpoint-domain bsc osmo-mgw-for-msc.cfg: mgcp domain msc osmo-msc.cfg: msc mgw endpoint-domain msc (By default, everything will still use '@mgw') Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 --- M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_vty.c M tests/mgcp_client/mgcp_client_test.err 4 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/57/12357/1 diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index c1fd1b0..d284f49 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -22,6 +22,10 @@ int local_port; const char *remote_addr; int remote_port; + + /* By default, we are always addressing the MGW with e.g. 'rtpbridge/123 at mgw'. + * If this is nonempty, the contained name will be used instead of 'mgw'. */ + char endpoint_domain_name[64]; }; typedef unsigned int mgcp_trans_id_t; @@ -120,6 +124,9 @@ uint16_t mgcp_client_remote_port(struct mgcp_client *mgcp); uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp); +const char *mgcp_client_endpoint_domain(const struct mgcp_client *mgcp); +const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp); + /* Invoked when an MGCP response is received or sending failed. When the * response is passed as NULL, this indicates failure during transmission. */ typedef void (* mgcp_response_cb_t )(struct mgcp_response *response, void *priv); diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 2ceab3c..2284e32 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -703,6 +703,10 @@ mgcp->actual.remote_port = conf->remote_port >= 0 ? (uint16_t)conf->remote_port : MGCP_CLIENT_REMOTE_PORT_DEFAULT; + osmo_strlcpy(mgcp->actual.endpoint_domain_name, conf->endpoint_domain_name, + sizeof(mgcp->actual.endpoint_domain_name)); + LOGP(DLMGCP, LOGL_NOTICE, "MGCP client: using endpoint domain '@%s'\n", mgcp_client_endpoint_domain(mgcp)); + return mgcp; } @@ -811,6 +815,32 @@ return mgcp->remote_addr; } +/* To compose endpoint names, usually for CRCX, use this as domain name. + * For example, snprintf("rtpbridge\*@%s", mgcp_client_endpoint_domain(mgcp)). */ +const char *mgcp_client_endpoint_domain(const struct mgcp_client *mgcp) +{ + return mgcp->actual.endpoint_domain_name[0]? mgcp->actual.endpoint_domain_name : "mgw"; +} + +const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp) +{ + static char endpoint[MGCP_ENDPOINT_MAXLEN]; + int rc; + +#define RTPBRIDGE_WILDCARD_FMT "rtpbridge/*@%s" + rc = snprintf(endpoint, sizeof(endpoint), RTPBRIDGE_WILDCARD_FMT, mgcp_client_endpoint_domain(mgcp)); + if (rc > sizeof(endpoint) - 1) { + LOGP(DLMGCP, LOGL_ERROR, "MGCP endpoint exceeds maximum length ('" RTPBRIDGE_WILDCARD_FMT "')\n", + mgcp_client_endpoint_domain(mgcp)); + return NULL; + } + if (rc < 1) { + LOGP(DLMGCP, LOGL_ERROR, "Cannot compose MGCP endpoint name\n"); + return NULL; + } + return endpoint; +} + struct mgcp_response_pending * mgcp_client_pending_add( struct mgcp_client *mgcp, mgcp_trans_id_t trans_id, diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index b81fcd0..7aae5d3 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -139,6 +139,17 @@ BTS_START_STR UDP_PORT_STR) +DEFUN(cfg_mgw_endpoint_domain_name, + cfg_mgw_endpoint_domain_name_cmd, + "mgw endpoint-domain NAME", + MGW_STR "Set the domain name to send in MGCP messages, e.g. the part 'foo' in 'rtpbridge/*@foo'.\n" + "Domain name, should be alphanumeric.\n") +{ + osmo_strlcpy(global_mgcp_client_conf->endpoint_domain_name, argv[0], + sizeof(global_mgcp_client_conf->endpoint_domain_name)); + return CMD_SUCCESS; +} + int mgcp_client_config_write(struct vty *vty, const char *indent) { const char *addr; @@ -162,6 +173,10 @@ vty_out(vty, "%smgw remote-port %u%s", indent, (uint16_t)port, VTY_NEWLINE); + if (global_mgcp_client_conf->endpoint_domain_name[0]) + vty_out(vty, "%smgw endpoint-domain %s%s", indent, + global_mgcp_client_conf->endpoint_domain_name, VTY_NEWLINE); + return CMD_SUCCESS; } @@ -176,6 +191,7 @@ install_element(node, &cfg_mgw_remote_port_cmd); install_element(node, &cfg_mgw_endpoint_range_cmd); install_element(node, &cfg_mgw_rtp_bts_base_port_cmd); + install_element(node, &cfg_mgw_endpoint_domain_name_cmd); /* deprecated 'mgcpgw' commands */ install_element(node, &cfg_mgcpgw_local_ip_cmd); diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err index 1d5a1a0..627b2d9 100644 --- a/tests/mgcp_client/mgcp_client_test.err +++ b/tests/mgcp_client/mgcp_client_test.err @@ -1,6 +1,8 @@ +DLMGCP MGCP client: using endpoint domain '@mgw' DLMGCP message buffer to small, can not generate MGCP message test_mgcp_client_cancel(): +DLMGCP MGCP client: using endpoint domain '@mgw' - composed msg with trans_id=1 - not in queue yet, cannot cancel yet DLMGCP Cannot cancel, no such transaction: 1 -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 01:18:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 01:18:57 +0000 Subject: Change in osmo-bsc[master]: use mgcp-client configured endpoint domain name Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12358 Change subject: use mgcp-client configured endpoint domain name ...................................................................... use mgcp-client configured endpoint domain name Rationale: reading pcaps becomes so much easier when each of osmo-bsc and osmo-msc address their MGW with differing domain names. Otherwise, both will have a '0 at mgw' endpoint and it gets really confusing. After this, with according configuration, there can be a '0 at bsc' and a '0 at msc' endpoint. osmo-mgw-for-bsc.cfg: mgcp domain bsc osmo-bsc.cfg: msc 0 mgw endpoint-domain bsc Depends: Ia662016f29dd8727d9c4626d726729641e21e1f8 (osmo-mgw) Change-Id: I492023e9dca0233ec0a077032455d9f2e3880f78 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/12358/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 85e754f..aa75273 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -468,7 +468,8 @@ conn->user_plane.mgw_endpoint = mgw_endpoint_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT, conn->network->mgw.client, conn->fi->id, - "%x at mgw", msc_assigned_cic); + "%x@%s", msc_assigned_cic, + mgcp_client_endpoint_domain(conn->network->mgw.client)); LOGPFSML(conn->fi, LOGL_DEBUG, "MGW endpoint name derived from CIC 0x%x: %s\n", msc_assigned_cic, mgw_endpoint_name(conn->user_plane.mgw_endpoint)); @@ -477,7 +478,7 @@ conn->user_plane.mgw_endpoint = mgw_endpoint_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT, conn->network->mgw.client, conn->fi->id, - "rtpbridge/*@mgw"); + "%s", mgcp_client_rtpbridge_wildcard(conn->network->mgw.client)); } else { LOGPFSML(conn->fi, LOGL_ERROR, "Conn is neither SCCPlite nor AoIP!?\n"); return NULL; -- To view, visit https://gerrit.osmocom.org/12358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I492023e9dca0233ec0a077032455d9f2e3880f78 Gerrit-Change-Number: 12358 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 02:21:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 02:21:41 +0000 Subject: Change in osmo-msc[master]: fix msc_mgcp_fsm_evt_names: two missing events Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12359 Change subject: fix msc_mgcp_fsm_evt_names: two missing events ...................................................................... fix msc_mgcp_fsm_evt_names: two missing events Change-Id: I66ebaf0a55de1a46bccbc86652ffa9b73c951ebf --- M src/libmsc/msc_mgcp.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/59/12359/1 diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 1ddec08..bf9ba93 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -144,6 +144,8 @@ OSMO_VALUE_STRING(EV_TEARDOWN_ERROR), OSMO_VALUE_STRING(EV_CRCX_RAN_RESP), OSMO_VALUE_STRING(EV_CRCX_CN_RESP), + OSMO_VALUE_STRING(EV_MDCX_RAN_RESP), + OSMO_VALUE_STRING(EV_MDCX_CN_RESP), OSMO_VALUE_STRING(EV_DLCX_ALL_RESP), {0, NULL} }; -- To view, visit https://gerrit.osmocom.org/12359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I66ebaf0a55de1a46bccbc86652ffa9b73c951ebf Gerrit-Change-Number: 12359 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 02:21:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 02:21:42 +0000 Subject: Change in osmo-msc[master]: mgcp log tweak: say RAN, not BTS, like surrounding logging Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12360 Change subject: mgcp log tweak: say RAN, not BTS, like surrounding logging ...................................................................... mgcp log tweak: say RAN, not BTS, like surrounding logging Change-Id: Ibb40155189a7f05ba2da4fcf9cf03fda5ffc3683 --- M src/libmsc/msc_mgcp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/60/12360/1 diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index bf9ba93..71f36b3 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -375,7 +375,7 @@ return; } - LOGPFSML(mgcp_ctx->fsm, LOGL_DEBUG, "CRCX/BTS: MGW responded with address %s:%u\n", r->audio_ip, r->audio_port); + LOGPFSML(mgcp_ctx->fsm, LOGL_DEBUG, "CRCX/RAN: MGW responded with address %s:%u\n", r->audio_ip, r->audio_port); conn->rtp.local_port_ran = r->audio_port; osmo_strlcpy(conn->rtp.local_addr_ran, r->audio_ip, sizeof(conn->rtp.local_addr_ran)); -- To view, visit https://gerrit.osmocom.org/12360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb40155189a7f05ba2da4fcf9cf03fda5ffc3683 Gerrit-Change-Number: 12360 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 02:21:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 02:21:42 +0000 Subject: Change in osmo-msc[master]: use mgcp-client configured endpoint domain name Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12361 Change subject: use mgcp-client configured endpoint domain name ...................................................................... use mgcp-client configured endpoint domain name Rationale: reading pcaps becomes so much easier when each of osmo-bsc and osmo-msc address their MGW with differing domain names. Otherwise, both will have a '0 at mgw' endpoint and it gets really confusing. After this, with according configuration, there can be a '0 at bsc' and a '0 at msc' endpoint. osmo-mgw-for-msc.cfg: mgcp domain msc osmo-msc.cfg: msc mgw endpoint-domain msc Depends: Ia662016f29dd8727d9c4626d726729641e21e1f8 (osmo-mgw) Change-Id: I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 --- M src/libmsc/msc_mgcp.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/61/12361/1 diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 71f36b3..91f2a90 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -51,8 +51,6 @@ #define MGCP_ASS_TIMEOUT 10 /* in seconds */ #define MGCP_ASS_TIMEOUT_TIMER_NR 4 -#define ENDPOINT_ID "rtpbridge/*@mgw" - /* Some internal cause codes to indicate fault condition inside the FSM */ enum msc_mgcp_cause_code { MGCP_ERR_MGW_FAIL, @@ -306,7 +304,7 @@ .call_id = mgcp_ctx->call_id, .conn_mode = MGCP_CONN_RECV_ONLY }; - if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->rtp_endpoint, sizeof(mgcp_msg.endpoint)) >= + if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_client_rtpbridge_wildcard(mgcp), sizeof(mgcp_msg.endpoint)) >= MGCP_ENDPOINT_MAXLEN) { handle_error(mgcp_ctx, MGCP_ERR_TOOLONG, false); return; @@ -963,6 +961,7 @@ static bool fsm_registered = false; struct ran_conn *conn; struct mgcp_client *mgcp; + int rc; OSMO_ASSERT(trans); @@ -1001,11 +1000,12 @@ /* Allocate and configure a new fsm instance */ mgcp_ctx = talloc_zero(NULL, struct mgcp_ctx); OSMO_ASSERT(mgcp_ctx); - if (osmo_strlcpy(mgcp_ctx->rtp_endpoint, ENDPOINT_ID, sizeof(mgcp_ctx->rtp_endpoint)) >= - MGCP_ENDPOINT_MAXLEN) { + + rc = osmo_strlcpy(mgcp_ctx->rtp_endpoint, mgcp_client_rtpbridge_wildcard(mgcp), sizeof(mgcp_ctx->rtp_endpoint)); + if (rc >= sizeof(mgcp_ctx->rtp_endpoint)) { talloc_free(mgcp_ctx); - LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) endpoint identifier (%s) exceeds maximum length...\n", - vlr_subscr_name(trans->vsub), ENDPOINT_ID); + LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) endpoint identifier exceeds maximum length: %s\n", + vlr_subscr_name(trans->vsub), osmo_quote_str(mgcp_client_rtpbridge_wildcard(mgcp), -1)); return -EINVAL; } mgcp_ctx->fsm = osmo_fsm_inst_alloc(&fsm_msc_mgcp, NULL, NULL, LOGL_DEBUG, name); -- To view, visit https://gerrit.osmocom.org/12361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 Gerrit-Change-Number: 12361 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 02:27:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 02:27:15 +0000 Subject: Change in libosmocore[master]: add to osmo_sock_get_name*() API In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12268 to look at the new patch set (#3). Change subject: add to osmo_sock_get_name*() API ...................................................................... add to osmo_sock_get_name*() API Basically, I am applying code review that I would have given had I not been on vacation when the last osmo_sock_get_name* stuff was merged. osmo_sock_get_name2() is so far a static internal function. However, it is nothing like osmo_sock_get_name(), so instead rename it to osmo_sock_get_ip_and_port(). Also make it public API, no need to hide it. I'm adding an "and" in the name to hopefully clarify: "ip_port" vs. "ip_and_port" -- there already are _get_X_ip_port() functions that only return the port string, despite "ip" in the name. Add new public osmo_sock_get_name2(), which is like osmo_sock_get_name(), except it uses a static string instead of talloc, and omits the braces. This is most convenient for log statement formats, avoiding dyn allocations. Add new osmo_sock_get_name_buf(), which is like osmo_sock_get_name2() but writes to a caller provided char buffer. Use osmo_sock_get_name_buf() in the implementation of osmo_sock_get_name(), but use another (non-static) local string buffer, because adding braces is too complex without talloc_snprintf(). Rationale: I want to improve the logging of socket errors, e.g. change DLMGCP ERROR Failed to read: 111/Connection refused (mgcp_client.c:720) to DLMGCP ERROR Failed to read: r=10.0.99.2:2427<->l=10.0.99.2:2728: 111='Connection refused' (mgcp_client.c:721) but it is just not handy to compose logging with the current API: - osmo_sock_get_name() requires a talloc_free(). - all the others require output buffers. - the only way to conveniently compose a logging string and, - notably, the only trivial way to skip the string composition if the logging level is currently muted, is to have a function that returns a static string: the new osmo_sock_get_name2(). - (I think the osmo_sock_get_{local,remote}_* convenience wrappers should never have been added, because they encourage the caller to invoke the same code twice, for IP addr and port, and throw away one half each time.) Related: Iae728192f499330d16836d9435648f6b8ed213b6 (osmo-mgw) Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 50 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/12268/3 -- To view, visit https://gerrit.osmocom.org/12268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 Gerrit-Change-Number: 12268 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 02:31:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 02:31:33 +0000 Subject: Change in libosmocore[master]: add to osmo_sock_get_name*() API In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12268 ) Change subject: add to osmo_sock_get_name*() API ...................................................................... add to osmo_sock_get_name*() API Basically, I am applying code review that I would have given had I not been on vacation when the last osmo_sock_get_name* stuff was merged. osmo_sock_get_name2() is so far a static internal function. However, it is nothing like osmo_sock_get_name(), so instead rename it to osmo_sock_get_ip_and_port(). Also make it public API, no need to hide it. I'm adding an "and" in the name to hopefully clarify: "ip_port" vs. "ip_and_port" -- there already are _get_X_ip_port() functions that only return the port string, despite "ip" in the name. Add new public osmo_sock_get_name2(), which is like osmo_sock_get_name(), except it uses a static string instead of talloc, and omits the braces. This is most convenient for log statement formats, avoiding dyn allocations. Add new osmo_sock_get_name_buf(), which is like osmo_sock_get_name2() but writes to a caller provided char buffer. Use osmo_sock_get_name_buf() in the implementation of osmo_sock_get_name(), but use another (non-static) local string buffer, because adding braces is too complex without talloc_snprintf(). Rationale: I want to improve the logging of socket errors, e.g. change DLMGCP ERROR Failed to read: 111/Connection refused (mgcp_client.c:720) to DLMGCP ERROR Failed to read: r=10.0.99.2:2427<->l=10.0.99.2:2728: 111='Connection refused' (mgcp_client.c:721) but it is just not handy to compose logging with the current API: - osmo_sock_get_name() requires a talloc_free(). - all the others require output buffers. - the only way to conveniently compose a logging string and, - notably, the only trivial way to skip the string composition if the logging level is currently muted, is to have a function that returns a static string: the new osmo_sock_get_name2(). - (I think the osmo_sock_get_{local,remote}_* convenience wrappers should never have been added, because they encourage the caller to invoke the same code twice, for IP addr and port, and throw away one half each time.) Related: Iae728192f499330d16836d9435648f6b8ed213b6 (osmo-mgw) Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 50 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 79a61bb..43604ec 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -60,6 +60,9 @@ const char *socket_path, unsigned int flags); char *osmo_sock_get_name(void *ctx, int fd); +const char *osmo_sock_get_name2(int fd); +int osmo_sock_get_name_buf(char *str, size_t str_len, int fd); +int osmo_sock_get_ip_and_port(int fd, char *ip, size_t ip_len, char *port, size_t port_len, bool local); int osmo_sock_get_local_ip(int fd, char *host, size_t len); int osmo_sock_get_local_ip_port(int fd, char *port, size_t len); int osmo_sock_get_remote_ip(int fd, char *host, size_t len); diff --git a/src/socket.c b/src/socket.c index e804ab5..4f3b1ca 100644 --- a/src/socket.c +++ b/src/socket.c @@ -697,10 +697,7 @@ return osmo_fd_init_ofd(ofd, osmo_sock_unix_init(type, proto, socket_path, flags)); } -/*! Get the IP and/or port number on socket. This is for internal usage. - * Convenience wrappers: osmo_sock_get_local_ip(), - * osmo_sock_get_local_ip_port(), osmo_sock_get_remote_ip(), - * osmo_sock_get_remote_ip_port() and osmo_sock_get_name() +/*! Get the IP and/or port number on socket in separate string buffers. * \param[in] fd file descriptor of socket * \param[out] ip IP address (will be filled in when not NULL) * \param[in] ip_len length of the ip buffer @@ -709,7 +706,7 @@ * \param[in] local (true) or remote (false) name will get looked at * \returns 0 on success; negative otherwise */ -static int osmo_sock_get_name2(int fd, char *ip, size_t ip_len, char *port, size_t port_len, bool local) +int osmo_sock_get_ip_and_port(int fd, char *ip, size_t ip_len, char *port, size_t port_len, bool local) { struct sockaddr sa; socklen_t len = sizeof(sa); @@ -741,7 +738,7 @@ */ int osmo_sock_get_local_ip(int fd, char *ip, size_t len) { - return osmo_sock_get_name2(fd, ip, len, NULL, 0, true); + return osmo_sock_get_ip_and_port(fd, ip, len, NULL, 0, true); } /*! Get local port on socket @@ -752,7 +749,7 @@ */ int osmo_sock_get_local_ip_port(int fd, char *port, size_t len) { - return osmo_sock_get_name2(fd, NULL, 0, port, len, true); + return osmo_sock_get_ip_and_port(fd, NULL, 0, port, len, true); } /*! Get remote IP address on socket @@ -763,7 +760,7 @@ */ int osmo_sock_get_remote_ip(int fd, char *ip, size_t len) { - return osmo_sock_get_name2(fd, ip, len, NULL, 0, false); + return osmo_sock_get_ip_and_port(fd, ip, len, NULL, 0, false); } /*! Get remote port on socket @@ -774,29 +771,62 @@ */ int osmo_sock_get_remote_ip_port(int fd, char *port, size_t len) { - return osmo_sock_get_name2(fd, NULL, 0, port, len, false); + return osmo_sock_get_ip_and_port(fd, NULL, 0, port, len, false); } -/*! Get address/port information on socket in dyn-alloc string +/*! Get address/port information on socket in dyn-alloc string like "(r=1.2.3.4:5<->l=6.7.8.9:10)". + * Usually, it is better to use osmo_sock_get_name2() for a static string buffer or osmo_sock_get_name_buf() for a + * caller provided string buffer, to avoid the dynamic talloc allocation. * \param[in] ctx talloc context from which to allocate string buffer * \param[in] fd file descriptor of socket - * \returns string identifying the connection of this socket + * \returns string identifying the connection of this socket, talloc'd from ctx. */ char *osmo_sock_get_name(void *ctx, int fd) { + /* "r=1.2.3.4:123<->l=5.6.7.8:987" */ + char str[2 + INET6_ADDRSTRLEN + 1 + 5 + 3 + 2 + INET6_ADDRSTRLEN + 1 + 5 + 1]; + int rc; + rc = osmo_sock_get_name_buf(str, sizeof(str), fd); + if (rc <= 0) + return NULL; + return talloc_asprintf(ctx, "(%s)", str); +} + +/*! Get address/port information on socket in provided string buffer, like "r=1.2.3.4:5<->l=6.7.8.9:10". + * This does not include braces like osmo_sock_get_name(). + * \param[out] str Destination string buffer. + * \param[in] str_len sizeof(str). + * \param[in] fd File descriptor of socket. + * \return String length as returned by snprintf(), or negative on error. + */ +int osmo_sock_get_name_buf(char *str, size_t str_len, int fd) +{ char hostbuf_l[INET6_ADDRSTRLEN], hostbuf_r[INET6_ADDRSTRLEN]; char portbuf_l[6], portbuf_r[6]; + int rc; /* get local */ - if (osmo_sock_get_name2(fd, hostbuf_l, sizeof(hostbuf_l), portbuf_l, sizeof(portbuf_l), true)) - return NULL; + if ((rc = osmo_sock_get_ip_and_port(fd, hostbuf_l, sizeof(hostbuf_l), portbuf_l, sizeof(portbuf_l), true))) + return rc; /* get remote */ - if (!osmo_sock_get_name2(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false)) - return talloc_asprintf(ctx, "(r=%s:%s<->l=%s:%s)", hostbuf_r, portbuf_r, hostbuf_l, portbuf_l); + if (osmo_sock_get_ip_and_port(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false) != 0) + return snprintf(str, str_len, "r=NULL<->l=%s:%s", hostbuf_l, portbuf_l); - /* local only: different format */ - return talloc_asprintf(ctx, "(r=NULL<->l=%s:%s)", hostbuf_l, portbuf_l); + return snprintf(str, str_len, "r=%s:%s<->l=%s:%s", hostbuf_r, portbuf_r, hostbuf_l, portbuf_l); +} + +/*! Get address/port information on socket in static string, like "r=1.2.3.4:5<->l=6.7.8.9:10". + * This does not include braces like osmo_sock_get_name(). + * \param[in] fd File descriptor of socket. + * \return Static string buffer containing the result. + */ +const char *osmo_sock_get_name2(int fd) +{ + /* "r=1.2.3.4:123<->l=5.6.7.8:987" */ + static char str[2 + INET6_ADDRSTRLEN + 1 + 5 + 3 + 2 + INET6_ADDRSTRLEN + 1 + 5 + 1]; + osmo_sock_get_name_buf(str, sizeof(str), fd); + return str; } static int sock_get_domain(int fd) -- To view, visit https://gerrit.osmocom.org/12268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8ad89ac447c9c582742e70d082072bdd40a5a398 Gerrit-Change-Number: 12268 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 09:12:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 19 Dec 2018 09:12:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12346 ) Change subject: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+1 > > Did some tests fail because of this? Not sure. I found the issue by code inspection. -- To view, visit https://gerrit.osmocom.org/12346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706 Gerrit-Change-Number: 12346 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 19 Dec 2018 09:12:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 09:18:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 09:18:28 +0000 Subject: Change in osmo-msc[master]: fix msc_mgcp_fsm_evt_names: two missing events In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12359 ) Change subject: fix msc_mgcp_fsm_evt_names: two missing events ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66ebaf0a55de1a46bccbc86652ffa9b73c951ebf Gerrit-Change-Number: 12359 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 09:18:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 09:18:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 09:18:58 +0000 Subject: Change in osmo-msc[master]: mgcp log tweak: say RAN, not BTS, like surrounding logging In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12360 ) Change subject: mgcp log tweak: say RAN, not BTS, like surrounding logging ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibb40155189a7f05ba2da4fcf9cf03fda5ffc3683 Gerrit-Change-Number: 12360 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 09:18:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 09:19:11 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 19 Dec 2018 09:19:11 +0000 Subject: Change in osmo-msc[master]: msc_vty: also show IMEI and IMEISV In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12343 to look at the new patch set (#3). Change subject: msc_vty: also show IMEI and IMEISV ...................................................................... msc_vty: also show IMEI and IMEISV When the VLR subscriber information is shown on the VTY it shows IMSI and TMSI, but not IMEI and IMEISV. Since in some cases this information might be helpful, lets display it as well. Change-Id: Iedd75dbb9850388ec1fedb984ed0b8bf4c62e780 --- M src/libmsc/msc_vty.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/43/12343/3 -- To view, visit https://gerrit.osmocom.org/12343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iedd75dbb9850388ec1fedb984ed0b8bf4c62e780 Gerrit-Change-Number: 12343 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 09:19:30 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 19 Dec 2018 09:19:30 +0000 Subject: Change in osmo-msc[master]: msc_vty: also show IMEI and IMEISV In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12343 ) Change subject: msc_vty: also show IMEI and IMEISV ...................................................................... Patch Set 2: (2 comments) > Build Started https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-msc/1076/ https://gerrit.osmocom.org/#/c/12343/2/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12343/2/src/libmsc/msc_vty.c at 642 PS2, Line 642: if (strlen(vsub->imei)) > Not critical but better for performance reasons, and it only requires one line change, so I think it [?] Done https://gerrit.osmocom.org/#/c/12343/2/src/libmsc/msc_vty.c at 642 PS2, Line 642: if (strlen(vsub->imei)) > Yeah that would be a better idiom but not critical from my point of view. Done -- To view, visit https://gerrit.osmocom.org/12343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedd75dbb9850388ec1fedb984ed0b8bf4c62e780 Gerrit-Change-Number: 12343 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 19 Dec 2018 09:19:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 09:19:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 09:19:51 +0000 Subject: Change in osmo-msc[master]: use mgcp-client configured endpoint domain name In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12361 ) Change subject: use mgcp-client configured endpoint domain name ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12361/1/src/libmsc/msc_mgcp.c File src/libmsc/msc_mgcp.c: https://gerrit.osmocom.org/#/c/12361/1/src/libmsc/msc_mgcp.c at 1003 PS1, Line 1003: ws -- To view, visit https://gerrit.osmocom.org/12361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 Gerrit-Change-Number: 12361 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 09:19:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 09:28:03 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 19 Dec 2018 09:28:03 +0000 Subject: Change in osmo-msc[master]: msc_vty: display subscriber flags In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/12344 ) Change subject: msc_vty: display subscriber flags ...................................................................... msc_vty: display subscriber flags When a VLR subscriber is displayed on the VTY we get a lot of meta information, but there are also some flags to handle the internal subscriber status e.g. conf_by_radio_contact_ind. Lets display those flags as well as this information can be very helpful when debugging problems in the VLR Change-Id: I59a9145a4daad50d68de3fd5c3291f027256917f --- M src/libmsc/msc_vty.c 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 4e71e26..b39775f 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -640,6 +640,25 @@ vty_out(vty, " new TMSI: %08X%s", vsub->tmsi_new, VTY_NEWLINE); + vty_out(vty, " Flags: %s", VTY_NEWLINE); + vty_out(vty, " IMSI detached: %s%s", + vsub->imsi_detached_flag ? "true" : "false", VTY_NEWLINE); + vty_out(vty, " Conf. by radio contact: %s%s", + vsub->conf_by_radio_contact_ind ? "true" : "false", + VTY_NEWLINE); + vty_out(vty, " Subscr. data conf. by HLR: %s%s", + vsub->sub_dataconf_by_hlr_ind ? "true" : "false", VTY_NEWLINE); + vty_out(vty, " Location conf. in HLR: %s%s", + vsub->loc_conf_in_hlr_ind ? "true" : "false", VTY_NEWLINE); + vty_out(vty, " Subscriber dormant: %s%s", + vsub->dormant_ind ? "true" : "false", VTY_NEWLINE); + vty_out(vty, " Received cancel locataion: %s%s", + vsub->cancel_loc_rx ? "true" : "false", VTY_NEWLINE); + vty_out(vty, " MS not reachable: %s%s", + vsub->ms_not_reachable_flag ? "true" : "false", VTY_NEWLINE); + vty_out(vty, " LA allowed: %s%s", + vsub->la_allowed ? "true" : "false", VTY_NEWLINE); + #if 0 /* TODO: add this to vlr_subscr? */ if (vsub->auth_info.auth_algo != AUTH_ALGO_NONE) { -- To view, visit https://gerrit.osmocom.org/12344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I59a9145a4daad50d68de3fd5c3291f027256917f Gerrit-Change-Number: 12344 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 09:28:14 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 19 Dec 2018 09:28:14 +0000 Subject: Change in osmo-msc[master]: msc_vty: display current RAN type In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/12345 ) Change subject: msc_vty: display current RAN type ...................................................................... msc_vty: display current RAN type When a subscriber is displayed the RAN type is not included in the overview. Meanwhile the MSC supports multiple different ran types it becomes important to see in which RAN the subscriber is currently active. Change-Id: I000cafd5e41b9951d51b6bd6672ee68a224b8212 Related: OS#3615 --- M src/libmsc/msc_vty.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index b39775f..5622c02 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -632,6 +632,8 @@ VTY_NEWLINE); vty_out(vty, " LAC: %d/0x%x%s", vsub->lac, vsub->lac, VTY_NEWLINE); + vty_out(vty, " RAN: %s%s", + ran_type_name(vsub->cs.attached_via_ran), VTY_NEWLINE); vty_out(vty, " IMSI: %s%s", vsub->imsi, VTY_NEWLINE); if (vsub->tmsi != GSM_RESERVED_TMSI) vty_out(vty, " TMSI: %08X%s", vsub->tmsi, -- To view, visit https://gerrit.osmocom.org/12345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I000cafd5e41b9951d51b6bd6672ee68a224b8212 Gerrit-Change-Number: 12345 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 10:24:48 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 10:24:48 +0000 Subject: Change in osmo-msc[master]: mgcp log tweak: say RAN, not BTS, like surrounding logging In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12360 ) Change subject: mgcp log tweak: say RAN, not BTS, like surrounding logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibb40155189a7f05ba2da4fcf9cf03fda5ffc3683 Gerrit-Change-Number: 12360 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 10:24:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 10:26:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 10:26:59 +0000 Subject: Change in osmocom-bb[master]: host/layer23: don't init SAP interface by default In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12350 ) Change subject: host/layer23: don't init SAP interface by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62cc69c06fa15468a55bb0a9d408267d0745174c Gerrit-Change-Number: 12350 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 10:26:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 10:41:32 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 10:41:32 +0000 Subject: Change in osmo-msc[master]: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12349 ) Change subject: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE ...................................................................... Patch Set 2: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/12349/2/include/osmocom/msc/gsm_04_08.h File include/osmocom/msc/gsm_04_08.h: https://gerrit.osmocom.org/#/c/12349/2/include/osmocom/msc/gsm_04_08.h at 80 PS2, Line 80: struct gsm_classmark; Why not simply #include ran_conn.h? https://gerrit.osmocom.org/#/c/12349/2/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/12349/2/src/libmsc/a_iface_bssap.c at 405 PS2, Line 405: } else { I'd suggest keeping the comment but dropping empty else {} https://gerrit.osmocom.org/#/c/12349/2/src/libmsc/a_iface_bssap.c at 410 PS2, Line 410: for (i = 0; i < 8; i++) { If I understood correctly where this limit comes from, than better to use ENCRY_INFO_PERM_ALGO_MAXLEN otherwise please comment why there're 8 variants only. https://gerrit.osmocom.org/#/c/12349/2/src/libmsc/a_iface_bssap.c at 440 PS2, Line 440: LOGPCONN(conn, LOGL_ERROR, "Unsupported encryption algorithm in CIHPER MODE COMPLETE: A5/%d\n", alg_id); Better use gsm0808_chosen_enc_alg_names. -- To view, visit https://gerrit.osmocom.org/12349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81 Gerrit-Change-Number: 12349 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 19 Dec 2018 10:41:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 10:48:51 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 10:48:51 +0000 Subject: Change in osmo-msc[master]: Remove redundancy in LAC processing In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12338 to look at the new patch set (#4). Change subject: Remove redundancy in LAC processing ...................................................................... Remove redundancy in LAC processing Always use LAC which is part of Cell Global ID otherwise we might end up in a situation where separately stored LAC differs. Both are described in 3GPP TS 23.008 $2.4 as temporary subscriber data to be stored in VLR. Both are defined in 3GPP TS 23.003. The LAC is part of LAI which is part of CGI so there should be no case when those values differ for a given subscriber. Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e --- M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/msc_vty.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_ss.c 8 files changed, 9 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/12338/4 -- To view, visit https://gerrit.osmocom.org/12338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e Gerrit-Change-Number: 12338 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 10:55:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 10:55:46 +0000 Subject: Change in osmo-msc[master]: Remove redundancy in LAC processing In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12338 ) Change subject: Remove redundancy in LAC processing ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e Gerrit-Change-Number: 12338 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 19 Dec 2018 10:55:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 10:56:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 10:56:20 +0000 Subject: Change in osmo-msc[master]: Remove redundancy in LAC processing In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12338 ) Change subject: Remove redundancy in LAC processing ...................................................................... Patch Set 4: This already got 2 +1 before, new revision just fixes trivial merge conflict with master. -- To view, visit https://gerrit.osmocom.org/12338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e Gerrit-Change-Number: 12338 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 19 Dec 2018 10:56:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 10:56:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 10:56:23 +0000 Subject: Change in osmo-msc[master]: Remove redundancy in LAC processing In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12338 ) Change subject: Remove redundancy in LAC processing ...................................................................... Remove redundancy in LAC processing Always use LAC which is part of Cell Global ID otherwise we might end up in a situation where separately stored LAC differs. Both are described in 3GPP TS 23.008 $2.4 as temporary subscriber data to be stored in VLR. Both are defined in 3GPP TS 23.003. The LAC is part of LAI which is part of CGI so there should be no case when those values differ for a given subscriber. Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e --- M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/msc_vty.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_ss.c 8 files changed, 9 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, approved diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 2f31063..20a9c0f 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -142,9 +142,7 @@ /* Newly allocated TMSI that was not yet acked by MS */ uint32_t tmsi_new; - /* some redundancy in information below? */ struct osmo_cell_global_id cgi; /* 2.4.16 */ - uint16_t lac; /* 2.4.2 */ char imeisv[GSM23003_IMEISV_NUM_DIGITS+1]; /* 2.2.3 */ char imei[GSM23003_IMEISV_NUM_DIGITS+1]; /* 2.1.9 */ diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 5500f6f..5567da9 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1939,7 +1939,7 @@ GSM48_CC_CAUSE_UNASSIGNED_NR); } /* If subscriber is not "attached" */ - if (!vsub->lac) { + if (!vsub->cgi.lai.lac) { DEBUGP(DCC, "(bts - trx - ts - ti -- sub %s) " "Received '%s' from MNCC with " "detached subscriber %s\n", data->called.number, @@ -1978,7 +1978,7 @@ "unallocated channel, paging already " "started for lac %d.\n", data->called.number, - get_mncc_name(msg_type), vsub->lac); + get_mncc_name(msg_type), vsub->cgi.lai.lac); vlr_subscr_put(vsub); trans_free(trans); return 0; diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 43bf48c..3ee6e92 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -287,7 +287,7 @@ } /* If subscriber is not "attached" */ - if (!vsub->lac) { + if (!vsub->cgi.lai.lac) { LOGP(DMM, LOGL_ERROR, "Network-originated session " "rejected - subscriber is not attached\n"); return NULL; diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c index 188807e..0e76efc 100644 --- a/src/libmsc/gsm_subscriber.c +++ b/src/libmsc/gsm_subscriber.c @@ -116,12 +116,12 @@ * SCCP connections (if any). */ switch (vsub->cs.attached_via_ran) { case RAN_GERAN_A: - return a_iface_tx_paging(vsub->imsi, vsub->tmsi, vsub->lac); + return a_iface_tx_paging(vsub->imsi, vsub->tmsi, vsub->cgi.lai.lac); case RAN_UTRAN_IU: return ranap_iu_page_cs(vsub->imsi, vsub->tmsi == GSM_RESERVED_TMSI? NULL : &vsub->tmsi, - vsub->lac); + vsub->cgi.lai.lac); default: break; } diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 5622c02..3079bc3 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -631,7 +631,7 @@ vty_out(vty, " Extension: %s%s", vsub->msisdn, VTY_NEWLINE); vty_out(vty, " LAC: %d/0x%x%s", - vsub->lac, vsub->lac, VTY_NEWLINE); + vsub->cgi.lai.lac, vsub->cgi.lai.lac, VTY_NEWLINE); vty_out(vty, " RAN: %s%s", ran_type_name(vsub->cs.attached_via_ran), VTY_NEWLINE); vty_out(vty, " IMSI: %s%s", vsub->imsi, VTY_NEWLINE); diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 5d171d5..e635305 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -950,7 +950,7 @@ vsub->lu_fsm = fi; vsub->msc_conn_ref = lfp->msc_conn_ref; /* FIXME: send new LAC to HLR? */ - vsub->lac = lfp->new_lai.lac; + vsub->cgi.lai.lac = lfp->new_lai.lac; lfp->vsub = vsub; /* Tell MSC to associate this subscriber with the given * connection */ diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 4a4f243..b1ff2c0 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -154,7 +154,7 @@ vsub = vlr_subscr_find_by_imsi(net->vlr, IMSI); VERBOSE_ASSERT(vsub != NULL, == true, "%d"); VERBOSE_ASSERT(strcmp(vsub->imsi, IMSI), == 0, "%d"); - VAL_ASSERT("LAC", vsub->lac, == 23, "%u"); + VAL_ASSERT("LAC", vsub->cgi.lai.lac, == 23, "%u"); vlr_subscr_put(vsub); } diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c index 4e8077e..832293c 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.c +++ b/tests/msc_vlr/msc_vlr_test_ss.c @@ -68,7 +68,7 @@ vsub = vlr_subscr_find_by_imsi(net->vlr, IMSI); VERBOSE_ASSERT(vsub != NULL, == true, "%d"); VERBOSE_ASSERT(strcmp(vsub->imsi, IMSI), == 0, "%d"); - VAL_ASSERT("LAC", vsub->lac, == 23, "%u"); + VAL_ASSERT("LAC", vsub->cgi.lai.lac, == 23, "%u"); vlr_subscr_put(vsub); bss_sends_clear_complete(); -- To view, visit https://gerrit.osmocom.org/12338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I993ebc3e14f25e83124b6d3f8461a4b18f971f8e Gerrit-Change-Number: 12338 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 11:23:35 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 19 Dec 2018 11:23:35 +0000 Subject: Change in osmo-msc[master]: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12349 ) Change subject: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/#/c/12349/2/include/osmocom/msc/gsm_04_08.h File include/osmocom/msc/gsm_04_08.h: https://gerrit.osmocom.org/#/c/12349/2/include/osmocom/msc/gsm_04_08.h at 80 PS2, Line 80: struct gsm_classmark; > Why not simply #include ran_conn. [?] Yes that works, too. Done in next patch set. https://gerrit.osmocom.org/#/c/12349/2/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/12349/2/src/libmsc/a_iface_bssap.c at 405 PS2, Line 405: } else { > I'd suggest keeping the comment but dropping empty else {} Fine, I don't mind either way. https://gerrit.osmocom.org/#/c/12349/2/src/libmsc/a_iface_bssap.c at 410 PS2, Line 410: for (i = 0; i < 8; i++) { > If I understood correctly where this limit comes from, than better to use ENCRY_INFO_PERM_ALGO_MAXLE [?] This was copied from existing code in gsm_04_08.c. I'll fix it there, too. https://gerrit.osmocom.org/#/c/12349/2/src/libmsc/a_iface_bssap.c at 440 PS2, Line 440: LOGPCONN(conn, LOGL_ERROR, "Unsupported encryption algorithm in CIHPER MODE COMPLETE: A5/%d\n", alg_id); > Better use gsm0808_chosen_enc_alg_names. No, gsm0808_chosen_enc_alg_names is for GSM0808_IE_CHOSEN_ENCR_ALG values. alg_id is a VLR_CIPH_* value so we'd better use vlr_ciph_names. I just noticed a bug above: perm_algo[j] is also an IE value, not a vlr_cipher_name. So we can't compare them directly. Will fix this, and rename the alg_id variable for clarity as well. -- To view, visit https://gerrit.osmocom.org/12349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81 Gerrit-Change-Number: 12349 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 19 Dec 2018 11:23:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 11:27:18 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 19 Dec 2018 11:27:18 +0000 Subject: Change in osmo-msc[master]: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE In-Reply-To: References: Message-ID: Hello Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12349 to look at the new patch set (#3). Change subject: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE ...................................................................... improve handling of BSC-chosen algo in CIPHER MODE COMPLETE The BSC may choose to omit the chosenEntryptionAlgorithm IE in the CIPHER MODE COMPLETE command. When this happens, we used to default to A5/1 and disregarded the list of ciphers which we requested in the CIPHER MODE CMD. Fall back to the best cipher instead of hard-coding a fallback to A5/1. If the BSC does specify an algorithm, ensure that the chosen value falls within the range allowed by GSM 04.08, and ensure that the chosen value matches one of the values we sent in CIPHER MODE CMD. Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81 Related: OS#2872 --- M include/osmocom/msc/gsm_04_08.h M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c 3 files changed, 56 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/49/12349/3 -- To view, visit https://gerrit.osmocom.org/12349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81 Gerrit-Change-Number: 12349 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 11:40:00 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 11:40:00 +0000 Subject: Change in osmo-msc[master]: MNCC: use log wrapper for call processing In-Reply-To: References: Message-ID: Hello Stefan Sperling, Pau Espin Pedrol, Harald Welte, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12329 to look at the new patch set (#4). Change subject: MNCC: use log wrapper for call processing ...................................................................... MNCC: use log wrapper for call processing Add log/debug wrappers to conveniently print local and remote call references. Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 --- M src/libmsc/mncc_builtin.c 1 file changed, 12 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/12329/4 -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 11:46:27 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 11:46:27 +0000 Subject: Change in osmo-msc[master]: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12349 ) Change subject: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81 Gerrit-Change-Number: 12349 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 19 Dec 2018 11:46:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 11:59:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 11:59:17 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: drop a bunch of dead code In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12354 ) Change subject: mgcp_client: drop a bunch of dead code ...................................................................... Patch Set 1: Fine for me. Let's wait what Harald and Philipp (I cannot add him as reviewer, UI bug) have to say about it. -- To view, visit https://gerrit.osmocom.org/12354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 Gerrit-Change-Number: 12354 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 11:59:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:02:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 12:02:12 +0000 Subject: Change in osmocom-bb[master]: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12351 ) Change subject: host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() ...................................................................... host/layer23/sap_interface.c: cosmetic: use ARRAY_SIZE() Change-Id: I3a2908bf11300ec681beddb5a54f9a62ca5430ae --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Max: Looks good to me, approved diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 936beb3..a32c3aa 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -177,7 +177,7 @@ get_value_string(sap_result_names, param->value[0])); } - if(param->value[0] > sizeof(sap_result_names)/sizeof(struct value_string)){ + if(param->value[0] > ARRAY_SIZE(sap_result_names)){ return -1; } -- To view, visit https://gerrit.osmocom.org/12351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3a2908bf11300ec681beddb5a54f9a62ca5430ae Gerrit-Change-Number: 12351 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:02:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 12:02:10 +0000 Subject: Change in osmocom-bb[master]: host/layer23: don't init SAP interface by default In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12350 ) Change subject: host/layer23: don't init SAP interface by default ...................................................................... host/layer23: don't init SAP interface by default Almost all layer23 applications, excluding mobile, have nothing to do with SAP interface. Moreover, the current implementation does initialize SAP connection automatically, as soon as the first message is sent. Change-Id: I62cc69c06fa15468a55bb0a9d408267d0745174c --- M src/host/layer23/src/common/main.c 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Max: Looks good to me, approved diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 2920cd9..8abd3f7 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -258,10 +258,6 @@ exit(1); } - rc = sap_open(ms, sap_socket_path); - if (rc < 0) - fprintf(stderr, "Failed during sap_open(), no SIM reader\n"); - ms->lapdm_channel.lapdm_dcch.l1_ctx = ms; ms->lapdm_channel.lapdm_dcch.l3_ctx = ms; ms->lapdm_channel.lapdm_acch.l1_ctx = ms; -- To view, visit https://gerrit.osmocom.org/12350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I62cc69c06fa15468a55bb0a9d408267d0745174c Gerrit-Change-Number: 12350 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:02:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 12:02:29 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_vty: fix missing talloc_free In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12355 ) Change subject: mgcp_client_vty: fix missing talloc_free ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12355/1/src/libosmo-mgcp-client/mgcp_client_vty.c File src/libosmo-mgcp-client/mgcp_client_vty.c: https://gerrit.osmocom.org/#/c/12355/1/src/libosmo-mgcp-client/mgcp_client_vty.c at 46 PS1, Line 46: if (global_mgcp_client_conf->local_addr) osmo_talloc_replace_string(global_mgcp_client_ctx, &global_mgcp_client_conf->local_addr, argv[0]); https://gerrit.osmocom.org/#/c/12355/1/src/libosmo-mgcp-client/mgcp_client_vty.c at 80 PS1, Line 80: if (global_mgcp_client_conf->remote_addr) Same, see osmo_talloc_replace_string. -- To view, visit https://gerrit.osmocom.org/12355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I331b3d53b5eb330b87d798f952077a043674d409 Gerrit-Change-Number: 12355 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 12:02:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:03:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 12:03:34 +0000 Subject: Change in osmo-mgw[master]: osmo-mgw: err-log: include expected domain name In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12356 ) Change subject: osmo-mgw: err-log: include expected domain name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I59f40dc9263f686852f103ca904fc0a6702d7c8e Gerrit-Change-Number: 12356 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 12:03:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:06:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 12:06:48 +0000 Subject: Change in osmo-msc[master]: msc_vty: also show IMEI and IMEISV In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12343 ) Change subject: msc_vty: also show IMEI and IMEISV ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iedd75dbb9850388ec1fedb984ed0b8bf4c62e780 Gerrit-Change-Number: 12343 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 19 Dec 2018 12:06:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:18:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 12:18:39 +0000 Subject: Change in osmo-bts[master]: rsl: Send PDCH ACT NACK if TCH chan is still active In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12180 ) Change subject: rsl: Send PDCH ACT NACK if TCH chan is still active ...................................................................... Patch Set 1: Ping for another +1. Hopefully I can merge this before Christmas. -- To view, visit https://gerrit.osmocom.org/12180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d Gerrit-Change-Number: 12180 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 12:18:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:19:49 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 12:19:49 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: drop dead SAP initialization code Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12362 Change subject: layer23/mobile: drop dead SAP initialization code ...................................................................... layer23/mobile: drop dead SAP initialization code SAP connection can be initialized upon request. Change-Id: Ic89089c4850ab2c9252bfd43a05d5271e2e3a160 --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/62/12362/1 diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index a051fba..84dec86 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -221,16 +221,6 @@ return rc; } -#if 0 - rc = sap_open(ms, ms->settings.sap_socket_path); - if (rc < 0) { - fprintf(stderr, "Failed during sap_open(), no SIM reader\n"); - ms->sap_wq.bfd.fd = -1; - mobile_exit(ms, 1); - return rc; - } -#endif - gsm_random_imei(&ms->settings); mobile_set_shutdown(ms, MS_SHUTDOWN_NONE); -- To view, visit https://gerrit.osmocom.org/12362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic89089c4850ab2c9252bfd43a05d5271e2e3a160 Gerrit-Change-Number: 12362 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:20:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 12:20:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: actualize both GSUP_SM_RP_{DA|OA} In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12304 ) Change subject: library/GSUP_Types.ttcn: actualize both GSUP_SM_RP_{DA|OA} ...................................................................... library/GSUP_Types.ttcn: actualize both GSUP_SM_RP_{DA|OA} Both GSUP_SM_RP_{DA|OA} IE definitions have been merged before the reference implementation in libosmocore. Recently it was decided to use the following structure: IEI | IE length | ID type | ID encoded data (optional) instead of: IEI | IE length | ID type | ID length | ID encoded data (optional) so, let's remove ID length from both definitions. Change-Id: I001cec53a80028ff153db3d8b0318b298f2bd8c2 --- M library/GSUP_Types.ttcn 1 file changed, 2 insertions(+), 20 deletions(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index d16b4a5..6cc6dde 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -701,10 +701,8 @@ type record GSUP_SM_RP_DA { GSUP_SM_RP_ODA_IdType id_type, - uint8_t id_len, GSUP_SM_RP_DA_ID id_enc optional -} with { variant (id_len) "LENGTHTO(id_enc)" - variant (id_enc) "CROSSTAG( +} with { variant (id_enc) "CROSSTAG( imsi, id_type = OSMO_GSUP_SM_RP_ODA_ID_IMSI; msisdn, id_type = OSMO_GSUP_SM_RP_ODA_ID_MSISDN; smsc_addr, id_type = OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR; @@ -714,45 +712,37 @@ template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_IMSI(hexstring imsi) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_IMSI, - id_len := 0, /* overwritten */ id_enc := { imsi := imsi } } template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_IMSI(template hexstring imsi) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_IMSI, - id_len := ?, id_enc := { imsi := imsi } } template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_MSISDN(hexstring msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, - id_len := 0, /* overwritten */ id_enc := { msisdn := msisdn } } template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_MSISDN(template hexstring msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, - id_len := ?, id_enc := { msisdn := msisdn } } template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_SMSC_ADDR(hexstring smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, - id_len := 0, /* overwritten */ id_enc := { smsc_addr := smsc_addr } } template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_SMSC_ADDR(template hexstring smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, - id_len := ?, id_enc := { smsc_addr := smsc_addr } } template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_NULL := { id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL, - id_len := 0, /* overwritten */ id_enc := omit } template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_NULL := { id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL, - id_len := ?, id_enc := omit } @@ -784,10 +774,8 @@ type record GSUP_SM_RP_OA { GSUP_SM_RP_ODA_IdType id_type, - uint8_t id_len, GSUP_SM_RP_OA_ID id_enc optional -} with { variant (id_len) "LENGTHTO(id_enc)" - variant (id_enc) "CROSSTAG( +} with { variant (id_enc) "CROSSTAG( msisdn, id_type = OSMO_GSUP_SM_RP_ODA_ID_MSISDN; smsc_addr, id_type = OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR; /* FIXME: how to handle noSM-RP-OA? */ @@ -796,34 +784,28 @@ template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_MSISDN(hexstring msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, - id_len := 0, /* overwritten */ id_enc := { msisdn := msisdn } } template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_MSISDN(template hexstring msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, - id_len := ?, id_enc := { msisdn := msisdn } } template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_SMSC_ADDR(hexstring smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, - id_len := 0, /* overwritten */ id_enc := { smsc_addr := smsc_addr } } template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_SMSC_ADDR(template hexstring smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, - id_len := ?, id_enc := { smsc_addr := smsc_addr } } template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_NULL := { id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL, - id_len := 0, /* overwritten */ id_enc := omit } template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_NULL := { id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL, - id_len := ?, id_enc := omit } -- To view, visit https://gerrit.osmocom.org/12304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I001cec53a80028ff153db3d8b0318b298f2bd8c2 Gerrit-Change-Number: 12304 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:21:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 12:21:46 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: drop dead SAP initialization code In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12362 ) Change subject: layer23/mobile: drop dead SAP initialization code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic89089c4850ab2c9252bfd43a05d5271e2e3a160 Gerrit-Change-Number: 12362 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 19 Dec 2018 12:21:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:22:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 12:22:08 +0000 Subject: Change in osmocom-bb[master]: layer23/mobile: drop dead SAP initialization code In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12362 ) Change subject: layer23/mobile: drop dead SAP initialization code ...................................................................... layer23/mobile: drop dead SAP initialization code SAP connection can be initialized upon request. Change-Id: Ic89089c4850ab2c9252bfd43a05d5271e2e3a160 --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 0 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index a051fba..84dec86 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -221,16 +221,6 @@ return rc; } -#if 0 - rc = sap_open(ms, ms->settings.sap_socket_path); - if (rc < 0) { - fprintf(stderr, "Failed during sap_open(), no SIM reader\n"); - ms->sap_wq.bfd.fd = -1; - mobile_exit(ms, 1); - return rc; - } -#endif - gsm_random_imei(&ms->settings); mobile_set_shutdown(ms, MS_SHUTDOWN_NONE); -- To view, visit https://gerrit.osmocom.org/12362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic89089c4850ab2c9252bfd43a05d5271e2e3a160 Gerrit-Change-Number: 12362 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:23:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 12:23:11 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: drop a bunch of dead code In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12354 ) Change subject: mgcp_client: drop a bunch of dead code ...................................................................... Patch Set 1: Code-Review-1 Since you're breaking API please update TODO-RELEASE to make sure that version is properly bumped. -- To view, visit https://gerrit.osmocom.org/12354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 Gerrit-Change-Number: 12354 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 12:23:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:26:40 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 19 Dec 2018 12:26:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: drop a bunch of dead code In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12354 ) Change subject: mgcp_client: drop a bunch of dead code ...................................................................... Patch Set 1: Code-Review+1 I think it makes sense to drop the old API now. -- To view, visit https://gerrit.osmocom.org/12354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 Gerrit-Change-Number: 12354 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 12:26:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:26:51 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 12:26:51 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12357 ) Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Please clarify. https://gerrit.osmocom.org/#/c/12357/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12357/1//COMMIT_MSG at 37 PS1, Line 37: domain bsc Does this have to match the "mgw endpoint-domain" value in osmo-bsc.cfg? What happens if they differ? -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 19 Dec 2018 12:26:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:27:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 19 Dec 2018 12:27:17 +0000 Subject: Change in osmo-msc[master]: msc_vty: also show IMEI and IMEISV In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/12343 ) Change subject: msc_vty: also show IMEI and IMEISV ...................................................................... msc_vty: also show IMEI and IMEISV When the VLR subscriber information is shown on the VTY it shows IMSI and TMSI, but not IMEI and IMEISV. Since in some cases this information might be helpful, lets display it as well. Change-Id: Iedd75dbb9850388ec1fedb984ed0b8bf4c62e780 --- M src/libmsc/msc_vty.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 3079bc3..c5d2832 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -641,6 +641,10 @@ if (vsub->tmsi_new != GSM_RESERVED_TMSI) vty_out(vty, " new TMSI: %08X%s", vsub->tmsi_new, VTY_NEWLINE); + if (vsub->imei[0] != '\0') + vty_out(vty, " IMEI: %s%s", vsub->imei, VTY_NEWLINE); + if (vsub->imeisv[0] != '\0') + vty_out(vty, " IMEISV: %s%s", vsub->imeisv, VTY_NEWLINE); vty_out(vty, " Flags: %s", VTY_NEWLINE); vty_out(vty, " IMSI detached: %s%s", -- To view, visit https://gerrit.osmocom.org/12343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iedd75dbb9850388ec1fedb984ed0b8bf4c62e780 Gerrit-Change-Number: 12343 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:52:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 12:52:49 +0000 Subject: Change in libosmocore[master]: Fix typos in SS opcode names Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12363 Change subject: Fix typos in SS opcode names ...................................................................... Fix typos in SS opcode names Change-Id: I8fa1961c85b3fd714bc8df56fe4af6be4060c208 --- M src/gsm/gsm0480.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/12363/1 diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index fab2087..01f245a 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -50,12 +50,12 @@ { GSM0480_OP_CODE_ERASE_SS, "EraseSS" }, { GSM0480_OP_CODE_ACTIVATE_SS, "ActivateSS" }, { GSM0480_OP_CODE_DEACTIVATE_SS, "DeactivateSS" }, - { GSM0480_OP_CODE_INTERROGATE_SS, "IngerrogateSS" }, + { GSM0480_OP_CODE_INTERROGATE_SS, "InterrogateSS" }, { GSM0480_OP_CODE_NOTIFY_SS, "NotifySS" }, { GSM0480_OP_CODE_REGISTER_PASSWORD, "RegisterPassword" }, { GSM0480_OP_CODE_GET_PASSWORD, "GetPassword" }, { GSM0480_OP_CODE_PROCESS_USS_DATA, "ProcessUSSD" }, - { GSM0480_OP_CODE_FORWARD_CHECK_SS_IND, "ForwardChecckSSind" }, + { GSM0480_OP_CODE_FORWARD_CHECK_SS_IND, "ForwardCheckSSind" }, { GSM0480_OP_CODE_PROCESS_USS_REQ, "ProcessUssReq" }, { GSM0480_OP_CODE_USS_REQUEST, "UssRequest" }, { GSM0480_OP_CODE_USS_NOTIFY, "UssNotify" }, -- To view, visit https://gerrit.osmocom.org/12363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8fa1961c85b3fd714bc8df56fe4af6be4060c208 Gerrit-Change-Number: 12363 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:54:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 12:54:18 +0000 Subject: Change in libosmocore[master]: Fix typos in SS opcode names In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12363 ) Change subject: Fix typos in SS opcode names ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8fa1961c85b3fd714bc8df56fe4af6be4060c208 Gerrit-Change-Number: 12363 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 19 Dec 2018 12:54:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:54:42 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 12:54:42 +0000 Subject: Change in libosmocore[master]: Fix typos in SS opcode names In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12363 ) Change subject: Fix typos in SS opcode names ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8fa1961c85b3fd714bc8df56fe4af6be4060c208 Gerrit-Change-Number: 12363 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 19 Dec 2018 12:54:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 12:56:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 12:56:15 +0000 Subject: Change in libosmocore[master]: Fix typos in SS opcode names In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12363 ) Change subject: Fix typos in SS opcode names ...................................................................... Fix typos in SS opcode names Change-Id: I8fa1961c85b3fd714bc8df56fe4af6be4060c208 --- M src/gsm/gsm0480.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Vadim Yanitskiy: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index fab2087..01f245a 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -50,12 +50,12 @@ { GSM0480_OP_CODE_ERASE_SS, "EraseSS" }, { GSM0480_OP_CODE_ACTIVATE_SS, "ActivateSS" }, { GSM0480_OP_CODE_DEACTIVATE_SS, "DeactivateSS" }, - { GSM0480_OP_CODE_INTERROGATE_SS, "IngerrogateSS" }, + { GSM0480_OP_CODE_INTERROGATE_SS, "InterrogateSS" }, { GSM0480_OP_CODE_NOTIFY_SS, "NotifySS" }, { GSM0480_OP_CODE_REGISTER_PASSWORD, "RegisterPassword" }, { GSM0480_OP_CODE_GET_PASSWORD, "GetPassword" }, { GSM0480_OP_CODE_PROCESS_USS_DATA, "ProcessUSSD" }, - { GSM0480_OP_CODE_FORWARD_CHECK_SS_IND, "ForwardChecckSSind" }, + { GSM0480_OP_CODE_FORWARD_CHECK_SS_IND, "ForwardCheckSSind" }, { GSM0480_OP_CODE_PROCESS_USS_REQ, "ProcessUssReq" }, { GSM0480_OP_CODE_USS_REQUEST, "UssRequest" }, { GSM0480_OP_CODE_USS_NOTIFY, "UssNotify" }, -- To view, visit https://gerrit.osmocom.org/12363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8fa1961c85b3fd714bc8df56fe4af6be4060c208 Gerrit-Change-Number: 12363 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 13:07:04 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 19 Dec 2018 13:07:04 +0000 Subject: Change in libosmo-sccp[master]: fix ipa_asp_fsm down state transition Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12364 Change subject: fix ipa_asp_fsm down state transition ...................................................................... fix ipa_asp_fsm down state transition Properly transition into IPA_ASP_S_DOWN from IPA_ASP_S_ACTIVE and fix the mask of legal out states from IPA_ASP_S_ACTIVE. BSC-sccplite tests are still passing with this change. Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Related: OS#3111 --- M src/xua_asp_fsm.c 1 file changed, 26 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/12364/1 diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index d6edac0..b0c672b 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -916,6 +916,28 @@ } } +static void ipa_asp_fsm_del_route(struct osmo_fsm_inst *fi) +{ + struct ipa_asp_fsm_priv *iafp = fi->priv; + struct osmo_ss7_asp *asp = iafp->asp; + struct osmo_ss7_instance *inst = asp->inst; + struct osmo_ss7_as *as = osmo_ss7_as_find_by_rctx(inst, 0); + struct osmo_ss7_route *rt; + + OSMO_ASSERT(as); + + /* find the route which we have created if we ever reached ipa_asp_fsm_wait_id_ack2 */ + rt = osmo_ss7_route_find_dpc_mask(inst->rtable_system, as->cfg.routing_key.pc, 0xffffff); + /* no route found, bail out */ + if (!rt) + return; + /* route points to different AS, bail out */ + if (rt->dest.as != as) + return; + + osmo_ss7_route_destroy(rt); + osmo_timer_del(&iafp->pong_timer); +} /* Server + Client: We're actively transmitting user data */ static void ipa_asp_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -923,7 +945,8 @@ switch (event) { case XUA_ASP_E_M_ASP_DOWN_REQ: case XUA_ASP_E_M_ASP_INACTIVE_REQ: - /* FIXME: kill ASP and (wait for) re-connect */ + ipa_asp_fsm_del_route(fi); + osmo_fsm_inst_state_chg(fi, IPA_ASP_S_DOWN, 0, 0); break; } } @@ -1025,8 +1048,7 @@ [IPA_ASP_S_ACTIVE] = { .in_event_mask = S(XUA_ASP_E_M_ASP_DOWN_REQ) | S(XUA_ASP_E_M_ASP_INACTIVE_REQ), - .out_state_mask = S(XUA_ASP_S_INACTIVE) | - S(XUA_ASP_S_DOWN), + .out_state_mask = S(IPA_ASP_S_DOWN), .name = "ASP_ACTIVE", .action = ipa_asp_fsm_active, .onenter = ipa_asp_fsm_active_onenter, @@ -1035,25 +1057,7 @@ static void ipa_asp_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { - struct ipa_asp_fsm_priv *iafp = fi->priv; - struct osmo_ss7_asp *asp = iafp->asp; - struct osmo_ss7_instance *inst = asp->inst; - struct osmo_ss7_as *as = osmo_ss7_as_find_by_rctx(inst, 0); - struct osmo_ss7_route *rt; - - OSMO_ASSERT(as); - - /* find the route which we have created if we ever reached ipa_asp_fsm_wait_id_ack2 */ - rt = osmo_ss7_route_find_dpc_mask(inst->rtable_system, as->cfg.routing_key.pc, 0xffffff); - /* no route found, bail out */ - if (!rt) - return; - /* route points to different AS, bail out */ - if (rt->dest.as != as) - return; - - osmo_ss7_route_destroy(rt); - osmo_timer_del(&iafp->pong_timer); + ipa_asp_fsm_del_route(fi); } struct osmo_fsm ipa_asp_fsm = { -- To view, visit https://gerrit.osmocom.org/12364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Gerrit-Change-Number: 12364 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 13:10:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 13:10:21 +0000 Subject: Change in osmo-hlr[master]: gsupclient: introduce osmo_gsup_client_enc_send() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: introduce osmo_gsup_client_enc_send() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 13:10:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 13:33:33 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 13:33:33 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Patch Set 2: Code-Review-1 > Unfortunately I haven't found a way to do this with spatch. > Feel free to add corrected variant of .spatch if you know how. Ok, if there is no known way to do it with spatch, why not to do it manually, by hands? What's the point of using spatch? Speed vs quality? I can update this change, if you don't mind. -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 13:33:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 13:59:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 13:59:20 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Patch Set 2: > Ok, if there is no known way to do it with spatch, why not to do it > manually, by hands? What's the point of using spatch? Speed vs > quality? > > I can update this change, if you don't mind. I agree with Vadim here -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 13:59:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 14:26:50 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 19 Dec 2018 14:26:50 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Patch Set 2: > Patch Set 2: > > > Ok, if there is no known way to do it with spatch, why not to do it > > manually, by hands? What's the point of using spatch? Speed vs > > quality? > > > > I can update this change, if you don't mind. > > I agree with Vadim here I'm confused why VERIFY() is even a macro instead of a function. Anyway, I agree that just changing the macro body to use the function would be sufficient. Would it not? -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 14:26:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 14:28:35 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 19 Dec 2018 14:28:35 +0000 Subject: Change in osmo-hlr[master]: gsupclient: introduce osmo_gsup_client_enc_send() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: introduce osmo_gsup_client_enc_send() ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 14:28:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 14:30:13 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 19 Dec 2018 14:30:13 +0000 Subject: Change in osmo-msc[master]: MNCC: use log wrapper for call processing In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12329 ) Change subject: MNCC: use log wrapper for call processing ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 19 Dec 2018 14:30:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 14:31:43 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 19 Dec 2018 14:31:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC: adjust gsup log level to error In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12298 ) Change subject: MSC: adjust gsup log level to error ...................................................................... Patch Set 1: Then perhaps the best course of action is to just leave things as they are? -- To view, visit https://gerrit.osmocom.org/12298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If79db99ceb7a9d4e2ec8d8b375aa628c4088c65c Gerrit-Change-Number: 12298 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 19 Dec 2018 14:31:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 14:49:04 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 14:49:04 +0000 Subject: Change in libosmocore[master]: Use msgb helper instead of local #define for debug print In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: Use msgb helper instead of local #define for debug print ...................................................................... Patch Set 2: > Patch Set 2: Code-Review-1 > I can update this change, if you don't mind. Sure, go ahead. -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 14:49:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 19 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 19 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#344?= In-Reply-To: <645221152.60.1545145807482.JavaMail.jenkins@jenkins.osmocom.org> References: <645221152.60.1545145807482.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1867477161.73.1545232207343.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 19 15:26:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 15:26:34 +0000 Subject: Change in osmo-msc[master]: Log MI type on request failure Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12365 Change subject: Log MI type on request failure ...................................................................... Log MI type on request failure Change-Id: I842a7471ea19a2c13ca1134c56991c0ed63cfb29 --- M src/libmsc/gsm_04_08.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/65/12365/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index dc0476b..19a6116 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -798,8 +798,8 @@ /* From vlr_proc_acc_req() we expect an implicit dispatch of PR_ARQ_E_START we expect * msc_vlr_subscr_assoc() to already have been called and completed. Has an error occured? */ if (!conn->vsub) { - LOGP(DRR, LOGL_ERROR, "%s: subscriber not allowed to do a CM Service Request\n", - mi_string); + LOGP(DRR, LOGL_ERROR, "MI(%s)=%s: subscriber not allowed to do a CM Service Request\n", + gsm48_mi_type_name(mi_type), mi_string); return -EIO; } -- To view, visit https://gerrit.osmocom.org/12365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I842a7471ea19a2c13ca1134c56991c0ed63cfb29 Gerrit-Change-Number: 12365 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 15:55:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 15:55:31 +0000 Subject: Change in osmo-bsc[master]: LCLS: log config/control update Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12366 Change subject: LCLS: log config/control update ...................................................................... LCLS: log config/control update Change-Id: Iac493014144ca0e5e1a83081e6e01ea7910deac2 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/12366/1 diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 622611d..26b3244 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -169,13 +169,17 @@ if (!lcls_is_supported_config(new_cfg_csc->config)) return NULL; if (conn->lcls.config != new_cfg_csc->config) { - /* TODO: logging */ + LOGPFSM(conn->lcls.fi, "LCLS update Config %s -> %s\n", + gsm0808_lcls_config_name(conn->lcls.config), + gsm0808_lcls_config_name(new_cfg_csc->config)); conn->lcls.config = new_cfg_csc->config; } } if (new_cfg_csc->control != GSM0808_LCLS_CSC_NA) { if (conn->lcls.control != new_cfg_csc->control) { - /* TODO: logging */ + LOGPFSM(conn->lcls.fi, "LCLS update Control %s -> %s\n", + gsm0808_lcls_control_name(conn->lcls.control), + gsm0808_lcls_control_name(new_cfg_csc->control)); conn->lcls.control = new_cfg_csc->control; } } -- To view, visit https://gerrit.osmocom.org/12366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iac493014144ca0e5e1a83081e6e01ea7910deac2 Gerrit-Change-Number: 12366 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 15:56:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 15:56:41 +0000 Subject: Change in osmo-bsc[master]: LCLS: log config/control update In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12366 ) Change subject: LCLS: log config/control update ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iac493014144ca0e5e1a83081e6e01ea7910deac2 Gerrit-Change-Number: 12366 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 19 Dec 2018 15:56:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:06:19 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 16:06:19 +0000 Subject: Change in libosmocore[master]: LCLS: use proper types for value_string wrappers Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12367 Change subject: LCLS: use proper types for value_string wrappers ...................................................................... LCLS: use proper types for value_string wrappers Change-Id: I0f47a610e06ac99bd60a5aad6f50f3658480165e --- M include/osmocom/gsm/gsm0808.h 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/12367/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 79d89e5..76b77b6 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -219,13 +219,13 @@ extern const struct value_string gsm0808_lcls_control_names[]; extern const struct value_string gsm0808_lcls_status_names[]; -static inline const char *gsm0808_lcls_config_name(uint8_t val) { +static inline const char *gsm0808_lcls_config_name(enum gsm0808_lcls_config val) { return get_value_string(gsm0808_lcls_config_names, val); } -static inline const char *gsm0808_lcls_control_name(uint8_t val) { +static inline const char *gsm0808_lcls_control_name(enum gsm0808_lcls_control val) { return get_value_string(gsm0808_lcls_control_names, val); } -static inline const char *gsm0808_lcls_status_name(uint8_t val) { +static inline const char *gsm0808_lcls_status_name(enum gsm0808_lcls_status val) { return get_value_string(gsm0808_lcls_status_names, val); } -- To view, visit https://gerrit.osmocom.org/12367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0f47a610e06ac99bd60a5aad6f50f3658480165e Gerrit-Change-Number: 12367 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:07:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 16:07:59 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12368 Change subject: abort assignment on Assignment Failure ...................................................................... abort assignment on Assignment Failure If Assignment fails in the BSC, trigger an EV_TEARDOWN_ERROR in the mgcp_ctx FSM instance, so that the call gets torn down immediately. Before this, the non-call would idle around without anything happening. Related: OS#3236 Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a --- M include/osmocom/msc/msc_mgcp.h M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 3 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/68/12368/1 diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h index 9d8b01d..fea3434 100644 --- a/include/osmocom/msc/msc_mgcp.h +++ b/include/osmocom/msc/msc_mgcp.h @@ -59,5 +59,6 @@ int msc_mgcp_call_assignment(struct gsm_trans *trans); int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr); +int msc_mgcp_ass_fail(struct ran_conn *conn); int msc_mgcp_call_complete(struct gsm_trans *trans, uint16_t port, char *addr); int msc_mgcp_call_release(struct gsm_trans *trans); diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 1ddec08..149100e 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -1072,6 +1072,22 @@ return 0; } +int msc_mgcp_ass_fail(struct ran_conn *conn) +{ + struct mgcp_ctx *mgcp_ctx; + + OSMO_ASSERT(conn); + + mgcp_ctx = conn->rtp.mgcp_ctx; + if (!mgcp_ctx) + return -EINVAL; + + LOGP(DMGCP, LOGL_DEBUG, "(subscriber:%s) assignment failed\n", vlr_subscr_name(conn->vsub)); + + osmo_fsm_inst_dispatch(mgcp_ctx->fsm, EV_TEARDOWN_ERROR, mgcp_ctx); + return 0; +} + /* Make the connection of a previously assigned call complete * Parameter: * trans: transaction context. diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 37c1d15..a00b445 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "../../bscconfig.h" #ifdef BUILD_IU @@ -123,7 +124,9 @@ /* Receive an ASSIGNMENT FAILURE from BSC */ void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause) { - LOGP(DRR, LOGL_DEBUG, "MSC assign failure (do nothing).\n"); + LOGP(DRR, LOGL_DEBUG, "MSC Assignment Failure: cause=%u rr_cause=%u.\n", + cause, rr_cause? *rr_cause : 0); + msc_mgcp_ass_fail(conn); } /* Receive a CLASSMARK CHANGE from BSC */ -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:09:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 16:09:41 +0000 Subject: Change in osmo-msc[master]: Log MI type on request failure In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12365 ) Change subject: Log MI type on request failure ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I842a7471ea19a2c13ca1134c56991c0ed63cfb29 Gerrit-Change-Number: 12365 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 19 Dec 2018 16:09:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:24:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 16:24:46 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12368 ) Change subject: abort assignment on Assignment Failure ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12368/1/src/libmsc/msc_mgcp.c File src/libmsc/msc_mgcp.c: https://gerrit.osmocom.org/#/c/12368/1/src/libmsc/msc_mgcp.c at 1085 PS1, Line 1085: LOGP(DMGCP, LOGL_DEBUG, "(subscriber:%s) assignment failed\n", vlr_subscr_name(conn->vsub)); Use at least LOGL_NOTICE or LOGL_INFO. -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 16:24:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:49:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 16:49:34 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12369 Change subject: LCLS: don't send invalid status in HO messages ...................................................................... LCLS: don't send invalid status in HO messages Change-Id: Ib2958a8613627c4e54c004ffa3578c300ed0360b --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c 2 files changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/12369/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 79d89e5..ccecda4 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -157,7 +157,6 @@ bool chosen_channel_present; uint8_t chosen_channel; - bool lcls_bss_status_present; enum gsm0808_lcls_status lcls_bss_status; /* more items are defined in the spec and may be added later */ @@ -194,7 +193,6 @@ bool speech_codec_chosen_present; struct gsm0808_speech_codec speech_codec_chosen; - bool lcls_bss_status_present; enum gsm0808_lcls_status lcls_bss_status; /* more items are defined in the spec and may be added later */ diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 69da57d..192c0be 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -898,7 +898,7 @@ msgb_tv_put(msg, GSM0808_IE_CHOSEN_ENCR_ALG, params->chosen_encr_alg); /* LCLS-BSS-Status 3.2.2.119 */ - if (params->lcls_bss_status_present) + if (params->lcls_bss_status != GSM0808_LCLS_STS_NA) msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, params->lcls_bss_status); /* prepend header with final length */ @@ -974,7 +974,7 @@ gsm0808_enc_speech_codec(msg, ¶ms->speech_codec_chosen); /* LCLS-BSS-Status 3.2.2.119 */ - if (params->lcls_bss_status_present) + if (params->lcls_bss_status != GSM0808_LCLS_STS_NA) msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, params->lcls_bss_status); /* prepend header with final length */ -- To view, visit https://gerrit.osmocom.org/12369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2958a8613627c4e54c004ffa3578c300ed0360b Gerrit-Change-Number: 12369 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:49:35 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 16:49:35 +0000 Subject: Change in libosmocore[master]: LCLC: fix doc to match type signature Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12370 Change subject: LCLC: fix doc to match type signature ...................................................................... LCLC: fix doc to match type signature Change-Id: I8f7b3dca080ef0e632d47a907154f8404b0ec523 --- M src/gsm/gsm0808_utils.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/12370/1 diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index a04adde..aa0d3d7 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -526,8 +526,7 @@ /*! Decode BSSMAP Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1. * \param[out] gcr Caller-provided memory to store Global Call Reference - * \param[in] elem IE value to be decoded - * \param[in] len Length of \a elem in bytes + * \param[in] tp IE values to be decoded * \returns number of bytes parsed; negative on error */ int gsm0808_dec_gcr(struct osmo_gcr_parsed *gcr, const struct tlv_parsed *tp) { -- To view, visit https://gerrit.osmocom.org/12370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8f7b3dca080ef0e632d47a907154f8404b0ec523 Gerrit-Change-Number: 12370 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:50:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 16:50:38 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: drop a bunch of dead code In-Reply-To: References: Message-ID: Hello dexter, Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12354 to look at the new patch set (#2). Change subject: mgcp_client: drop a bunch of dead code ...................................................................... mgcp_client: drop a bunch of dead code Remove public API that makes no sense anymore and is dead code. I see the dropped API as a dead-end initial misconception of the early mgcp client, and it doesn't really make sense to drag this stuff along. It has not been used by osmo-msc,-bsc for a long time now, and just confuses the reader. It is public API, yes, and older versions of osmo-msc / osmo-bsc will not be able to compile against this, but even if it did, the resulting MGCP client would not work with the current osmo-mgw: this API is still based on the premise that the MGCP client dictates the MGW endpoint numbers, a concept that cannot be used with the current osmo-mgw. Instead, osmo-mgw expects a wildcarded endpoint upon CRCX and assigns its own endpoint names. Also, the bts-base configuration is unused and a legacy of when osmo-bsc_mgcp had explicit BTS and CN sides. Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 --- M TODO-RELEASE M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_vty.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 7 files changed, 12 insertions(+), 415 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/54/12354/2 -- To view, visit https://gerrit.osmocom.org/12354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 Gerrit-Change-Number: 12354 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:50:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 16:50:56 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: logging tweaks In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12270 ) Change subject: mgcp_client: logging tweaks ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12270/1/src/libosmo-mgcp-client/mgcp_client.c File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/#/c/12270/1/src/libosmo-mgcp-client/mgcp_client.c at 851 PS1, Line 851: LOGP(DLMGCP, LOGL_INFO, "MGCP GW connection: %s\n", osmo_sock_get_name2(wq->bfd.fd)); > Why issuing a syscall if we already have the information stored in a struct? yeah, true, but it is just one single syscall at program startup, once for the entire osmo-bsc/osmo-msc lifetime. The benefit: use the same formatting as other logging does, and no mistakes possible from string juggling. -- To view, visit https://gerrit.osmocom.org/12270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae728192f499330d16836d9435648f6b8ed213b6 Gerrit-Change-Number: 12270 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 16:50:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:52:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 16:52:15 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: drop a bunch of dead code In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12354 ) Change subject: mgcp_client: drop a bunch of dead code ...................................................................... Patch Set 2: > Since you're breaking API please update TODO-RELEASE to make sure that version is properly bumped. Asked Pau on IRC and he said not listing individual items is fine, so just writing "various" here. -- To view, visit https://gerrit.osmocom.org/12354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 Gerrit-Change-Number: 12354 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 16:52:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:52:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 16:52:43 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: drop a bunch of dead code In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12354 ) Change subject: mgcp_client: drop a bunch of dead code ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12354/2/TODO-RELEASE File TODO-RELEASE: https://gerrit.osmocom.org/#/c/12354/2/TODO-RELEASE at 27 PS2, Line 27: libosmo-mgcp-client various Drop legacy API functions and mgcp_client_conf members I mean here -- To view, visit https://gerrit.osmocom.org/12354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 Gerrit-Change-Number: 12354 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 16:52:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:53:37 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 16:53:37 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: drop a bunch of dead code In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12354 ) Change subject: mgcp_client: drop a bunch of dead code ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 Gerrit-Change-Number: 12354 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 16:53:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:55:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 16:55:33 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12369 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12369/1/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/12369/1/include/osmocom/gsm/gsm0808.h at a160 PS1, Line 160: So those were never set to 1? then status was never sent? -- To view, visit https://gerrit.osmocom.org/12369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2958a8613627c4e54c004ffa3578c300ed0360b Gerrit-Change-Number: 12369 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 16:55:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:55:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 16:55:50 +0000 Subject: Change in libosmocore[master]: LCLC: fix doc to match type signature In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12370 ) Change subject: LCLC: fix doc to match type signature ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8f7b3dca080ef0e632d47a907154f8404b0ec523 Gerrit-Change-Number: 12370 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 16:55:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:57:00 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 16:57:00 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12369 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12369/1/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/12369/1/include/osmocom/gsm/gsm0808.h at a160 PS1, Line 160: > So those were never set to 1? then status was never sent? AFAIK, yes. @dexter? -- To view, visit https://gerrit.osmocom.org/12369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2958a8613627c4e54c004ffa3578c300ed0360b Gerrit-Change-Number: 12369 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 16:57:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:57:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 16:57:38 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: logging tweaks In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12270 ) Change subject: mgcp_client: logging tweaks ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae728192f499330d16836d9435648f6b8ed213b6 Gerrit-Change-Number: 12270 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 16:57:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 16:58:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 16:58:16 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_vty: fix missing talloc_free In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12355 to look at the new patch set (#2). Change subject: mgcp_client_vty: fix missing talloc_free ...................................................................... mgcp_client_vty: fix missing talloc_free If the vty client enters multiple local / remote addresses, that leaks talloc memory of the previously set addresses. Free those first, if any, using osmo_talloc_replace_string(). Change-Id: I331b3d53b5eb330b87d798f952077a043674d409 --- M src/libosmo-mgcp-client/mgcp_client_vty.c 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/55/12355/2 -- To view, visit https://gerrit.osmocom.org/12355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I331b3d53b5eb330b87d798f952077a043674d409 Gerrit-Change-Number: 12355 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 17:01:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 17:01:58 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: drop a bunch of dead code In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12354 ) Change subject: mgcp_client: drop a bunch of dead code ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 Gerrit-Change-Number: 12354 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 19 Dec 2018 17:01:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 17:03:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 17:03:08 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_vty: fix missing talloc_free In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12355 ) Change subject: mgcp_client_vty: fix missing talloc_free ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12355/2/src/libosmo-mgcp-client/mgcp_client_vty.c File src/libosmo-mgcp-client/mgcp_client_vty.c: https://gerrit.osmocom.org/#/c/12355/2/src/libosmo-mgcp-client/mgcp_client_vty.c at 47 PS2, Line 47: (char**)&global_mgcp_client_conf->local_addr, Why is this cast needed? isn't local_addr a char*? -- To view, visit https://gerrit.osmocom.org/12355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I331b3d53b5eb330b87d798f952077a043674d409 Gerrit-Change-Number: 12355 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 17:03:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 17:12:16 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 19 Dec 2018 17:12:16 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12369 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 1: (2 comments) > (1 comment) https://gerrit.osmocom.org/#/c/12369/1/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/12369/1/include/osmocom/gsm/gsm0808.h at a160 PS1, Line 160: > AFAIK, yes. [?] When the _present flag is set to false, then the related value is not sent. https://gerrit.osmocom.org/#/c/12369/1/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/12369/1/src/gsm/gsm0808.c at 901 PS1, Line 901: if (params->lcls_bss_status != GSM0808_LCLS_STS_NA) I am not sure if this is a good idea. GSM0808_LCLS_STS_NA = 0xFF, so one must never forget to initialize the field when creating the message. However, in the end its a matter of taste anyway. -- To view, visit https://gerrit.osmocom.org/12369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2958a8613627c4e54c004ffa3578c300ed0360b Gerrit-Change-Number: 12369 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 17:12:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 17:13:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 17:13:23 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12357 ) Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12357/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12357/1//COMMIT_MSG at 37 PS1, Line 37: domain bsc > Does this have to match the "mgw endpoint-domain" value in osmo-bsc. [?] of course. The server already allows changing the expected domain name, but the client does not until this patch gets merged. This patch does not affect the server side, only the client. The default expected one is 'mgw', but you can set '*' to accept any (which was added for SCCPlite, where the MSC tested actually sent an IP address) DEFUN(cfg_mgcp_domain, cfg_mgcp_domain_cmd, "domain NAME", "Set the domain part expected in MGCP messages' endpoint names\n" "Qualified domain name expected in MGCP endpoint names, or '*' to accept any domain\n") What happens if they differ: osmo-mgw rejects the CRCX. It's all up to your .cfg files. Actually, to do it really right, the goal would be to have that domain name match the actual server domain name and/or any IP addresses it listens on. This patch is mere cosmetics to improve the context and help analyse RTP streams. In the long run, we might place the 'mgw remote-addr' in there as endpoint-domain by default, and setting this endpoint-domain could manually override that; osmo-mgw could accept all with '*' or compare to the interface the MGCP was received on / have a list of accepted domains... But there isn't really a benefit to that, so I doubt that we will need that ever, really. -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 19 Dec 2018 17:13:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 17:16:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 17:16:47 +0000 Subject: Change in osmo-mgw[master]: osmo-mgw: err-log: include expected domain name In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12356 ) Change subject: osmo-mgw: err-log: include expected domain name ...................................................................... osmo-mgw: err-log: include expected domain name Add the expected domain name, and move the error log to where the expected domain name is compared. Change-Id: I59f40dc9263f686852f103ca904fc0a6702d7c8e --- M src/libosmo-mgcp/mgcp_msg.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index 648d86b..f98b9ee 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -223,8 +223,10 @@ if (!strcmp(cfg->domain, "*")) return 0; - if (strcmp(domain_to_check+1, cfg->domain) != 0) + if (strcmp(domain_to_check+1, cfg->domain) != 0) { + LOGP(DLMGCP, LOGL_ERROR, "Wrong domain name '%s', expecting '%s'\n", mgcp, cfg->domain); return -EINVAL; + } return 0; } @@ -244,7 +246,6 @@ /* Check if the domainname in the request is correct */ if (check_domain_name(cfg, mgcp)) { - LOGP(DLMGCP, LOGL_ERROR, "Wrong domain name '%s'\n", mgcp); *cause = -500; return NULL; } -- To view, visit https://gerrit.osmocom.org/12356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I59f40dc9263f686852f103ca904fc0a6702d7c8e Gerrit-Change-Number: 12356 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 17:17:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 17:17:06 +0000 Subject: Change in osmo-msc[master]: fix msc_mgcp_fsm_evt_names: two missing events In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12359 ) Change subject: fix msc_mgcp_fsm_evt_names: two missing events ...................................................................... fix msc_mgcp_fsm_evt_names: two missing events Change-Id: I66ebaf0a55de1a46bccbc86652ffa9b73c951ebf --- M src/libmsc/msc_mgcp.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 1ddec08..bf9ba93 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -144,6 +144,8 @@ OSMO_VALUE_STRING(EV_TEARDOWN_ERROR), OSMO_VALUE_STRING(EV_CRCX_RAN_RESP), OSMO_VALUE_STRING(EV_CRCX_CN_RESP), + OSMO_VALUE_STRING(EV_MDCX_RAN_RESP), + OSMO_VALUE_STRING(EV_MDCX_CN_RESP), OSMO_VALUE_STRING(EV_DLCX_ALL_RESP), {0, NULL} }; -- To view, visit https://gerrit.osmocom.org/12359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I66ebaf0a55de1a46bccbc86652ffa9b73c951ebf Gerrit-Change-Number: 12359 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 17:17:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 17:17:07 +0000 Subject: Change in osmo-msc[master]: mgcp log tweak: say RAN, not BTS, like surrounding logging In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12360 ) Change subject: mgcp log tweak: say RAN, not BTS, like surrounding logging ...................................................................... mgcp log tweak: say RAN, not BTS, like surrounding logging Change-Id: Ibb40155189a7f05ba2da4fcf9cf03fda5ffc3683 --- M src/libmsc/msc_mgcp.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Max: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index bf9ba93..71f36b3 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -375,7 +375,7 @@ return; } - LOGPFSML(mgcp_ctx->fsm, LOGL_DEBUG, "CRCX/BTS: MGW responded with address %s:%u\n", r->audio_ip, r->audio_port); + LOGPFSML(mgcp_ctx->fsm, LOGL_DEBUG, "CRCX/RAN: MGW responded with address %s:%u\n", r->audio_ip, r->audio_port); conn->rtp.local_port_ran = r->audio_port; osmo_strlcpy(conn->rtp.local_addr_ran, r->audio_ip, sizeof(conn->rtp.local_addr_ran)); -- To view, visit https://gerrit.osmocom.org/12360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibb40155189a7f05ba2da4fcf9cf03fda5ffc3683 Gerrit-Change-Number: 12360 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 17:49:33 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 17:49:33 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_vty: fix missing talloc_free In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12355 ) Change subject: mgcp_client_vty: fix missing talloc_free ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12355/2/src/libosmo-mgcp-client/mgcp_client_vty.c File src/libosmo-mgcp-client/mgcp_client_vty.c: https://gerrit.osmocom.org/#/c/12355/2/src/libosmo-mgcp-client/mgcp_client_vty.c at 47 PS2, Line 47: (char**)&global_mgcp_client_conf->local_addr, > Why is this cast needed? isn't local_addr a char*? Probably, 'const char *' vs 'char *'? -- To view, visit https://gerrit.osmocom.org/12355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I331b3d53b5eb330b87d798f952077a043674d409 Gerrit-Change-Number: 12355 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 17:49:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 17:59:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 19 Dec 2018 17:59:16 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12369 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12369/1/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/12369/1/include/osmocom/gsm/gsm0808.h at a160 PS1, Line 160: > When the _present flag is set to false, then the related value is not sent. Is this bit then set by the user of the API? If there's users using this API, we should modify them too. If not, then this code was wrong since this value was always false. BTW, we are breaking the API/ABI here. Was this field added after last release? If that's not the case, I see no good reason for breaking the ABI here. -- To view, visit https://gerrit.osmocom.org/12369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2958a8613627c4e54c004ffa3578c300ed0360b Gerrit-Change-Number: 12369 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 19 Dec 2018 17:59:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:04:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 18:04:14 +0000 Subject: Change in libosmocore[master]: LCLS: enc/dec entire parameter set instead of GCR Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12371 Change subject: LCLS: enc/dec entire parameter set instead of GCR ...................................................................... LCLS: enc/dec entire parameter set instead of GCR In 3GPP TS 48.008 the Global Call Reference IE is only used in HANDOVER REQUEST (?3.2.1.8) and ASSIGNMENT REQUEST (?3.2.1.1) messages which also include LCLS Config and CSC parameters. Hence, there's no point in using GCR encode/decode functions alone. Introduce gsm0808_dec_lcls() and gsm0808_enc_lcls() as trivial wrappers on top of GCR enc/dec routines which are made static. Adjust tests accordingly. Test output intentionally left unchanged. Change-Id: Icfbb2404e1a1d500243e2071173299b557369335 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c 5 files changed, 78 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/12371/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 22050b5..4a2233e 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -84,8 +84,8 @@ int gsm0808_dec_aoip_trasp_addr(struct sockaddr_storage *ss, const uint8_t *elem, uint8_t len); -uint8_t gsm0808_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g); -int gsm0808_dec_gcr(struct osmo_gcr_parsed *g, const struct tlv_parsed *tp); +uint8_t gsm0808_enc_lcls(struct msgb *msg, const struct osmo_lcls *lcls); +int gsm0808_dec_lcls(struct osmo_lcls *lcls, const struct tlv_parsed *tp); uint8_t gsm0808_enc_speech_codec(struct msgb *msg, const struct gsm0808_speech_codec *sc); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 192c0be..289262e 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -488,23 +488,8 @@ if (kc) msgb_tv_fixed_put(msg, GSM0808_IE_KC_128, 16, kc); - if (lcls) { - /* LCLS: ?3.2.2.115 Global Call Reference */ - if (lcls->gcr) - gsm0808_enc_gcr(msg, lcls->gcr); - - /* LCLS: ?3.2.2.116 Configuration */ - if (lcls->config != GSM0808_LCLS_CFG_NA) - msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, lcls->config); - - /* LCLS: ?3.2.2.117 Connection Status Control */ - if (lcls->control != GSM0808_LCLS_CSC_NA) - msgb_tv_put(msg, GSM0808_IE_LCLS_CONN_STATUS_CTRL, lcls->control); - - /* LCLS: ?3.2.2.118 Correlation-Not-Needed */ - if (!lcls->corr_needed) - msgb_v_put(msg, GSM0808_IE_LCLS_CORR_NOT_NEEDED); - } + if (lcls) + gsm0808_enc_lcls(msg, lcls); /* push the bssmap header */ msg->l3h = diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index aa0d3d7..2a458c3 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -512,7 +512,7 @@ * \param[out] msg Message Buffer for appending IE * \param[in] g Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1 * \returns number of bytes added to \a msg or 0 on error */ -uint8_t gsm0808_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g) +static uint8_t gsm0808_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g) { uint8_t enc, *len = msgb_tl_put(msg, GSM0808_IE_GLOBAL_CALL_REF); @@ -528,7 +528,7 @@ * \param[out] gcr Caller-provided memory to store Global Call Reference * \param[in] tp IE values to be decoded * \returns number of bytes parsed; negative on error */ -int gsm0808_dec_gcr(struct osmo_gcr_parsed *gcr, const struct tlv_parsed *tp) +static int gsm0808_dec_gcr(struct osmo_gcr_parsed *gcr, const struct tlv_parsed *tp) { int ret; const uint8_t *buf = TLVP_VAL_MINLEN(tp, GSM0808_IE_GLOBAL_CALL_REF, OSMO_GCR_MIN_LEN); @@ -542,6 +542,56 @@ return 2 + ret; } +/*! Add LCLS parameters to a given msgb, 3GPP TS 48.008 ?3.2.2.115 - 3.2.2.120. + * \param[out] msg Message Buffer for appending IE + * \param[in] lcls LCLS-related data + * \returns number of bytes added to \a msg or 0 on error */ +uint8_t gsm0808_enc_lcls(struct msgb *msg, const struct osmo_lcls *lcls) +{ + uint8_t enc = 0; + + /* LCLS: ?3.2.2.115 Global Call Reference */ + if (lcls->gcr) + enc = gsm0808_enc_gcr(msg, lcls->gcr); + + /* LCLS: ?3.2.2.116 Configuration */ + if (lcls->config != GSM0808_LCLS_CFG_NA) { + msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, lcls->config); + enc += 2; + } + + /* LCLS: ?3.2.2.117 Connection Status Control */ + if (lcls->control != GSM0808_LCLS_CSC_NA) { + msgb_tv_put(msg, GSM0808_IE_LCLS_CONN_STATUS_CTRL, lcls->control); + enc += 2; + } + + /* LCLS: ?3.2.2.118 Correlation-Not-Needed */ + if (!lcls->corr_needed) { + msgb_v_put(msg, GSM0808_IE_LCLS_CORR_NOT_NEEDED); + enc++; + } + + return enc; +} + +/*! Decode LCLS parameters to a given msgb, 3GPP TS 48.008 ?3.2.2.115 - 3.2.2.120. + * \param[out] lcls Caller-provided memory to store LCLS-related data + * \param[in] tp IE values to be decoded + * \returns GCR size or negative on error */ +int gsm0808_dec_lcls(struct osmo_lcls *lcls, const struct tlv_parsed *tp) +{ + int ret = gsm0808_dec_gcr(lcls->gcr, tp); + if (ret < 0) + return ret; + + lcls->config = tlvp_val8(tp, GSM0808_IE_LCLS_CONFIG, GSM0808_LCLS_CFG_NA); + lcls->control = tlvp_val8(tp, GSM0808_IE_LCLS_CONN_STATUS_CTRL, GSM0808_LCLS_CSC_NA); + lcls->corr_needed = TLVP_PRESENT(tp, GSM0808_IE_LCLS_CORR_NOT_NEEDED) ? false : true; + + return ret; +} + /*! Encode TS 08.08 Encryption Information IE * \param[out] msg Message Buffer to which IE is to be appended * \param[in] ei Encryption Information to be encoded diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 90c2195..76b3fd0 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -220,8 +220,8 @@ gsm0808_lcls_config_names; gsm0808_lcls_control_names; gsm0808_lcls_status_names; -gsm0808_enc_gcr; -gsm0808_dec_gcr; +gsm0808_enc_lcls; +gsm0808_dec_lcls; gsm29118_msgb_alloc; gsm29118_create_alert_req; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 46169ea..2caae30 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -676,7 +676,7 @@ msgb_free(in_msg); } -static void test_enc_dec_gcr() +static void test_enc_dec_lcls() { static const uint8_t res[] = { GSM0808_IE_GLOBAL_CALL_REF, @@ -698,11 +698,18 @@ }; int rc; struct tlv_parsed tp; - msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "global call reference"); + struct osmo_lcls lcls_out = { .gcr = &p }, lcls_in = { + .gcr = &g, + .config = GSM0808_LCLS_CFG_NA, + .control = GSM0808_LCLS_CSC_NA, + .corr_needed = true, + }; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "LCLS IE"); if (!msg) return; - len = gsm0808_enc_gcr(msg, &g); + len = gsm0808_enc_lcls(msg, &lcls_in); printf("Testing Global Call Reference IE encoder...\n\t%d bytes added: %s\n", len, len == ARRAY_SIZE(res) ? "OK" : "FAIL"); @@ -715,29 +722,29 @@ abort(); } - rc = gsm0808_dec_gcr(&p, &tp); + rc = gsm0808_dec_lcls(&lcls_out, &tp); if (rc < 0) { printf("decoding failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); abort(); } - if (p.net_len != g.net_len) { - printf("Network ID length parsed wrong: %u != %u\n", p.net_len, g.net_len); + if (lcls_out.gcr->net_len != g.net_len) { + printf("Network ID length parsed wrong: %u != %u\n", lcls_out.gcr->net_len, g.net_len); abort(); } - if (p.node != g.node) { - printf("Node ID parsed wrong: 0x%X != 0x%X\n", p.node, g.node); + if (lcls_out.gcr->node != g.node) { + printf("Node ID parsed wrong: 0x%X != 0x%X\n", lcls_out.gcr->node, g.node); abort(); } - if (memcmp(p.net, g.net, g.net_len) != 0) { - printf("Network ID parsed wrong: %s\n", osmo_hexdump(p.net, p.net_len)); + if (memcmp(lcls_out.gcr->net, g.net, g.net_len) != 0) { + printf("Network ID parsed wrong: %s\n", osmo_hexdump(lcls_out.gcr->net, lcls_out.gcr->net_len)); abort(); } - if (memcmp(p.cr, g.cr, 5) != 0) { - printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(p.cr, 5)); + if (memcmp(lcls_out.gcr->cr, g.cr, 5) != 0) { + printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(lcls_out.gcr->cr, 5)); abort(); } @@ -1967,7 +1974,7 @@ test_create_dtap(); test_prepend_dtap(); - test_enc_dec_gcr(); + test_enc_dec_lcls(); test_enc_dec_aoip_trasp_addr_v4(); test_enc_dec_aoip_trasp_addr_v6(); -- To view, visit https://gerrit.osmocom.org/12371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icfbb2404e1a1d500243e2071173299b557369335 Gerrit-Change-Number: 12371 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:04:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 18:04:15 +0000 Subject: Change in libosmocore[master]: TLV: fix doc copy-paste error Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12372 Change subject: TLV: fix doc copy-paste error ...................................................................... TLV: fix doc copy-paste error Change-Id: I8aa79cab7505585de00ee2aaae125462108906e8 --- M include/osmocom/gsm/tlv.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/12372/1 diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index 51bedd6..4c39264 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -489,7 +489,7 @@ * \param[in] _tp pointer to \ref tlv_parsed. * \param[in] tag IE tag to return. * \param[in] min_len Minimum value length in bytes. - * \returns struct tlv_p_entry pointer, or NULL if not present or too short. + * \returns const uint8_t pointer to value, or NULL if not present or too short. */ #define TLVP_VAL_MINLEN(_tp, tag, min_len) \ (TLVP_PRES_LEN(_tp, tag, min_len)? (_tp)->lv[tag].val : NULL) -- To view, visit https://gerrit.osmocom.org/12372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8aa79cab7505585de00ee2aaae125462108906e8 Gerrit-Change-Number: 12372 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:04:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 18:04:15 +0000 Subject: Change in libosmocore[master]: TLV: add convenience function for 1-byte values Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12373 Change subject: TLV: add convenience function for 1-byte values ...................................................................... TLV: add convenience function for 1-byte values Similar to existing 16 and 32 bit value helpers but simpler because we don't have to worry about alingment and endianness. Change-Id: Ic0a148bd04b8860e321f509fdcd913f688c8e920 --- M include/osmocom/gsm/tlv.h 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/12373/1 diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index 4c39264..621a282 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -495,6 +495,22 @@ (TLVP_PRES_LEN(_tp, tag, min_len)? (_tp)->lv[tag].val : NULL) +/*! Obtain 1-byte TLV element + * \param[in] tp pointer to \ref tlv_parsed + * \param[in] tag the Tag to look for + * \param[in] default_val default value to use if tag not available + * \returns the 1st byte of value with a given tag or default_val if tag was not found + */ +static inline uint8_t tlvp_val8(const struct tlv_parsed *tp, uint8_t tag, uint8_t default_val) +{ + const uint8_t *res = TLVP_VAL_MINLEN(tp, tag, 1); + + if (res) + return res[0]; + + return default_val; +} + /*! Align given TLV element with 16 bit value to an even address * \param[in] tp pointer to \ref tlv_parsed * \param[in] pos element to return -- To view, visit https://gerrit.osmocom.org/12373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0a148bd04b8860e321f509fdcd913f688c8e920 Gerrit-Change-Number: 12373 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:08:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 18:08:05 +0000 Subject: Change in osmo-hlr[master]: gsupclient: introduce osmo_gsup_client_enc_send() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: introduce osmo_gsup_client_enc_send() ...................................................................... Patch Set 7: Code-Review+1 (3 comments) if you like, fix the doc first https://gerrit.osmocom.org/#/c/11989/4/src/gsupclient/gsup_client.c File src/gsupclient/gsup_client.c: https://gerrit.osmocom.org/#/c/11989/4/src/gsupclient/gsup_client.c at 366 PS4, Line 366: * \returns 0 in case of success, otherwise -errno > Ok. osmo_gsup_client_{send,encode}() both return negative on error, and you're returning their rc, so this should also say "negative" https://gerrit.osmocom.org/#/c/11989/4/src/gsupclient/gsup_client.c at 381 PS4, Line 381: if (rc) { > > to make reading code easier. [?] if (rc) is fine https://gerrit.osmocom.org/#/c/11989/4/src/gsupclient/gsup_client.c at 387 PS4, Line 387: if (rc) { > And here too. It's a common practice to expect 0 and nothing else. if (rc) is fine -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 18:08:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:12:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 18:12:16 +0000 Subject: Change in osmo-hlr[master]: gsupclient: introduce osmo_gsup_client_enc_send() In-Reply-To: References: Message-ID: Hello Stefan Sperling, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11989 to look at the new patch set (#8). Change subject: gsupclient: introduce osmo_gsup_client_enc_send() ...................................................................... gsupclient: introduce osmo_gsup_client_enc_send() Several parts of OsmoMSC (e.g. GSM 04.11, 09.11, etc.) are dealing with GSUP message encoding and sending towards OsmoHLR. In order to avoid code duplication, let's have a shared function here. Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f --- M include/osmocom/gsupclient/gsup_client.h M src/gsupclient/gsup_client.c 2 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/89/11989/8 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:16:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 18:16:13 +0000 Subject: Change in osmo-hlr[master]: gsupclient: introduce osmo_gsup_client_enc_send() In-Reply-To: References: Message-ID: Hello Stefan Sperling, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11989 to look at the new patch set (#9). Change subject: gsupclient: introduce osmo_gsup_client_enc_send() ...................................................................... gsupclient: introduce osmo_gsup_client_enc_send() Several parts of OsmoMSC (e.g. GSM 04.11, 09.11, etc.) are dealing with GSUP message encoding and sending towards OsmoHLR. In order to avoid code duplication, let's have a shared function here. Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f --- M include/osmocom/gsupclient/gsup_client.h M src/gsupclient/gsup_client.c 2 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/89/11989/9 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:20:43 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 19 Dec 2018 18:20:43 +0000 Subject: Change in osmo-hlr[master]: gsupclient: introduce osmo_gsup_client_enc_send() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: introduce osmo_gsup_client_enc_send() ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 18:20:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:28:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 18:28:04 +0000 Subject: Change in osmo-hlr[master]: gsupclient: introduce osmo_gsup_client_enc_send() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: introduce osmo_gsup_client_enc_send() ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 18:28:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:28:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 18:28:14 +0000 Subject: Change in osmo-hlr[master]: gsupclient: introduce osmo_gsup_client_enc_send() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: introduce osmo_gsup_client_enc_send() ...................................................................... gsupclient: introduce osmo_gsup_client_enc_send() Several parts of OsmoMSC (e.g. GSM 04.11, 09.11, etc.) are dealing with GSUP message encoding and sending towards OsmoHLR. In order to avoid code duplication, let's have a shared function here. Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f --- M include/osmocom/gsupclient/gsup_client.h M src/gsupclient/gsup_client.c 2 files changed, 39 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, approved diff --git a/include/osmocom/gsupclient/gsup_client.h b/include/osmocom/gsupclient/gsup_client.h index 95163cd..154e3e0 100644 --- a/include/osmocom/gsupclient/gsup_client.h +++ b/include/osmocom/gsupclient/gsup_client.h @@ -24,6 +24,7 @@ #include #include #include +#include /* a loss of GSUP between MSC and HLR is considered quite serious, let's try to recover as quickly as * possible. Even one new connection attempt per second should be quite acceptable until the link is @@ -70,5 +71,7 @@ void osmo_gsup_client_destroy(struct osmo_gsup_client *gsupc); int osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg); +int osmo_gsup_client_enc_send(struct osmo_gsup_client *gsupc, + const struct osmo_gsup_message *gsup_msg); struct msgb *osmo_gsup_client_msgb_alloc(void); diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c index f259bdc..c8408fd 100644 --- a/src/gsupclient/gsup_client.c +++ b/src/gsupclient/gsup_client.c @@ -360,6 +360,42 @@ return 0; } +/*! Encode and send a GSUP message. + * \param[in] gsupc GSUP client. + * \param[in] gsup_msg GSUP message to be sent. + * \returns 0 in case of success, negative on error. + */ +int osmo_gsup_client_enc_send(struct osmo_gsup_client *gsupc, + const struct osmo_gsup_message *gsup_msg) +{ + struct msgb *gsup_msgb; + int rc; + + gsup_msgb = osmo_gsup_client_msgb_alloc(); + if (!gsup_msgb) { + LOGP(DLGSUP, LOGL_ERROR, "Couldn't allocate GSUP message\n"); + return -ENOMEM; + } + + rc = osmo_gsup_encode(gsup_msgb, gsup_msg); + if (rc) { + LOGP(DLGSUP, LOGL_ERROR, "Couldn't encode GSUP message\n"); + goto error; + } + + rc = osmo_gsup_client_send(gsupc, gsup_msgb); + if (rc) { + LOGP(DLGSUP, LOGL_ERROR, "Couldn't send GSUP message\n"); + goto error; + } + + return 0; + +error: + talloc_free(gsup_msgb); + return rc; +} + struct msgb *osmo_gsup_client_msgb_alloc(void) { return msgb_alloc_headroom(4000, 64, __func__); -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:30:50 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 19 Dec 2018 18:30:50 +0000 Subject: Change in libosmocore[master]: rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12374 Change subject: rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI ...................................................................... rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI The name "LAI AND LAC" makes no sense because a LAC is part of a LAI. Keep the old name available for API backwards compatibility. Change-Id: I2749cf75b7b45de0cd43cf4c696a6b6984f5a065 Related: OS#3124 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/74/12374/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index cb9fe01..676d1cf 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -18,14 +18,15 @@ CELL_IDENT_LAC_AND_CI = 1, CELL_IDENT_CI = 2, CELL_IDENT_NO_CELL = 3, - CELL_IDENT_LAI_AND_LAC = 4, + CELL_IDENT_LAI = 4, CELL_IDENT_LAC = 5, CELL_IDENT_BSS = 6, CELL_IDENT_UTRAN_PLMN_LAC_RNC = 8, CELL_IDENT_UTRAN_RNC = 9, CELL_IDENT_UTRAN_LAC_RNC = 10, }; - +/* Keep this misnamed CELL_IDENT for API backwards compatibility (see OS#3124). */ +#define CELL_IDENT_LAI_AND_LAC CELL_IDENT_LAI /* GSM 08.06 ? 6.3 */ enum BSSAP_MSG_TYPE { -- To view, visit https://gerrit.osmocom.org/12374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2749cf75b7b45de0cd43cf4c696a6b6984f5a065 Gerrit-Change-Number: 12374 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:38:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 18:38:49 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_vty: fix missing talloc_free In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12355 ) Change subject: mgcp_client_vty: fix missing talloc_free ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12355/2/src/libosmo-mgcp-client/mgcp_client_vty.c File src/libosmo-mgcp-client/mgcp_client_vty.c: https://gerrit.osmocom.org/#/c/12355/2/src/libosmo-mgcp-client/mgcp_client_vty.c at 47 PS2, Line 47: (char**)&global_mgcp_client_conf->local_addr, > Probably, 'const char *' vs 'char *'? yea the struct defines it as const, and that won't go with talloc. It should have been a char[] from the start, but probably not worth the trouble to change that -- To view, visit https://gerrit.osmocom.org/12355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I331b3d53b5eb330b87d798f952077a043674d409 Gerrit-Change-Number: 12355 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 18:38:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:39:06 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 18:39:06 +0000 Subject: Change in libosmocore[master]: LCLS: don't encode incorrect values Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12375 Change subject: LCLS: don't encode incorrect values ...................................................................... LCLS: don't encode incorrect values Change-Id: I9ac4bae75f5796e6e11346b8cb34d3897ae70b59 --- M src/gsm/gsm0808.c 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/12375/1 diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 69da57d..0f9e8df 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -335,8 +335,12 @@ * \returns callee-allocated msgb with BSSMAP LCLS NOTIFICATION */ struct msgb *gsm0808_create_lcls_conn_ctrl_ack(enum gsm0808_lcls_status status) { - struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, - "bssmap: LCLS CONN CTRL ACK"); + struct msgb *msg; + + if (status == GSM0808_LCLS_STS_NA) + return NULL; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "bssmap: LCLS CONN CTRL ACK"); if (!msg) return NULL; @@ -353,8 +357,12 @@ * \returns callee-allocated msgb with BSSMAP LCLS NOTIFICATION */ struct msgb *gsm0808_create_lcls_notification(enum gsm0808_lcls_status status, bool break_req) { - struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, - "bssmap: LCLS NOTIFICATION"); + struct msgb *msg; + + if (status == GSM0808_LCLS_STS_NA) + return NULL; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "bssmap: LCLS NOTIFICATION"); if (!msg) return NULL; -- To view, visit https://gerrit.osmocom.org/12375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9ac4bae75f5796e6e11346b8cb34d3897ae70b59 Gerrit-Change-Number: 12375 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:39:06 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 18:39:06 +0000 Subject: Change in libosmocore[master]: LCLS: fix LCLS-CONNECT-CONTROL encoder Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12376 Change subject: LCLS: fix LCLS-CONNECT-CONTROL encoder ...................................................................... LCLS: fix LCLS-CONNECT-CONTROL encoder Previously it could encode both incorrect values as well as incorrect message. Let's fix this by explicitly checking for invalid values and ensuring that at least one of the parameters is valid. This function have no external or internal users so it's better to fix type signature as well to match the rest of gsm0808_create_lcls_*(). Change-Id: I7b33a771acbd391c5f9a494d6450edb18511433f --- M TODO-RELEASE M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c 3 files changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/76/12376/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 16d96ec..8b5f841 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -19,3 +19,4 @@ libosmogsm osmo_gsup_message extended with SMS related fields libosmogsm osmo_gsup_sms_{en|de}code_sm_rp_da GSUP SM-RP-DA coding helpers libosmogsm osmo_gsup_sms_{en|de}code_sm_rp_oa GSUP SM-RP-OA coding helpers +libosmogsm gsm0808_create_lcls_conn_ctrl() API/ABI break: change parameters from pointers to plain values diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 79d89e5..ac88748 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -92,8 +92,8 @@ const struct gsm0808_cell_id_list *cil, const uint8_t *chan_needed) OSMO_DEPRECATED("use gsm0808_create_paging2 instead"); -struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config *config, - enum gsm0808_lcls_control *control); +struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config config, + enum gsm0808_lcls_control control); struct msgb *gsm0808_create_lcls_conn_ctrl_ack(enum gsm0808_lcls_status status); struct msgb *gsm0808_create_lcls_notification(enum gsm0808_lcls_status status, bool break_req); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 0f9e8df..6df3ba4 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -312,19 +312,24 @@ * \param[in] config LCLS Configuration * \param[in] control LCLS Connection Status Control * \returns callee-allocated msgb with BSSMAP LCLS NOTIFICATION */ -struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config *config, - enum gsm0808_lcls_control *control) +struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config config, + enum gsm0808_lcls_control control) { - struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, - "bssmap: LCLS CONN CTRL"); + struct msgb *msg; + + /* According to NOTE 1 in ?3.2.1.91 at least one of the parameters is required */ + if (config == GSM0808_LCLS_CFG_NA && control == GSM0808_LCLS_CSC_NA) + return NULL; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "bssmap: LCLS CONN CTRL"); if (!msg) return NULL; msgb_v_put(msg, BSS_MAP_MSG_LCLS_CONNECT_CTRL); - if (config) - msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, *config); - if (control) - msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, *control); + if (config != GSM0808_LCLS_CFG_NA) + msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, config); + if (control != GSM0808_LCLS_CSC_NA) + msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, control); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); return msg; -- To view, visit https://gerrit.osmocom.org/12376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7b33a771acbd391c5f9a494d6450edb18511433f Gerrit-Change-Number: 12376 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:39:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 18:39:38 +0000 Subject: Change in libosmocore[master]: LCLC: fix doc to match type signature In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12370 ) Change subject: LCLC: fix doc to match type signature ...................................................................... LCLC: fix doc to match type signature Change-Id: I8f7b3dca080ef0e632d47a907154f8404b0ec523 --- M src/gsm/gsm0808_utils.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index a04adde..aa0d3d7 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -526,8 +526,7 @@ /*! Decode BSSMAP Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1. * \param[out] gcr Caller-provided memory to store Global Call Reference - * \param[in] elem IE value to be decoded - * \param[in] len Length of \a elem in bytes + * \param[in] tp IE values to be decoded * \returns number of bytes parsed; negative on error */ int gsm0808_dec_gcr(struct osmo_gcr_parsed *gcr, const struct tlv_parsed *tp) { -- To view, visit https://gerrit.osmocom.org/12370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8f7b3dca080ef0e632d47a907154f8404b0ec523 Gerrit-Change-Number: 12370 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:40:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 18:40:02 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 19 Dec 2018 18:40:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:40:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 18:40:03 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... add/clean big-endian packed structs (struct_endianess.py) This is 1:1 the result of doing cd libosmocore ./contrib/struct_endianess.py git commit -a Running struct_endianess.py again should result in no changes. That means we could include such a check in the gerrit verification job now. Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 --- M include/osmocom/gprs/protocol/gsm_04_60.h M include/osmocom/gsm/protocol/gsm_03_41.h M include/osmocom/gsm/protocol/gsm_04_08.h M include/osmocom/gsm/protocol/gsm_04_08_gprs.h M include/osmocom/gsm/protocol/gsm_04_12.h M include/osmocom/gsm/protocol/gsm_04_14.h M include/osmocom/gsm/protocol/gsm_08_58.h M include/osmocom/gsm/protocol/gsm_44_318.h M tests/endian/endian_test.c 9 files changed, 647 insertions(+), 45 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gprs/protocol/gsm_04_60.h b/include/osmocom/gprs/protocol/gsm_04_60.h index 96e9ab7..5d5fca9 100644 --- a/include/osmocom/gprs/protocol/gsm_04_60.h +++ b/include/osmocom/gprs/protocol/gsm_04_60.h @@ -7,10 +7,12 @@ #pragma once #include +#include #if OSMO_IS_LITTLE_ENDIAN == 1 /* TS 04.60 10.3a.4.1.1 */ struct gprs_rlc_ul_header_egprs_1 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t r:1, si:1, cv:4, @@ -26,10 +28,20 @@ spare_hi:1; uint8_t spare_lo:6, dummy:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tfi_hi:2, cv:4, si:1, r:1; + uint8_t bsn1_hi:5, tfi_lo:3; + uint8_t bsn2_hi:2, bsn1_lo:6; + uint8_t bsn2_lo:8; + uint8_t spare_hi:1, pi:1, rsb:1, cps:5; + uint8_t dummy:2, spare_lo:6; +#endif } __attribute__ ((packed)); /* TS 04.60 10.3a.4.2.1 */ struct gprs_rlc_ul_header_egprs_2 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t r:1, si:1, cv:4, @@ -44,10 +56,19 @@ spare_hi:5; uint8_t spare_lo:5, dummy:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tfi_hi:2, cv:4, si:1, r:1; + uint8_t bsn1_hi:5, tfi_lo:3; + uint8_t cps_hi:2, bsn1_lo:6; + uint8_t spare_hi:5, pi:1, rsb:1, cps_lo:1; + uint8_t dummy:3, spare_lo:5; +#endif } __attribute__ ((packed)); /* TS 04.60 10.3a.4.3.1 */ struct gprs_rlc_ul_header_egprs_3 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t r:1, si:1, cv:4, @@ -62,9 +83,17 @@ pi:1, spare:1, dummy:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tfi_hi:2, cv:4, si:1, r:1; + uint8_t bsn1_hi:5, tfi_lo:3; + uint8_t cps_hi:2, bsn1_lo:6; + uint8_t dummy:1, spare:1, pi:1, rsb:1, spb:2, cps_lo:2; +#endif } __attribute__ ((packed)); struct gprs_rlc_dl_header_egprs_1 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t usf:3, es_p:2, rrbp:2, @@ -77,9 +106,18 @@ bsn2_hi:7; uint8_t bsn2_lo:3, cps:5; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tfi_hi:1, rrbp:2, es_p:2, usf:3; + uint8_t bsn1_hi:2, pr:2, tfi_lo:4; + uint8_t bsn1_mid:8; + uint8_t bsn2_hi:7, bsn1_lo:1; + uint8_t cps:5, bsn2_lo:3; +#endif } __attribute__ ((packed)); struct gprs_rlc_dl_header_egprs_2 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t usf:3, es_p:2, rrbp:2, @@ -91,9 +129,17 @@ uint8_t bsn1_lo:1, cps:3, dummy:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tfi_hi:1, rrbp:2, es_p:2, usf:3; + uint8_t bsn1_hi:2, pr:2, tfi_lo:4; + uint8_t bsn1_mid:8; + uint8_t dummy:4, cps:3, bsn1_lo:1; +#endif } __attribute__ ((packed)); struct gprs_rlc_dl_header_egprs_3 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t usf:3, es_p:2, rrbp:2, @@ -106,10 +152,18 @@ cps:4, spb:2, dummy:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tfi_hi:1, rrbp:2, es_p:2, usf:3; + uint8_t bsn1_hi:2, pr:2, tfi_lo:4; + uint8_t bsn1_mid:8; + uint8_t dummy:1, spb:2, cps:4, bsn1_lo:1; +#endif } __attribute__ ((packed)); #else /* TS 04.60 10.3a.4.1.1 */ struct gprs_rlc_ul_header_egprs_1 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t tfi_hi:2, cv:4, si:1, @@ -125,10 +179,20 @@ cps:5; uint8_t dummy:2, spare_lo:6; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t r:1, si:1, cv:4, tfi_hi:2; + uint8_t tfi_lo:3, bsn1_hi:5; + uint8_t bsn1_lo:6, bsn2_hi:2; + uint8_t bsn2_lo:8; + uint8_t cps:5, rsb:1, pi:1, spare_hi:1; + uint8_t spare_lo:6, dummy:2; +#endif } __attribute__ ((packed)); /* TS 04.60 10.3a.4.2.1 */ struct gprs_rlc_ul_header_egprs_2 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t tfi_hi:2, cv:4, si:1, @@ -143,10 +207,19 @@ cps_lo:1; uint8_t dummy:3, spare_lo:5; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t r:1, si:1, cv:4, tfi_hi:2; + uint8_t tfi_lo:3, bsn1_hi:5; + uint8_t bsn1_lo:6, cps_hi:2; + uint8_t cps_lo:1, rsb:1, pi:1, spare_hi:5; + uint8_t spare_lo:5, dummy:3; +#endif } __attribute__ ((packed)); /* TS 04.60 10.3a.4.3.1 */ struct gprs_rlc_ul_header_egprs_3 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t tfi_hi:2, cv:4, si:1, @@ -161,9 +234,17 @@ rsb:1, spb:2, cps_lo:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t r:1, si:1, cv:4, tfi_hi:2; + uint8_t tfi_lo:3, bsn1_hi:5; + uint8_t bsn1_lo:6, cps_hi:2; + uint8_t cps_lo:2, spb:2, rsb:1, pi:1, spare:1, dummy:1; +#endif } __attribute__ ((packed)); struct gprs_rlc_dl_header_egprs_1 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t tfi_hi:1, rrbp:2, es_p:2, @@ -176,9 +257,18 @@ bsn1_lo:1; uint8_t cps:5, bsn2_lo:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t usf:3, es_p:2, rrbp:2, tfi_hi:1; + uint8_t tfi_lo:4, pr:2, bsn1_hi:2; + uint8_t bsn1_mid:8; + uint8_t bsn1_lo:1, bsn2_hi:7; + uint8_t bsn2_lo:3, cps:5; +#endif } __attribute__ ((packed)); struct gprs_rlc_dl_header_egprs_2 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t tfi_hi:1, rrbp:2, es_p:2, @@ -190,9 +280,17 @@ uint8_t dummy:4, cps:3, bsn1_lo:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t usf:3, es_p:2, rrbp:2, tfi_hi:1; + uint8_t tfi_lo:4, pr:2, bsn1_hi:2; + uint8_t bsn1_mid:8; + uint8_t bsn1_lo:1, cps:3, dummy:4; +#endif } __attribute__ ((packed)); struct gprs_rlc_dl_header_egprs_3 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t tfi_hi:1, rrbp:2, es_p:2, @@ -205,5 +303,12 @@ spb:2, cps:4, bsn1_lo:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t usf:3, es_p:2, rrbp:2, tfi_hi:1; + uint8_t tfi_lo:4, pr:2, bsn1_hi:2; + uint8_t bsn1_mid:8; + uint8_t bsn1_lo:1, cps:4, spb:2, dummy:1; +#endif } __attribute__ ((packed)); #endif diff --git a/include/osmocom/gsm/protocol/gsm_03_41.h b/include/osmocom/gsm/protocol/gsm_03_41.h index 2e0ad69..1b399ae 100644 --- a/include/osmocom/gsm/protocol/gsm_03_41.h +++ b/include/osmocom/gsm/protocol/gsm_03_41.h @@ -19,35 +19,34 @@ /* Chapter 9.3.2 */ struct gsm341_ms_message { struct { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t code_hi:6; uint8_t gs:2; uint8_t update:4; uint8_t code_lo:4; -#else - uint8_t gs:2; - uint8_t code_hi:6; - uint8_t code_lo:4; - uint8_t update:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t gs:2, code_hi:6; + uint8_t code_lo:4, update:4; #endif } serial; uint16_t msg_id; struct { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t language:4; uint8_t group:4; -#else - uint8_t group:4; - uint8_t language:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t group:4, language:4; #endif } dcs; struct { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t total:4; uint8_t current:4; -#else - uint8_t current:4; - uint8_t total:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t current:4, total:4; #endif } page; uint8_t data[0]; @@ -56,20 +55,17 @@ /* Chapter 9.4.1.3 */ struct gsm341_etws_message { struct { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t code_hi:4; uint8_t popup:1; uint8_t alert:1; uint8_t gs:2; uint8_t update:4; uint8_t code_lo:4; -#else - uint8_t gs:2; - uint8_t alert:1; - uint8_t popup:1; - uint8_t code_hi:4; - uint8_t code_lo:4; - uint8_t update:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t gs:2, alert:1, popup:1, code_hi:4; + uint8_t code_lo:4, update:4; #endif } serial; uint16_t msg_id; diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index e218295..a97225c 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -13,15 +13,21 @@ /* Chapter 10.5.1.5 */ struct gsm48_classmark1 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t pwr_lev:3, a5_1:1, es_ind:1, rev_lev:2, spare:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:1, rev_lev:2, es_ind:1, a5_1:1, pwr_lev:3; +#endif } __attribute__ ((packed)); /* Chapter 10.5.1.6 */ struct gsm48_classmark2 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t pwr_lev:3, a5_1:1, es_ind:1, @@ -42,11 +48,18 @@ lcsva_cap:1, spare4:1, cm3:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:1, rev_lev:2, es_ind:1, a5_1:1, pwr_lev:3; + uint8_t spare2:1, ps_cap:1, ss_scr:2, sm_cap:1, vbs:1, vgcs:1, fc:1; + uint8_t cm3:1, spare4:1, lcsva_cap:1, spare3:1, solsa:1, cmsp:1, a5_3:1, a5_2:1; +#endif } __attribute__ ((packed)); /* Chapter 10.5.2.1b.3 */ #if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_1024 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t w1_hi:2, f0:1, form_id:5; @@ -78,9 +91,29 @@ w14_lo:3; uint8_t w16:6, w15_lo:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t form_id:5, f0:1, w1_hi:2; + uint8_t w1_lo; + uint8_t w2_hi; + uint8_t w2_lo:1, w3_hi:7; + uint8_t w3_lo:2, w4_hi:6; + uint8_t w4_lo:2, w5_hi:6; + uint8_t w5_lo:2, w6_hi:6; + uint8_t w6_lo:2, w7_hi:6; + uint8_t w7_lo:2, w8_hi:6; + uint8_t w8_lo:1, w9:7; + uint8_t w10:7, w11_hi:1; + uint8_t w11_lo:6, w12_hi:2; + uint8_t w12_lo:5, w13_hi:3; + uint8_t w13_lo:4, w14_hi:4; + uint8_t w14_lo:3, w15_hi:5; + uint8_t w15_lo:2, w16:6; +#endif } __attribute__ ((packed)); #else struct gsm48_range_1024 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t form_id:5, f0:1, w1_hi:2; @@ -112,12 +145,32 @@ w15_hi:5; uint8_t w15_lo:2, w16:6; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t w1_hi:2, f0:1, form_id:5; + uint8_t w1_lo; + uint8_t w2_hi; + uint8_t w3_hi:7, w2_lo:1; + uint8_t w4_hi:6, w3_lo:2; + uint8_t w5_hi:6, w4_lo:2; + uint8_t w6_hi:6, w5_lo:2; + uint8_t w7_hi:6, w6_lo:2; + uint8_t w8_hi:6, w7_lo:2; + uint8_t w9:7, w8_lo:1; + uint8_t w11_hi:1, w10:7; + uint8_t w12_hi:2, w11_lo:6; + uint8_t w13_hi:3, w12_lo:5; + uint8_t w14_hi:4, w13_lo:4; + uint8_t w15_hi:5, w14_lo:3; + uint8_t w16:6, w15_lo:2; +#endif } __attribute__ ((packed)); #endif /* Chapter 10.5.2.1b.4 */ #if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_512 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t orig_arfcn_hi:1, form_id:7; uint8_t orig_arfcn_mid; @@ -149,9 +202,29 @@ w15:6; uint8_t w17:5, w16_lo:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t form_id:7, orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, w1_hi:7; + uint8_t w1_lo:2, w2_hi:6; + uint8_t w2_lo:2, w3_hi:6; + uint8_t w3_lo:2, w4_hi:6; + uint8_t w4_lo:1, w5:7; + uint8_t w6:7, w7_hi:1; + uint8_t w7_lo:6, w8_hi:2; + uint8_t w8_lo:4, w9_hi:4; + uint8_t w9_lo:2, w10:6; + uint8_t w11:6, w12_hi:2; + uint8_t w12_lo:4, w13_hi:4; + uint8_t w13_lo:2, w14:6; + uint8_t w15:6, w16_hi:2; + uint8_t w16_lo:3, w17:5; +#endif } __attribute__ ((packed)); #else struct gsm48_range_512 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t form_id:7, orig_arfcn_hi:1; uint8_t orig_arfcn_mid; @@ -183,12 +256,32 @@ w16_hi:2; uint8_t w16_lo:3, w17:5; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t orig_arfcn_hi:1, form_id:7; + uint8_t orig_arfcn_mid; + uint8_t w1_hi:7, orig_arfcn_lo:1; + uint8_t w2_hi:6, w1_lo:2; + uint8_t w3_hi:6, w2_lo:2; + uint8_t w4_hi:6, w3_lo:2; + uint8_t w5:7, w4_lo:1; + uint8_t w7_hi:1, w6:7; + uint8_t w8_hi:2, w7_lo:6; + uint8_t w9_hi:4, w8_lo:4; + uint8_t w10:6, w9_lo:2; + uint8_t w12_hi:2, w11:6; + uint8_t w13_hi:4, w12_lo:4; + uint8_t w14:6, w13_lo:2; + uint8_t w16_hi:2, w15:6; + uint8_t w17:5, w16_lo:3; +#endif } __attribute__ ((packed)); #endif /* Chapter 10.5.2.1b.5 */ #if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_256 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t orig_arfcn_hi:1, form_id:7; uint8_t orig_arfcn_mid; @@ -226,9 +319,29 @@ uint8_t spare:1, w21:4, w20_lo:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t form_id:7, orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, w1_hi:7; + uint8_t w1_lo:1, w2:7; + uint8_t w3:7, w4_hi:1; + uint8_t w4_lo:5, w5_hi:3; + uint8_t w5_lo:3, w6_hi:5; + uint8_t w6_lo:1, w7:6, w8_hi:1; + uint8_t w8_lo:4, w9_hi:4; + uint8_t w9_lo:1, w10:5, w11_hi:2; + uint8_t w11_lo:3, w12:5; + uint8_t w13:5, w14_hi:3; + uint8_t w14_lo:2, w15:5, w16_hi:1; + uint8_t w16_lo:3, w17:4, w18_hi:1; + uint8_t w18_lo:3, w19:4, w20_hi:1; + uint8_t w20_lo:3, w21:4, spare:1; +#endif } __attribute__ ((packed)); #else struct gsm48_range_256 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t form_id:7, orig_arfcn_hi:1; uint8_t orig_arfcn_mid; @@ -266,12 +379,32 @@ uint8_t w20_lo:3, w21:4, spare:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t orig_arfcn_hi:1, form_id:7; + uint8_t orig_arfcn_mid; + uint8_t w1_hi:7, orig_arfcn_lo:1; + uint8_t w2:7, w1_lo:1; + uint8_t w4_hi:1, w3:7; + uint8_t w5_hi:3, w4_lo:5; + uint8_t w6_hi:5, w5_lo:3; + uint8_t w8_hi:1, w7:6, w6_lo:1; + uint8_t w9_hi:4, w8_lo:4; + uint8_t w11_hi:2, w10:5, w9_lo:1; + uint8_t w12:5, w11_lo:3; + uint8_t w14_hi:3, w13:5; + uint8_t w16_hi:1, w15:5, w14_lo:2; + uint8_t w18_hi:1, w17:4, w16_lo:3; + uint8_t w20_hi:1, w19:4, w18_lo:3; + uint8_t spare:1, w21:4, w20_lo:3; +#endif } __attribute__ ((packed)); #endif /* Chapter 10.5.2.1b.6 */ #if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_128 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t orig_arfcn_hi:1, form_id:7; uint8_t orig_arfcn_mid; @@ -311,9 +444,29 @@ w28:3, w27:3, w26_lo:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t form_id:7, orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, w1:7; + uint8_t w2:6, w3_hi:2; + uint8_t w3_lo:4, w4_hi:4; + uint8_t w4_lo:1, w5:5, w6_hi:2; + uint8_t w6_lo:3, w7:5; + uint8_t w8:4, w9:4; + uint8_t w10:4, w11:4; + uint8_t w12:4, w13:4; + uint8_t w14:4, w15:4; + uint8_t w16:3, w17:3, w18_hi:2; + uint8_t w18_lo:1, w19:3, w20:3, w21_hi:1; + uint8_t w21_lo:2, w22:3, w23:3; + uint8_t w24:3, w25:3, w26_hi:2; + uint8_t w26_lo:1, w27:3, w28:3, spare:1; +#endif } __attribute__ ((packed)); #else struct gsm48_range_128 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t form_id:7, orig_arfcn_hi:1; uint8_t orig_arfcn_mid; @@ -353,17 +506,44 @@ w27:3, w28:3, spare:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t orig_arfcn_hi:1, form_id:7; + uint8_t orig_arfcn_mid; + uint8_t w1:7, orig_arfcn_lo:1; + uint8_t w3_hi:2, w2:6; + uint8_t w4_hi:4, w3_lo:4; + uint8_t w6_hi:2, w5:5, w4_lo:1; + uint8_t w7:5, w6_lo:3; + uint8_t w9:4, w8:4; + uint8_t w11:4, w10:4; + uint8_t w13:4, w12:4; + uint8_t w15:4, w14:4; + uint8_t w18_hi:2, w17:3, w16:3; + uint8_t w21_hi:1, w20:3, w19:3, w18_lo:1; + uint8_t w23:3, w22:3, w21_lo:2; + uint8_t w26_hi:2, w25:3, w24:3; + uint8_t spare:1, w28:3, w27:3, w26_lo:1; +#endif } __attribute__ ((packed)); #endif /* Chapter 10.5.2.1b.7 */ struct gsm48_var_bit { +#if OSMO_IS_LITTLE_ENDIAN uint8_t orig_arfcn_hi:1, form_id:7; uint8_t orig_arfcn_mid; uint8_t rrfcn1_7:7, orig_arfcn_lo:1; uint8_t rrfcn8_111[13]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t form_id:7, orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, rrfcn1_7:7; + uint8_t rrfcn8_111[13]; +#endif } __attribute__ ((packed)); /* Chapter 10.5.2.5 */ @@ -371,24 +551,37 @@ uint8_t chan_nr; union { struct { +#if OSMO_IS_LITTLE_ENDIAN uint8_t maio_high:4, h:1, tsc:3; uint8_t hsn:6, maio_low:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tsc:3, h:1, maio_high:4; + uint8_t maio_low:2, hsn:6; +#endif } __attribute__ ((packed)) h1; struct { +#if OSMO_IS_LITTLE_ENDIAN uint8_t arfcn_high:2, spare:2, h:1, tsc:3; uint8_t arfcn_low; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tsc:3, h:1, spare:2, arfcn_high:2; + uint8_t arfcn_low; +#endif } __attribute__ ((packed)) h0; } __attribute__ ((packed)); } __attribute__ ((packed)); /* Chapter 10.5.2.20 */ struct gsm48_meas_res { +#if OSMO_IS_LITTLE_ENDIAN uint8_t rxlev_full:6, dtx_used:1, ba_used:1; @@ -428,10 +621,30 @@ rxlev_nc6_lo:5; uint8_t bsic_nc6:6, bcch_f_nc6_lo:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t ba_used:1, dtx_used:1, rxlev_full:6; + uint8_t spare:1, meas_valid:1, rxlev_sub:6; + uint8_t spare2:1, rxqual_full:3, rxqual_sub:3, no_nc_n_hi:1; + uint8_t no_nc_n_lo:2, rxlev_nc1:6; + uint8_t bcch_f_nc1:5, bsic_nc1_hi:3; + uint8_t bsic_nc1_lo:3, rxlev_nc2_hi:5; + uint8_t rxlev_nc2_lo:1, bcch_f_nc2:5, bsic_nc2_hi:2; + uint8_t bsic_nc2_lo:4, rxlev_nc3_hi:4; + uint8_t rxlev_nc3_lo:2, bcch_f_nc3:5, bsic_nc3_hi:1; + uint8_t bsic_nc3_lo:5, rxlev_nc4_hi:3; + uint8_t rxlev_nc4_lo:3, bcch_f_nc4:5; + uint8_t bsic_nc4:6, rxlev_nc5_hi:2; + uint8_t rxlev_nc5_lo:4, bcch_f_nc5_hi:4; + uint8_t bcch_f_nc5_lo:1, bsic_nc5:6, rxlev_nc6_hi:1; + uint8_t rxlev_nc6_lo:5, bcch_f_nc6_hi:3; + uint8_t bcch_f_nc6_lo:2, bsic_nc6:6; +#endif } __attribute__ ((packed)); /* Chapter 10.5.2.21aa */ struct gsm48_multi_rate_conf { +#if OSMO_IS_LITTLE_ENDIAN uint8_t smod : 2, spare: 1, icmi : 1, @@ -445,23 +658,40 @@ m7_95 : 1, m10_2 : 1, m12_2 : 1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t ver:3, nscb:1, icmi:1, spare:1, smod:2; + uint8_t m12_2:1, m10_2:1, m7_95:1, m7_40:1, m6_70:1, m5_90:1, m5_15:1, m4_75:1; +#endif } __attribute__((packed)); /* Chapter 10.5.2.28(a) */ struct gsm48_power_cmd { +#if OSMO_IS_LITTLE_ENDIAN uint8_t power_level:5, spare:2, atc:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t atc:1, spare:2, power_level:5; +#endif } __attribute__((packed)); /* Chapter 10.5.2.29 */ struct gsm48_rach_control { +#if OSMO_IS_LITTLE_ENDIAN uint8_t re :1, cell_bar :1, tx_integer :4, max_trans :2; uint8_t t2; /* ACC 8-15 barred flags */ uint8_t t3; /* ACC 0-7 barred flags */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t max_trans:2, tx_integer:4, cell_bar:1, re:1; + uint8_t t2; + uint8_t t3; +#endif } __attribute__ ((packed)); /* @@ -508,27 +738,45 @@ /* Chapter 10.5.2.30 */ struct gsm48_req_ref { +#if OSMO_IS_LITTLE_ENDIAN uint8_t ra; uint8_t t3_high:3, t1:5; uint8_t t2:5, t3_low:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t ra; + uint8_t t1:5, t3_high:3; + uint8_t t3_low:3, t2:5; +#endif } __attribute__ ((packed)); /* Chapter 10.5.2.38 */ struct gsm48_start_time { +#if OSMO_IS_LITTLE_ENDIAN uint8_t t3_high:3, t1:5; uint8_t t2:5, t3_low:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t t1:5, t3_high:3; + uint8_t t3_low:3, t2:5; +#endif } __attribute__ ((packed)); /* Chapter 10.5.2.39 */ struct gsm48_sync_ind { +#if OSMO_IS_LITTLE_ENDIAN uint8_t si:2, rot:1, nci:1, sync_ie:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t sync_ie:4, nci:1, rot:1, si:2; +#endif } __attribute__((packed)); /* @@ -582,10 +830,16 @@ /* Chapter 10.5.2.2 */ struct gsm48_cell_desc { +#if OSMO_IS_LITTLE_ENDIAN uint8_t bcc:3, ncc:3, arfcn_hi:2; uint8_t arfcn_lo; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t arfcn_hi:2, ncc:3, bcc:3; + uint8_t arfcn_lo; +#endif } __attribute__((packed)); /* Chapter 9.1.15 */ @@ -612,11 +866,19 @@ /* Chapter 9.1.25 */ struct gsm48_pag_resp { +#if OSMO_IS_LITTLE_ENDIAN uint8_t spare:4, key_seq:4; uint32_t classmark2; uint8_t mi_len; uint8_t mi[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t key_seq:4, spare:4; + uint32_t classmark2; + uint8_t mi_len; + uint8_t mi[0]; +#endif } __attribute__ ((packed)); /* Chapter 10.5.1.3 */ @@ -627,9 +889,15 @@ /* Section 9.2.2 */ struct gsm48_auth_req { +#if OSMO_IS_LITTLE_ENDIAN uint8_t key_seq:4, spare:4; uint8_t rand[16]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:4, key_seq:4; + uint8_t rand[16]; +#endif } __attribute__ ((packed)); /* Section 9.2.3 */ @@ -639,12 +907,21 @@ /* Section 9.2.15 */ struct gsm48_loc_upd_req { +#if OSMO_IS_LITTLE_ENDIAN uint8_t type:4, key_seq:4; struct gsm48_loc_area_id lai; struct gsm48_classmark1 classmark1; uint8_t mi_len; uint8_t mi[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t key_seq:4, type:4; + struct gsm48_loc_area_id lai; + struct gsm48_classmark1 classmark1; + uint8_t mi_len; + uint8_t mi[0]; +#endif } __attribute__ ((packed)); /* Section 10.1 */ @@ -656,23 +933,37 @@ /* Section 9.1.3x System information Type header */ struct gsm48_system_information_type_header { +#if OSMO_IS_LITTLE_ENDIAN uint8_t l2_plen; uint8_t rr_protocol_discriminator :4, skip_indicator:4; uint8_t system_information; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t l2_plen; + uint8_t skip_indicator:4, rr_protocol_discriminator:4; + uint8_t system_information; +#endif } __attribute__ ((packed)); /* Section 10.5.2.4 Cell Selection Parameters */ struct gsm48_cell_sel_par { +#if OSMO_IS_LITTLE_ENDIAN uint8_t ms_txpwr_max_ccch:5, /* GSM 05.08 MS-TXPWR-MAX-CCCH */ cell_resel_hyst:3; /* GSM 05.08 CELL-RESELECT-HYSTERESIS */ uint8_t rxlev_acc_min:6, /* GSM 05.08 RXLEV-ACCESS-MIN */ neci:1, acs:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t cell_resel_hyst:3, ms_txpwr_max_ccch:5; + uint8_t acs:1, neci:1, rxlev_acc_min:6; +#endif } __attribute__ ((packed)); /* 3GPP TS 44.018 Section 10.5.2.11 Control Channel Description */ struct gsm48_control_channel_descr { +#if OSMO_IS_LITTLE_ENDIAN uint8_t ccch_conf :3, bs_ag_blks_res :3, att :1, @@ -682,6 +973,12 @@ cbq3 :2, spare_2 :1; uint8_t t3212; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t mscr:1, att:1, bs_ag_blks_res:3, ccch_conf:3; + uint8_t spare_2:1, cbq3:2, spare_1:2, bs_pa_mfrms:3; + uint8_t t3212; +#endif } __attribute__ ((packed)); enum gsm48_dtx_mode { @@ -693,15 +990,21 @@ /* Cell Options for SI6, SACCH (10.5.2.3a.2) or SI3, BCCH (Table 10.5.2.3.1), 3GPP TS 44.018 */ struct gsm48_cell_options { +#if OSMO_IS_LITTLE_ENDIAN uint8_t radio_link_timeout:4, dtx:2, pwrc:1, /* either DN-IND or top bit of DTX IND */ d:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t d:1, pwrc:1, dtx:2, radio_link_timeout:4; +#endif } __attribute__ ((packed)); /* Section 9.2.9 CM service request */ struct gsm48_service_request { +#if OSMO_IS_LITTLE_ENDIAN uint8_t cm_service_type : 4, cipher_key_seq : 4; /* length + 3 bytes */ @@ -709,6 +1012,13 @@ uint8_t mi_len; uint8_t mi[0]; /* optional priority level */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t cipher_key_seq:4, cm_service_type:4; + uint32_t classmark; + uint8_t mi_len; + uint8_t mi[0]; +#endif } __attribute__ ((packed)); /* Section 9.1.31 System information Type 1 */ @@ -774,30 +1084,52 @@ /* Section 9.1.37 System information Type 5 */ struct gsm48_system_information_type_5 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t rr_protocol_discriminator :4, skip_indicator:4; uint8_t system_information; uint8_t bcch_frequency_list[16]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t skip_indicator:4, rr_protocol_discriminator:4; + uint8_t system_information; + uint8_t bcch_frequency_list[16]; +#endif } __attribute__ ((packed)); /* Section 9.1.38 System information Type 5bis */ struct gsm48_system_information_type_5bis { +#if OSMO_IS_LITTLE_ENDIAN uint8_t rr_protocol_discriminator :4, skip_indicator:4; uint8_t system_information; uint8_t bcch_frequency_list[16]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t skip_indicator:4, rr_protocol_discriminator:4; + uint8_t system_information; + uint8_t bcch_frequency_list[16]; +#endif } __attribute__ ((packed)); /* Section 9.1.39 System information Type 5ter */ struct gsm48_system_information_type_5ter { +#if OSMO_IS_LITTLE_ENDIAN uint8_t rr_protocol_discriminator :4, skip_indicator:4; uint8_t system_information; uint8_t bcch_frequency_list[16]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t skip_indicator:4, rr_protocol_discriminator:4; + uint8_t system_information; + uint8_t bcch_frequency_list[16]; +#endif } __attribute__ ((packed)); /* Section 9.1.40 System information Type 6 */ struct gsm48_system_information_type_6 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t rr_protocol_discriminator :4, skip_indicator:4; uint8_t system_information; @@ -806,6 +1138,16 @@ struct gsm48_cell_options cell_options; uint8_t ncc_permitted; uint8_t rest_octets[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t skip_indicator:4, rr_protocol_discriminator:4; + uint8_t system_information; + uint16_t cell_identity; + struct gsm48_loc_area_id lai; + struct gsm48_cell_options cell_options; + uint8_t ncc_permitted; + uint8_t rest_octets[0]; +#endif } __attribute__ ((packed)); /* Section 9.1.43a System Information type 13 */ @@ -857,10 +1199,15 @@ /* Section 9.1.9 */ struct gsm48_cip_mode_cmd { +#if OSMO_IS_LITTLE_ENDIAN uint8_t sc:1, alg_id:3, cr:1, spare:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:3, cr:1, alg_id:3, sc:1; +#endif } __attribute__((packed)); /* Section 9.1.11 */ @@ -905,6 +1252,7 @@ /* Section 9.1.22 */ struct gsm48_paging1 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t l2_plen; uint8_t proto_discr; uint8_t msg_type; @@ -913,10 +1261,19 @@ cneed1:2, cneed2:2; uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t l2_plen; + uint8_t proto_discr; + uint8_t msg_type; + uint8_t cneed2:2, cneed1:2, spare:2, pag_mode:2; + uint8_t data[0]; +#endif } __attribute__((packed)); /* Section 9.1.23 */ struct gsm48_paging2 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t l2_plen; uint8_t proto_discr; uint8_t msg_type; @@ -927,10 +1284,21 @@ uint32_t tmsi1; uint32_t tmsi2; uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t l2_plen; + uint8_t proto_discr; + uint8_t msg_type; + uint8_t cneed2:2, cneed1:2, spare:2, pag_mode:2; + uint32_t tmsi1; + uint32_t tmsi2; + uint8_t data[0]; +#endif } __attribute__((packed)); /* Section 9.1.24 */ struct gsm48_paging3 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t l2_plen; uint8_t proto_discr; uint8_t msg_type; @@ -946,15 +1314,36 @@ cneed4:2, spare2:4; uint8_t rest[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t l2_plen; + uint8_t proto_discr; + uint8_t msg_type; + uint8_t cneed2:2, cneed1:2, spare:2, pag_mode:2; + uint32_t tmsi1; + uint32_t tmsi2; + uint32_t tmsi3; + uint32_t tmsi4; + uint8_t spare2:4, cneed4:2, cneed3:2; + uint8_t rest[0]; +#endif } __attribute__((packed)); /* Section 9.1.25 */ struct gsm48_pag_rsp { +#if OSMO_IS_LITTLE_ENDIAN uint8_t key_seq:3, spare:5; uint8_t cm2_len; struct gsm48_classmark2 cm2; uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:5, key_seq:3; + uint8_t cm2_len; + struct gsm48_classmark2 cm2; + uint8_t data[0]; +#endif } __attribute__((packed)); /* Section 9.1.29 */ diff --git a/include/osmocom/gsm/protocol/gsm_04_08_gprs.h b/include/osmocom/gsm/protocol/gsm_04_08_gprs.h index 61304c0..2ec0aa7 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08_gprs.h +++ b/include/osmocom/gsm/protocol/gsm_04_08_gprs.h @@ -7,6 +7,7 @@ #include #include #include +#include /* Table 10.4 / 10.4a, GPRS Mobility Management (GMM) */ #define GSM48_MT_GMM_ATTACH_REQ 0x01 @@ -120,11 +121,19 @@ /* Chapter 9.4.15 / Table 9.4.15 */ struct gsm48_ra_upd_ack { +#if OSMO_IS_LITTLE_ENDIAN uint8_t force_stby:4, /* 10.5.5.7 */ upd_result:4; /* 10.5.5.17 */ uint8_t ra_upd_timer; /* 10.5.7.3 */ struct gsm48_ra_id ra_id; /* 10.5.5.15 */ uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t upd_result:4, force_stby:4; + uint8_t ra_upd_timer; + struct gsm48_ra_id ra_id; + uint8_t data[0]; +#endif } __attribute__((packed)); /* Chapter 10.5.7.3 */ @@ -140,28 +149,50 @@ /* Chapter 9.4.2 / Table 9.4.2 */ struct gsm48_attach_ack { +#if OSMO_IS_LITTLE_ENDIAN uint8_t att_result:4, /* 10.5.5.7 */ force_stby:4; /* 10.5.5.1 */ uint8_t ra_upd_timer; /* 10.5.7.3 */ uint8_t radio_prio; /* 10.5.7.2 */ struct gsm48_ra_id ra_id; /* 10.5.5.15 */ uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t force_stby:4, att_result:4; + uint8_t ra_upd_timer; + uint8_t radio_prio; + struct gsm48_ra_id ra_id; + uint8_t data[0]; +#endif } __attribute__((packed)); /* Chapter 9.4.9 / Table 9.4.9 */ struct gsm48_auth_ciph_req { +#if OSMO_IS_LITTLE_ENDIAN uint8_t ciph_alg:4, /* 10.5.5.3 */ imeisv_req:4; /* 10.5.5.10 */ uint8_t force_stby:4, /* 10.5.5.7 */ ac_ref_nr:4; /* 10.5.5.19 */ uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t imeisv_req:4, ciph_alg:4; + uint8_t ac_ref_nr:4, force_stby:4; + uint8_t data[0]; +#endif } __attribute__((packed)); /* optional: TV RAND, TV CKSN */ struct gsm48_auth_ciph_resp { +#if OSMO_IS_LITTLE_ENDIAN uint8_t ac_ref_nr:4, spare:4; uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:4, ac_ref_nr:4; + uint8_t data[0]; +#endif } __attribute__((packed)); /* Chapter 9.5.1 / Table 9.5.1 */ diff --git a/include/osmocom/gsm/protocol/gsm_04_12.h b/include/osmocom/gsm/protocol/gsm_04_12.h index 826e69b..3f34ee7 100644 --- a/include/osmocom/gsm/protocol/gsm_04_12.h +++ b/include/osmocom/gsm/protocol/gsm_04_12.h @@ -4,6 +4,7 @@ #pragma once #include +#include #define GSM412_MSG_LEN 88 /* TS 04.12 Section 3.1 */ #define GSM412_BLOCK_LEN 22 /* TS 04.12 Section 3.1 */ @@ -16,17 +17,30 @@ #define GSM412_SEQ_NULL_MSG 0xf struct gsm412_block_type { +#if OSMO_IS_LITTLE_ENDIAN uint8_t seq_nr : 4, lb : 1, lpd : 2, spare : 1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:1, lpd:2, lb:1, seq_nr:4; +#endif } __attribute__((packed)); struct gsm412_sched_msg { +#if OSMO_IS_LITTLE_ENDIAN uint8_t beg_slot_nr : 6, type : 2; uint8_t end_slot_nr : 6, spare1 : 1, spare2: 1; uint8_t cbsms_msg_map[6]; uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t type:2, beg_slot_nr:6; + uint8_t spare2:1, spare1:1, end_slot_nr:6; + uint8_t cbsms_msg_map[6]; + uint8_t data[0]; +#endif } __attribute__((packed)); diff --git a/include/osmocom/gsm/protocol/gsm_04_14.h b/include/osmocom/gsm/protocol/gsm_04_14.h index 6f7d92c..5ef7837 100644 --- a/include/osmocom/gsm/protocol/gsm_04_14.h +++ b/include/osmocom/gsm/protocol/gsm_04_14.h @@ -25,29 +25,26 @@ #define GSM414_MT_CLOSE_MSLOT_LOOP_CMD 0x20 /* 8.4 */ struct gsm414_close_mslot_loop_cmd { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t chc:2, loop_mech:3, tn:3; -#else - uint8_t tn:3, - loop_mech:3, - chc:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tn:3, loop_mech:3, chc:2; #endif } __attribute__((packed)); #define GSM414_MT_CLOSE_MSLOT_LOOP_ACK 0x21 /* 8.5 */ struct gsm414_close_mslot_loop_ack { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t err_ind:1, loop_mech:3, chc:2, spare:2; -#else - uint8_t spare:2, - chc:2, - loop_mech:3, - err_ind:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:2, chc:2, loop_mech:3, err_ind:1; #endif } __attribute__((packed)); @@ -65,34 +62,32 @@ #define GSM414_MT_GPRS_TEST_MODE_CMD 0x24 /* 8.13 */ struct gsm414_gprs_test_mode_cmd { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint16_t d:12, spare:3, l:1; uint8_t m:1, dl_tx_offset:3, _spare:4; -#else - uint16_t l:1, +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint16_t d:12, spare:3, - d:12; - uint8_t _spare:4, - dl_tx_offset:3, - m:1; + l:1; + uint8_t _spare:4, dl_tx_offset:3, m:1; #endif } __attribute__((packed)); #define GSM414_MT_EGPRS_ST_RB_LOOP_CMD 0x25 /* 8.14 */ struct gsm414_egprs_st_sb_loop_cmd { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t _spare:4, dl_tx_offset:3, m:1; -#else - uint8_t m:1, - dl_tx_offset:3, - _spare:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t m:1, dl_tx_offset:3, _spare:4; #endif } __attribute__((packed)); diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index 363f33d..3ea4e63 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -594,10 +594,15 @@ /*! RSL Cell Broadcast Command (Chapter 9.3.45) */ struct rsl_ie_cb_cmd_type { +#if OSMO_IS_LITTLE_ENDIAN uint8_t last_block:2; uint8_t spare:1; uint8_t def_bcast:1; uint8_t command:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t command:4, def_bcast:1, spare:1, last_block:2; +#endif } __attribute__ ((packed)); /* ->command */ #define RSL_CB_CMD_TYPE_NORMAL 0x00 @@ -732,14 +737,21 @@ }; struct ipac_preproc_ave_cfg { +#if OSMO_IS_LITTLE_ENDIAN uint8_t h_reqave:5, param_id:2, reserved:1; uint8_t h_reqt:5, ave_method:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved:1, param_id:2, h_reqave:5; + uint8_t ave_method:3, h_reqt:5; +#endif }__attribute__ ((packed)); struct ipac_preproc_ho_thresh { +#if OSMO_IS_LITTLE_ENDIAN uint8_t l_rxlev_ul_h:6, reserved_l_rxlev_ul:2; uint8_t l_rxlev_dl_h:6, @@ -754,9 +766,19 @@ reserved_rxqual_dl:1; uint8_t ms_range_max:6, reserved_ms_range:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved_l_rxlev_ul:2, l_rxlev_ul_h:6; + uint8_t reserved_l_rxlev_dl:2, l_rxlev_dl_h:6; + uint8_t reserved_rxlev_ul:2, rxlev_ul_ih:6; + uint8_t reserved_rxlev_dl:2, rxlev_dl_ih:6; + uint8_t reserved_rxqual_dl:1, l_rxqual_dl_h:3, reserved_rxlqual_ul:1, l_rxqual_ul_h:3; + uint8_t reserved_ms_range:2, ms_range_max:6; +#endif }__attribute__ ((packed)); struct ipac_preproc_ho_comp { +#if OSMO_IS_LITTLE_ENDIAN uint8_t p5:5, reserved_p5:3; uint8_t n5:5, @@ -777,30 +799,61 @@ reserved_ho:3; uint8_t reserved; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved_p5:3, p5:5; + uint8_t reserved_n5:3, n5:5; + uint8_t reserved_p6:3, p6:5; + uint8_t reserved_n6:3, n6:5; + uint8_t reserved_p7:3, p7:5; + uint8_t reserved_n7:3, n7:5; + uint8_t reserved_p8:3, p8:5; + uint8_t reserved_n8:3, n8:5; + uint8_t reserved_ho:3, ho_interval:5; + uint8_t reserved; +#endif }__attribute__ ((packed)); struct ipac_preproc_ho_candidates { +#if OSMO_IS_LITTLE_ENDIAN uint8_t bsic:6, reserved0:2; uint8_t bcch_freq:5, ba_used:1, s:1, reserved1:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved0:2, bsic:6; + uint8_t reserved1:1, s:1, ba_used:1, bcch_freq:5; +#endif }__attribute__ ((packed)); struct ipac_preproc_ncell_dflts { +#if OSMO_IS_LITTLE_ENDIAN uint8_t rxlev_min_def:6, reserved_rxlev_min_def:2; uint8_t ho_margin_def:5, reserved_ho_margin_def:3; uint8_t ms_txpwr_max_def:5, reserved_ms_txpwr_max_def:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved_rxlev_min_def:2, rxlev_min_def:6; + uint8_t reserved_ho_margin_def:3, ho_margin_def:5; + uint8_t reserved_ms_txpwr_max_def:3, ms_txpwr_max_def:5; +#endif }__attribute__ ((packed)); struct ipac_preproc_ho_ctl_param { +#if OSMO_IS_LITTLE_ENDIAN uint8_t sdcch_ho_gsm:1, sdcch_ho_umts:1, reserved:6; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved:6, sdcch_ho_umts:1, sdcch_ho_gsm:1; +#endif }__attribute__ ((packed)); struct ipac_preproc_cfg { diff --git a/include/osmocom/gsm/protocol/gsm_44_318.h b/include/osmocom/gsm/protocol/gsm_44_318.h index 6ac02cf..b3942be 100644 --- a/include/osmocom/gsm/protocol/gsm_44_318.h +++ b/include/osmocom/gsm/protocol/gsm_44_318.h @@ -4,6 +4,7 @@ #pragma once #include +#include /* Table 11.1.1.2.1: Protocol Discriminator */ enum gan_pdisc { @@ -154,15 +155,24 @@ /* 11.1.1 GA-RC and GA-CSR Message header IE */ struct gan_rc_csr_hdr { +#if OSMO_IS_LITTLE_ENDIAN uint16_t len; uint8_t pdisc:4, skip_ind:4; uint8_t msg_type; uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint16_t len; + uint8_t skip_ind:4, pdisc:4; + uint8_t msg_type; + uint8_t data[0]; +#endif } __attribute__((packed)); /* 11.2.14.1: GAN Control Channel Description IE */ struct gan_cch_desc_ie { +#if OSMO_IS_LITTLE_ENDIAN uint8_t spare:1, ecmc:1, nmo:2, @@ -179,4 +189,12 @@ tgecs:2, spare2:2; uint8_t access_class[2]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t mscr:1, att:1, dtm:1, gprs:1, nmo:2, ecmc:1, spare:1; + uint8_t t3212; + uint8_t rac; + uint8_t spare2:2, tgecs:2, pfcfm:1, re:1, ecmp:1, sgsnr:1; + uint8_t access_class[2]; +#endif } __attribute__((packed)); diff --git a/tests/endian/endian_test.c b/tests/endian/endian_test.c index 8737e7a..dd0697a 100644 --- a/tests/endian/endian_test.c +++ b/tests/endian/endian_test.c @@ -1,5 +1,6 @@ #include #include +#include int main(int argc, char **argv) { -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:40:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 18:40:40 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12368 ) Change subject: abort assignment on Assignment Failure ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12368/1/src/libmsc/msc_mgcp.c File src/libmsc/msc_mgcp.c: https://gerrit.osmocom.org/#/c/12368/1/src/libmsc/msc_mgcp.c at 1085 PS1, Line 1085: LOGP(DMGCP, LOGL_DEBUG, "(subscriber:%s) assignment failed\n", vlr_subscr_name(conn->vsub)); > Use at least LOGL_NOTICE or LOGL_INFO. argh! -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 18:40:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:47:18 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 18:47:18 +0000 Subject: Change in osmo-msc[master]: libmsc/VTY: introduce kill-switch for routing SMS over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11918 ) Change subject: libmsc/VTY: introduce kill-switch for routing SMS over GSUP ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie57685ed2ce1e4c978e775b68fdffe58de44882b Gerrit-Change-Number: 11918 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 18:47:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:47:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 18:47:24 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11919 ) Change subject: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8 Gerrit-Change-Number: 11919 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 19 Dec 2018 18:47:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:47:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 18:47:30 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11920 ) Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 7 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 19 Dec 2018 18:47:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:56:58 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 18:56:58 +0000 Subject: Change in libosmocore[master]: LCLS: drop boolean status_present from HO structs Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12377 Change subject: LCLS: drop boolean status_present from HO structs ...................................................................... LCLS: drop boolean status_present from HO structs The validity of lcls_bss_status can be determined from the value itself so we don't need those parameters in the struct. Change-Id: I2dc3a2896b133298cbf850d68e6898300884bbce --- M TODO-RELEASE M include/osmocom/gsm/gsm0808.h 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/77/12377/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 16d96ec..f6ec3ab 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -19,3 +19,4 @@ libosmogsm osmo_gsup_message extended with SMS related fields libosmogsm osmo_gsup_sms_{en|de}code_sm_rp_da GSUP SM-RP-DA coding helpers libosmogsm osmo_gsup_sms_{en|de}code_sm_rp_oa GSUP SM-RP-OA coding helpers +libosmogsm struct gsm0808_handover_complete Remove unnecessary boolean parameters \ No newline at end of file diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 79d89e5..ccecda4 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -157,7 +157,6 @@ bool chosen_channel_present; uint8_t chosen_channel; - bool lcls_bss_status_present; enum gsm0808_lcls_status lcls_bss_status; /* more items are defined in the spec and may be added later */ @@ -194,7 +193,6 @@ bool speech_codec_chosen_present; struct gsm0808_speech_codec speech_codec_chosen; - bool lcls_bss_status_present; enum gsm0808_lcls_status lcls_bss_status; /* more items are defined in the spec and may be added later */ -- To view, visit https://gerrit.osmocom.org/12377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2dc3a2896b133298cbf850d68e6898300884bbce Gerrit-Change-Number: 12377 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:58:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 18:58:34 +0000 Subject: Change in osmo-bsc[master]: LCLS: use enum values instead of magic numbers Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12378 Change subject: LCLS: use enum values instead of magic numbers ...................................................................... LCLS: use enum values instead of magic numbers Change-Id: I3f49f74edb5400df1b13bb75da3d524f234c8d03 Related: OS#3659 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/12378/1 diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 26b3244..2d5a077 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -50,11 +50,11 @@ enum gsm0808_lcls_status lcls_get_status(struct gsm_subscriber_connection *conn) { if (!conn->lcls.fi) - return 0xff; + return GSM0808_LCLS_STS_NA; switch (conn->lcls.fi->state) { case ST_NO_LCLS: - return 0xff; + return GSM0808_LCLS_STS_NA; case ST_NOT_YET_LS: return GSM0808_LCLS_STS_NOT_YET_LS; case ST_NOT_POSSIBLE_LS: @@ -76,7 +76,7 @@ enum gsm0808_lcls_status status = lcls_get_status(conn); struct msgb *msg; - if (status == 0xff) + if (status == GSM0808_LCLS_STS_NA) return; LOGPFSM(conn->lcls.fi, "Sending BSSMAP LCLS NOTIFICATION (%s)\n", @@ -384,7 +384,7 @@ return; return; case LCLS_EV_APPLY_CFG_CSC: - if (conn->lcls.config == 0xff) + if (conn->lcls.config == GSM0808_LCLS_CFG_NA) return; if (lcls_perform_correlation(conn) != 0) { /* Correlation leads to no result: Not Possible to LS */ @@ -887,7 +887,7 @@ void bssmap_add_lcls_status_if_needed(struct gsm_subscriber_connection *conn, struct msgb *msg) { enum gsm0808_lcls_status status = lcls_get_status(conn); - if (status != 0xff) { + if (status != GSM0808_LCLS_STS_NA) { LOGPFSM(conn->fi, "Adding LCLS BSS-Status (%s) to %s\n", gsm0808_lcls_status_name(status), gsm0808_bssmap_name(msg->l3h[2])); -- To view, visit https://gerrit.osmocom.org/12378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3f49f74edb5400df1b13bb75da3d524f234c8d03 Gerrit-Change-Number: 12378 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:58:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 18:58:34 +0000 Subject: Change in osmo-bsc[master]: LCLS: use Status for HO-COMPLETE message Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12379 Change subject: LCLS: use Status for HO-COMPLETE message ...................................................................... LCLS: use Status for HO-COMPLETE message This requires Ib2958a8613627c4e54c004ffa3578c300ed0360b in libosmocore. Change-Id: I813024ac8eef73c65b49d6d1c6ea1647b97e2fab --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/12379/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 60ec5fb..6268778 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1096,7 +1096,6 @@ .chosen_channel_present = true, .chosen_channel = gsm0808_chosen_channel(lchan->type, lchan->tch_mode), - .lcls_bss_status_present = (lcls_status != 0xff), .lcls_bss_status = lcls_status, }; -- To view, visit https://gerrit.osmocom.org/12379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I813024ac8eef73c65b49d6d1c6ea1647b97e2fab Gerrit-Change-Number: 12379 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 18:59:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 18:59:20 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12369 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2958a8613627c4e54c004ffa3578c300ed0360b Gerrit-Change-Number: 12369 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 19 Dec 2018 18:59:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 19:10:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 19:10:57 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12368 to look at the new patch set (#2). Change subject: abort assignment on Assignment Failure ...................................................................... abort assignment on Assignment Failure If Assignment fails in the BSC, trigger an EV_TEARDOWN_ERROR in the mgcp_ctx FSM instance, so that the call gets torn down immediately. Before this, the non-call would idle around without anything happening. Related: OS#3236 Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a --- M include/osmocom/msc/msc_mgcp.h M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 3 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/68/12368/2 -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 19:11:02 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 19 Dec 2018 19:11:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add a test for LU with invalid LAI Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12380 Change subject: add a test for LU with invalid LAI ...................................................................... add a test for LU with invalid LAI Verify that the MSC rejects a location update with a LAI that contains a PLMN which does not match the network's PLMN. Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1 Related: OS#3162 --- M msc/MSC_Tests.cfg M msc/MSC_Tests.ttcn M msc/expected-results.xml 3 files changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/12380/1 diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg index b412889..efe4666 100644 --- a/msc/MSC_Tests.cfg +++ b/msc/MSC_Tests.cfg @@ -61,3 +61,4 @@ #MSC_Tests.TC_reset_two #MSC_Tests.TC_lu_and_mt_call #MSC_Tests.TC_cipher_complete_with_invalid_cipher +#MSC_Tests.TC_lu_with_invalid_lai diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 1b37329..bf83427 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2826,6 +2826,38 @@ vc_conn.done; } +/* Location Update with PLMN mismatch in the LAI. */ +private function f_tc_lu_with_invalid_lai(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + + /* tell GSUP dispatcher to send this IMSI to us */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ + var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi) + /* Override the location update's LAI with a different PLMN; osmo-msc.cfg uses mcc 262 mnc 42 */ + l3_lu.msgs.mm.locationUpdateRequest.locationAreaIdentification.mcc_mnc := f_enc_mcc_mnc('262'H, '23'H); + f_bssap_compl_l3(l3_lu); + + /* Expect LU reject from MSC. */ + alt { + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + setverdict(pass); + } + [] BSSAP.receive { + setverdict(fail, "Unknown/unexpected BSSAP received"); + mtc.stop; + } + } +} + +testcase TC_lu_with_invalid_lai() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_lu_with_invalid_lai), 53); + vc_conn.done; +} + /* TODO (SMS): * different user data lengths * SMPP transaction mode with unsuccessful delivery @@ -2916,6 +2948,8 @@ execute( TC_cipher_complete_with_invalid_cipher() ); + execute( TC_lu_with_invalid_lai() ); + /* Run this last: at the time of writing this test crashes the MSC */ execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() ); execute( TC_mo_cc_bssmap_clear() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 83c8010..8eebd57 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -70,6 +70,7 @@ + -- To view, visit https://gerrit.osmocom.org/12380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1 Gerrit-Change-Number: 12380 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 19:13:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 19:13:43 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12368 to look at the new patch set (#3). Change subject: abort assignment on Assignment Failure ...................................................................... abort assignment on Assignment Failure If Assignment fails in the BSC, trigger an EV_TEARDOWN_ERROR in the mgcp_ctx FSM instance, so that the call gets torn down immediately. Before this, the non-call would idle around without anything happening. Related: OS#3236 Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a --- M include/osmocom/msc/msc_mgcp.h M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 3 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/68/12368/3 -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 19:19:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 19:19:45 +0000 Subject: Change in osmo-msc[master]: libmsc/VTY: introduce kill-switch for routing SMS over GSUP In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11918 to look at the new patch set (#8). Change subject: libmsc/VTY: introduce kill-switch for routing SMS over GSUP ...................................................................... libmsc/VTY: introduce kill-switch for routing SMS over GSUP As a rudiment of OsmoNiTB, OsmoMSC is still involved in SMS processing, storage (in SQLite DB), and routing (via SMPP). In real networks this is done by the external entity called SMSC (SMS Centre), while the MSC is doing re-encapsulation of GSM 04.11 SM-TL (Transport Layer) payload (i.e. TPDU) between SM-RL (Relay Layer) and MAP. Since OsmoMSC itself is not a 'Network in The Box' anymore, it makes sense to replicate the 'traditional' behaviour of MSC. The problem is that this behaviour cannot co-exist with the current implementation, so the key idea is to rip out the local SMS storage and routing from OsmoMSC, and (re)implement it in a separate process (OsmoSMSC?). As a temporary solution, this change introduces a 'kill-switch' VTY option that enables routing of SMS messages over GSUP towards ESME (through VLR and HLR), but breaks the local storage and routing. This is why it's disabled by default. As soon as we move the SMS processing and storage away from OsmoMSC, this behaviour would be enabled by default, and the VTY option would be hidden and deprecated. At the moment, this option basically does nothing, and will take an effect in the follow-up changes. Change-Id: Ie57685ed2ce1e4c978e775b68fdffe58de44882b Related: OS#3587 --- M include/osmocom/msc/gsm_data.h M src/libmsc/msc_vty.c M tests/test_nodes.vty 3 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/18/11918/8 -- To view, visit https://gerrit.osmocom.org/11918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie57685ed2ce1e4c978e775b68fdffe58de44882b Gerrit-Change-Number: 11918 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 19:25:17 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 19 Dec 2018 19:25:17 +0000 Subject: Change in libosmocore[master]: Use define for key buffers Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12381 Change subject: Use define for key buffers ...................................................................... Use define for key buffers Add corresponding spec. references and comments where appropriate. Change-Id: If5e2aad86eaecd8eada667b3488ba415d81c6312 --- M include/osmocom/crypt/auth.h M src/gsm/auth_core.c M tests/auth/milenage_test.c 3 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/12381/1 diff --git a/include/osmocom/crypt/auth.h b/include/osmocom/crypt/auth.h index e544126..c653b61 100644 --- a/include/osmocom/crypt/auth.h +++ b/include/osmocom/crypt/auth.h @@ -42,7 +42,7 @@ union { struct { uint8_t opc[16]; /*!< operator invariant value */ - uint8_t k[16]; /*!< secret key of the subscriber */ + uint8_t k[OSMO_A5_MAX_KEY_LEN_BYTES]; /*!< secret key of the subscriber */ uint8_t amf[2]; uint64_t sqn; /*!< sequence number (in: prev sqn; out: used sqn) */ int opc_is_op; /*!< is the OPC field OPC (0) or OP (1) ? */ @@ -60,8 +60,8 @@ struct osmo_auth_vector { uint8_t rand[16]; /*!< random challenge */ uint8_t autn[16]; /*!< authentication nonce */ - uint8_t ck[16]; /*!< ciphering key */ - uint8_t ik[16]; /*!< integrity key */ + uint8_t ck[OSMO_A5_MAX_KEY_LEN_BYTES]; /*!< ciphering key */ + uint8_t ik[OSMO_A5_MAX_KEY_LEN_BYTES]; /*!< integrity key */ uint8_t res[16]; /*!< authentication result */ uint8_t res_len; /*!< length (in bytes) of res */ uint8_t kc[8]; /*!< Kc for GSM encryption (A5) */ diff --git a/src/gsm/auth_core.c b/src/gsm/auth_core.c index f171ed4..9e750a0 100644 --- a/src/gsm/auth_core.c +++ b/src/gsm/auth_core.c @@ -98,7 +98,7 @@ return 0; } -/* C5 function to derive UMTS IK from GSM Kc */ +/* 3GPP TS 33.102 ?6.8.2.3 C5 function to derive UMTS IK from GSM Kc */ static inline void c5_function(uint8_t *ik, const uint8_t *kc) { unsigned int i; @@ -110,7 +110,7 @@ ik[i] = ik[i-12]; } -/* C4 function to derive UMTS CK from GSM Kc */ +/* 3GPP TS 33.102 ?6.8.2.3 C4 function to derive UMTS CK from GSM Kc */ void osmo_c4(uint8_t *ck, const uint8_t *kc) { memcpy(ck, kc, 8); diff --git a/tests/auth/milenage_test.c b/tests/auth/milenage_test.c index 2bd3cf2..8b058e5 100644 --- a/tests/auth/milenage_test.c +++ b/tests/auth/milenage_test.c @@ -23,7 +23,10 @@ if (vec->auth_types & OSMO_AUTH_TYPE_GSM) { printf("SRES:\t%s\n", osmo_hexdump(vec->sres, sizeof(vec->sres))); - printf("Kc:\t%s\n", osmo_hexdump(vec->kc, sizeof(vec->kc))); + /* According to 3GPP TS 55.205 Sec. 4 the GSM-MILENAGE output is limited to 64 bits. + According to 3GPP TS 33.102 Annex. B5 in UMTS security context Kc can be 128 bits. + Here we test the former, so make sure we only print interesting Kc bits. */ + printf("Kc:\t%s\n", osmo_hexdump(vec->kc, OSMO_A5_MAX_KEY_LEN_BYTES/2)); } } -- To view, visit https://gerrit.osmocom.org/12381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If5e2aad86eaecd8eada667b3488ba415d81c6312 Gerrit-Change-Number: 12381 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 20:28:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 20:28:00 +0000 Subject: Change in libosmocore[master]: Use define for key buffers In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12381 ) Change subject: Use define for key buffers ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12381/1/src/gsm/auth_core.c File src/gsm/auth_core.c: https://gerrit.osmocom.org/#/c/12381/1/src/gsm/auth_core.c at 101 PS1, Line 101: 3GPP TS 33.102 ?6.8.2.3 C5 The commit message says "Use define for key buffers". Let's do it in a separate change. -- To view, visit https://gerrit.osmocom.org/12381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5e2aad86eaecd8eada667b3488ba415d81c6312 Gerrit-Change-Number: 12381 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 20:28:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 20:39:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 20:39:22 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12368 ) Change subject: abort assignment on Assignment Failure ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/12368/3/src/libmsc/msc_mgcp.c File src/libmsc/msc_mgcp.c: https://gerrit.osmocom.org/#/c/12368/3/src/libmsc/msc_mgcp.c at 1085 PS3, Line 1085: conn->fi->id); Why not 'LOGPFSM(conn->fi, ...);'? https://gerrit.osmocom.org/#/c/12368/3/src/libmsc/osmo_msc.c File src/libmsc/osmo_msc.c: https://gerrit.osmocom.org/#/c/12368/3/src/libmsc/osmo_msc.c at 127 PS3, Line 127: LOGP Same, LOGPFSM()? -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 20:39:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 20:48:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Dec 2018 20:48:48 +0000 Subject: Change in libosmocore[master]: Use define for key buffers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12381 ) Change subject: Use define for key buffers ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12381/1/src/gsm/auth_core.c File src/gsm/auth_core.c: https://gerrit.osmocom.org/#/c/12381/1/src/gsm/auth_core.c at 101 PS1, Line 101: 3GPP TS 33.102 ?6.8.2.3 C5 > The commit message says "Use define for key buffers". [?] it's just a change in a comment, nevermind. -- To view, visit https://gerrit.osmocom.org/12381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5e2aad86eaecd8eada667b3488ba415d81c6312 Gerrit-Change-Number: 12381 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 20:48:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 20:49:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 20:49:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add a test for LU with invalid LAI In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12380 ) Change subject: add a test for LU with invalid LAI ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12380/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/12380/1/msc/MSC_Tests.ttcn at 2839 PS1, Line 2839: f_enc_mcc_mnc This function is private in BSSMAP_Templates.ttcn :/ https://gerrit.osmocom.org/#/c/12380/1/msc/MSC_Tests.ttcn at 2844 PS1, Line 2844: tr_ML3_MT_LU_Rej Should we expect any particular reject cause? -- To view, visit https://gerrit.osmocom.org/12380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1 Gerrit-Change-Number: 12380 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 20:49:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 20:49:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Dec 2018 20:49:59 +0000 Subject: Change in libosmocore[master]: rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12374 ) Change subject: rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2749cf75b7b45de0cd43cf4c696a6b6984f5a065 Gerrit-Change-Number: 12374 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 19 Dec 2018 20:49:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 20:50:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Dec 2018 20:50:00 +0000 Subject: Change in libosmocore[master]: rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12374 ) Change subject: rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI ...................................................................... rename CELL_IDENT_LAI_AND_LAC to CELL_IDENT_LAI The name "LAI AND LAC" makes no sense because a LAC is part of a LAI. Keep the old name available for API backwards compatibility. Change-Id: I2749cf75b7b45de0cd43cf4c696a6b6984f5a065 Related: OS#3124 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index cb9fe01..676d1cf 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -18,14 +18,15 @@ CELL_IDENT_LAC_AND_CI = 1, CELL_IDENT_CI = 2, CELL_IDENT_NO_CELL = 3, - CELL_IDENT_LAI_AND_LAC = 4, + CELL_IDENT_LAI = 4, CELL_IDENT_LAC = 5, CELL_IDENT_BSS = 6, CELL_IDENT_UTRAN_PLMN_LAC_RNC = 8, CELL_IDENT_UTRAN_RNC = 9, CELL_IDENT_UTRAN_LAC_RNC = 10, }; - +/* Keep this misnamed CELL_IDENT for API backwards compatibility (see OS#3124). */ +#define CELL_IDENT_LAI_AND_LAC CELL_IDENT_LAI /* GSM 08.06 ? 6.3 */ enum BSSAP_MSG_TYPE { -- To view, visit https://gerrit.osmocom.org/12374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2749cf75b7b45de0cd43cf4c696a6b6984f5a065 Gerrit-Change-Number: 12374 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 20:50:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Dec 2018 20:50:31 +0000 Subject: Change in libosmocore[master]: TLV: add convenience function for 1-byte values In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12373 ) Change subject: TLV: add convenience function for 1-byte values ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0a148bd04b8860e321f509fdcd913f688c8e920 Gerrit-Change-Number: 12373 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 19 Dec 2018 20:50:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 20:50:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Dec 2018 20:50:50 +0000 Subject: Change in libosmocore[master]: TLV: fix doc copy-paste error In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12372 ) Change subject: TLV: fix doc copy-paste error ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aa79cab7505585de00ee2aaae125462108906e8 Gerrit-Change-Number: 12372 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 19 Dec 2018 20:50:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 20:51:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Dec 2018 20:51:45 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_vty: fix missing talloc_free In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12355 ) Change subject: mgcp_client_vty: fix missing talloc_free ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I331b3d53b5eb330b87d798f952077a043674d409 Gerrit-Change-Number: 12355 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 20:51:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 20:53:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 19 Dec 2018 20:53:14 +0000 Subject: Change in libosmocore[master]: LCLS: don't encode incorrect values In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12375 ) Change subject: LCLS: don't encode incorrect values ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12375/1/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/12375/1/src/gsm/gsm0808.c at 340 PS1, Line 340: if (status == GSM0808_LCLS_STS_NA) I'm not sure this is worth it. The value can be *any* integer in most C compilers (particularly, gcc), and you are now checking for one invalid value, but not for close to 2^32 to 2^64 other invalid values... -- To view, visit https://gerrit.osmocom.org/12375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9ac4bae75f5796e6e11346b8cb34d3897ae70b59 Gerrit-Change-Number: 12375 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 19 Dec 2018 20:53:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 20:53:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 20:53:58 +0000 Subject: Change in libosmocore[master]: TLV: fix doc copy-paste error In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12372 ) Change subject: TLV: fix doc copy-paste error ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aa79cab7505585de00ee2aaae125462108906e8 Gerrit-Change-Number: 12372 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 19 Dec 2018 20:53:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 20:56:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 20:56:07 +0000 Subject: Change in libosmocore[master]: TLV: add convenience function for 1-byte values In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12373 ) Change subject: TLV: add convenience function for 1-byte values ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12373/2/include/osmocom/gsm/tlv.h File include/osmocom/gsm/tlv.h: https://gerrit.osmocom.org/#/c/12373/2/include/osmocom/gsm/tlv.h at 498 PS2, Line 498: Obtain 1-byte TLV element Neels recently asked me to take care about punctuation, so let's please use dots. -- To view, visit https://gerrit.osmocom.org/12373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0a148bd04b8860e321f509fdcd913f688c8e920 Gerrit-Change-Number: 12373 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 20:56:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 19 21:09:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 19 Dec 2018 21:09:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-iuh_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#2706?= Message-ID: <120045755.74.1545253755954.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 713.21 KB...] ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: ?struct MemberA? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberA { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberA { ^~~~~~~~~~~~~ CC RANAP_LHN-ID.lo CC RANAP_Links-to-log.lo CC RANAP_ListOF-SNAs.lo CC RANAP_ListOfInterfacesToTrace.lo CC RANAP_InterfacesToTraceItem.lo CC RANAP_LoadValue.lo CC RANAP_LocationRelatedDataRequestType.lo CC RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.lo CC RANAP_LocationReportingTransferInformation.lo CC RANAP_ReportChangeOfSAI.lo CC RANAP_PeriodicReportingIndicator.lo CC RANAP_DirectReportingIndicator.lo CC RANAP_L3-Information.lo CC RANAP_M1Report.lo CC RANAP_M2Report.lo CC RANAP_M4Report.lo CC RANAP_M4-Collection-Parameters.lo CC RANAP_M4-Period.lo CC RANAP_M4-Threshold.lo CC RANAP_M5Report.lo CC RANAP_M5-Period.lo CC RANAP_M6Report.lo CC RANAP_M6-Period.lo CC RANAP_M7Report.lo CC RANAP_M7-Period.lo CC RANAP_Management-Based-MDT-Allowed.lo CC RANAP_MaxBitrate.lo CC RANAP_MaxSDU-Size.lo CC RANAP_MBMS-PTP-RAB-ID.lo CC RANAP_MBMSBearerServiceType.lo CC RANAP_MBMSCNDe-Registration.lo CC RANAP_MBMSCountingInformation.lo CC RANAP_MBMSHCIndicator.lo CC RANAP_MBMSIPMulticastAddressandAPNRequest.lo CC RANAP_MBMSLinkingInformation.lo CC RANAP_MBMSRegistrationRequestType.lo CC RANAP_MBMSServiceArea.lo CC RANAP_MBMSSessionDuration.lo CC RANAP_MBMSSessionIdentity.lo CC RANAP_MBMSSessionRepetitionNumber.lo CC RANAP_MDT-Activation.lo CC RANAP_MDTAreaScope.lo CC RANAP_MDT-Configuration.lo CC RANAP_MDTMode.lo CC RANAP_MDT-PLMN-List.lo CC RANAP_MDT-Report-Parameters.lo CC RANAP_MeasurementQuantity.lo CC RANAP_MeasurementsToActivate.lo CC RANAP_MSISDN.lo CC RANAP_NAS-PDU.lo CC RANAP_NAS-SequenceNumber.lo CC RANAP_NAS-SynchronisationIndicator.lo CC RANAP_NewBSS-To-OldBSS-Information.lo CC RANAP_NonSearchingIndication.lo CC RANAP_NRTLoadInformationValue.lo CC RANAP_NumberOfIuInstances.lo CC RANAP_NumberOfSteps.lo CC RANAP_Offload-RAB-Parameters.lo CC RANAP_Offload-RAB-Parameters-APN.lo CC RANAP_Offload-RAB-Parameters-ChargingCharacteristics.lo CC RANAP_OldBSS-ToNewBSS-Information.lo CC RANAP_OMC-ID.lo CC RANAP_Out-Of-UTRAN.lo CC RANAP_PagingAreaID.lo CC RANAP_PagingCause.lo CC RANAP_PDP-TypeInformation.lo CC RANAP_PDP-Type.lo CC RANAP_PDP-TypeInformation-extension.lo CC RANAP_PDP-Type-extension.lo CC RANAP_PDUType14FrameSequenceNumber.lo CC RANAP_PeriodicLocationInfo.lo CC RANAP_PermanentNAS-UE-ID.lo CC RANAP_PermittedEncryptionAlgorithms.lo CC RANAP_PermittedIntegrityProtectionAlgorithms.lo CC RANAP_LABased.lo CC RANAP_LAI-List.lo CC RANAP_LoggedMDT.lo CC RANAP_LoggingInterval.lo CC RANAP_LoggingDuration.lo CC RANAP_PLMNidentity.lo CC RANAP_PLMNs-in-shared-network.lo CC RANAP_Port-Number.lo CC RANAP_PositioningDataDiscriminator.lo CC RANAP_PositioningDataSet.lo CC RANAP_PositioningMethodAndUsage.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:14, from RANAP_PLMNs-in-shared-network.c:7: ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: ?struct MemberA? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberA { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberA { ^~~~~~~~~~~~~ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:23: warning: ?struct MemberM? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberM { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberM { ^~~~~~~~~~~~~ CC RANAP_PositioningPriority.lo CC RANAP_PositionData.lo CC RANAP_PositionDataSpecificToGERANIuMode.lo CC RANAP_Pre-emptionCapability.lo CC RANAP_Pre-emptionVulnerability.lo CC RANAP_PriorityLevel.lo CC RANAP_Priority-Class-Indicator.lo CC RANAP_ProvidedData.lo CC RANAP_P-TMSI.lo CC RANAP_QueuingAllowed.lo CC RANAP_RAB-AsymmetryIndicator.lo CC RANAP_RABased.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:14, from ../../include/osmocom/ranap/RANAP_Shared-Network-Information.h:14, from ../../include/osmocom/ranap/RANAP_ProvidedData.h:14, from RANAP_ProvidedData.c:7: ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: ?struct MemberA? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberA { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberA { ^~~~~~~~~~~~~ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:23: warning: ?struct MemberM? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberM { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberM { ^~~~~~~~~~~~~ CC RANAP_RAI-List.lo CC RANAP_RABDataVolumeReport.lo CC RANAP_RAB-ID.lo CC RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_RAB-Parameter-MaxBitrateList.lo CC RANAP_RAB-Parameters.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:14, from RANAP_RABDataVolumeReport.c:7: ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: ?struct MemberN? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberN { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberN { ^~~~~~~~~~~~~ CC RANAP_RABParametersList.lo CC RANAP_RAB-SubflowCombinationBitRate.lo CC RANAP_RAB-TrCH-Mapping.lo CC RANAP_RAB-TrCH-MappingItem.lo CC RANAP_RAC.lo CC RANAP_RAI.lo CC RANAP_RAListofIdleModeUEs.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_RABParametersList.h:14, from RANAP_RABParametersList.c:7: ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: ?struct MemberN? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberN { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberN { ^~~~~~~~~~~~~ In file included from :8:0, from ../../include/osmocom/ranap/RANAP_RABParametersList.h:14, from RANAP_RABParametersList.c:7: ../../include/osmocom/ranap/RANAP_RABParametersList.h:29:23: warning: ?struct MemberB? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberB { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_RABParametersList.h:29:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberB { ^~~~~~~~~~~~~ CC RANAP_NotEmptyRAListofIdleModeUEs.lo CC RANAP_RAofIdleModeUEs.lo CC RANAP_LAListofIdleModeUEs.lo CC RANAP_RAT-Type.lo CC RANAP_RateControlAllowed.lo CC RANAP_RedirectAttemptFlag.lo CC RANAP_RedirectionCompleted.lo CC RANAP_RejectCauseValue.lo CC RANAP_RelocationRequirement.lo CC RANAP_RelocationType.lo CC RANAP_RepetitionNumber0.lo CC RANAP_RepetitionNumber1.lo CC RANAP_ReportArea.lo CC RANAP_ReportInterval.lo CC RANAP_ReportAmount.lo CC RANAP_RequestedGPSAssistanceData.lo CC RANAP_RequestedGANSSAssistanceData.lo CC RANAP_RequestedLocationRelatedDataType.lo CC RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.lo CC RANAP_MBMSIPMulticastAddressandAPNlist.lo CC RANAP_RequestedMulticastServiceList.lo CC RANAP_Requested-RAB-Parameter-Values.lo CC RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Requested-RAB-Parameter-MaxBitrateList.lo CC RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_RequestType.lo CC RANAP_ResidualBitErrorRatio.lo CC RANAP_ResponseTime.lo CC RANAP_RIMInformation.lo /bin/bash: line 1: 18634 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0.13-45696\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0.13-45696\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-iuh\" -DVERSION=\"0.3.0.13-45696\" -DSTDC_HEADERS=1 -I. -fsanitize=address -fsanitize=undefined -Wall -I../../include -I -I -I -g -O2 -fsanitize=address -fsanitize=undefined -Wall -MT RANAP_RequestType.lo -MD -MP -MF .deps/RANAP_RequestType.Tpo -c -o RANAP_RequestType.lo RANAP_RequestType.c Makefile:2506: recipe for target 'RANAP_RequestType.lo' failed make[4]: *** [RANAP_RequestType.lo] Error 139 make[4]: *** Waiting for unfinished jobs.... make[4]: Leaving directory ' Makefile:642: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory ' Makefile:454: recipe for target 'all' failed make[2]: *** [all] Error 2 make[2]: Leaving directory ' Makefile:458: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 19 21:25:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 21:25:37 +0000 Subject: Change in libosmocore[master]: tests/gsup_test.c: drop session IEs from MO-ForwardSM Error Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12382 Change subject: tests/gsup_test.c: drop session IEs from MO-ForwardSM Error ...................................................................... tests/gsup_test.c: drop session IEs from MO-ForwardSM Error Both session state and session ID IEs were left from the initial version of Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71. There is no need to use them (as we use SM-RP-MR), so let's claen up. Change-Id: I0d910b87f15ffbc0aeeca9cb4fcbef32bdf3ef88 --- M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err 2 files changed, 4 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/82/12382/1 diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index b3a8c77..6c5d351 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -256,12 +256,6 @@ 0x25, /* OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR */ TEST_IMSI_IE, - /* Session related IEs */ - 0x30, 0x04, /* Session ID */ - 0xde, 0xad, 0xbe, 0xef, - 0x31, 0x01, /* Session state (END) */ - 0x03, - /* SM related IEs */ 0x40, 0x01, /* SM-RP-MR (Message Reference) */ 0xfa, diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index 236c38a..c81755e 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -58,8 +58,8 @@ generated message: 2a 01 08 21 43 65 87 09 21 43 f5 40 01 fa 43 04 de ad be ef original message: 2a 01 08 21 43 65 87 09 21 43 f5 40 01 fa 43 04 de ad be ef IMSI: 123456789012345 - generated message: 25 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 40 01 fa 44 01 af - original message: 25 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 40 01 fa 44 01 af + generated message: 25 01 08 21 43 65 87 09 21 43 f5 40 01 fa 44 01 af + original message: 25 01 08 21 43 65 87 09 21 43 f5 40 01 fa 44 01 af IMSI: 123456789012345 generated message: 2c 01 08 21 43 65 87 09 21 43 f5 46 01 02 original message: 2c 01 08 21 43 65 87 09 21 43 f5 46 01 02 @@ -84,7 +84,7 @@ message 17: tested 33 truncations, 29 parse failures message 18: tested 44 truncations, 39 parse failures message 19: tested 20 truncations, 18 parse failures - message 20: tested 26 truncations, 22 parse failures + message 20: tested 17 truncations, 15 parse failures message 21: tested 14 truncations, 13 parse failures DLGSUP Stopping DLGSUP logging message 0: tested 2816 modifications, 510 parse failures @@ -107,5 +107,5 @@ message 17: tested 8448 modifications, 2053 parse failures message 18: tested 11264 modifications, 2307 parse failures message 19: tested 5120 modifications, 1031 parse failures - message 20: tested 6656 modifications, 1546 parse failures + message 20: tested 4352 modifications, 1030 parse failures message 21: tested 3584 modifications, 771 parse failures -- To view, visit https://gerrit.osmocom.org/12382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0d910b87f15ffbc0aeeca9cb4fcbef32bdf3ef88 Gerrit-Change-Number: 12382 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 22:19:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 22:19:18 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_vty: fix missing talloc_free In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12355 ) Change subject: mgcp_client_vty: fix missing talloc_free ...................................................................... mgcp_client_vty: fix missing talloc_free If the vty client enters multiple local / remote addresses, that leaks talloc memory of the previously set addresses. Free those first, if any, using osmo_talloc_replace_string(). Change-Id: I331b3d53b5eb330b87d798f952077a043674d409 --- M src/libosmo-mgcp-client/mgcp_client_vty.c 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index 48fcd70..ecc205f 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -43,8 +43,9 @@ if (!global_mgcp_client_conf) return CMD_ERR_NOTHING_TODO; OSMO_ASSERT(global_mgcp_client_ctx); - global_mgcp_client_conf->local_addr = - talloc_strdup(global_mgcp_client_ctx, argv[0]); + osmo_talloc_replace_string(global_mgcp_client_ctx, + (char**)&global_mgcp_client_conf->local_addr, + argv[0]); return CMD_SUCCESS; } ALIAS_DEPRECATED(cfg_mgw_local_ip, cfg_mgcpgw_local_ip_cmd, @@ -75,8 +76,9 @@ if (!global_mgcp_client_conf) return CMD_ERR_NOTHING_TODO; OSMO_ASSERT(global_mgcp_client_ctx); - global_mgcp_client_conf->remote_addr = - talloc_strdup(global_mgcp_client_ctx, argv[0]); + osmo_talloc_replace_string(global_mgcp_client_ctx, + (char**)&global_mgcp_client_conf->remote_addr, + argv[0]); return CMD_SUCCESS; } ALIAS_DEPRECATED(cfg_mgw_remote_ip, cfg_mgcpgw_remote_ip_cmd, -- To view, visit https://gerrit.osmocom.org/12355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I331b3d53b5eb330b87d798f952077a043674d409 Gerrit-Change-Number: 12355 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 22:22:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 22:22:33 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: drop a bunch of dead code In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12354 ) Change subject: mgcp_client: drop a bunch of dead code ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 Gerrit-Change-Number: 12354 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 19 Dec 2018 22:22:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 22:22:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 22:22:34 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: drop a bunch of dead code In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12354 ) Change subject: mgcp_client: drop a bunch of dead code ...................................................................... mgcp_client: drop a bunch of dead code Remove public API that makes no sense anymore and is dead code. I see the dropped API as a dead-end initial misconception of the early mgcp client, and it doesn't really make sense to drag this stuff along. It has not been used by osmo-msc,-bsc for a long time now, and just confuses the reader. It is public API, yes, and older versions of osmo-msc / osmo-bsc will not be able to compile against this, but even if it did, the resulting MGCP client would not work with the current osmo-mgw: this API is still based on the premise that the MGCP client dictates the MGW endpoint numbers, a concept that cannot be used with the current osmo-mgw. Instead, osmo-mgw expects a wildcarded endpoint upon CRCX and assigns its own endpoint names. Also, the bts-base configuration is unused and a legacy of when osmo-bsc_mgcp had explicit BTS and CN sides. Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 --- M TODO-RELEASE M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_vty.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 7 files changed, 12 insertions(+), 415 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index c5a3b36..3969146 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,3 +24,4 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line +libosmo-mgcp-client various Drop legacy API functions and mgcp_client_conf members diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index 79f2078..c1fd1b0 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -22,9 +22,6 @@ int local_port; const char *remote_addr; int remote_port; - uint16_t first_endpoint; - uint16_t last_endpoint; - uint16_t bts_base; }; typedef unsigned int mgcp_trans_id_t; @@ -123,9 +120,6 @@ uint16_t mgcp_client_remote_port(struct mgcp_client *mgcp); uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp); -int mgcp_client_next_endpoint(struct mgcp_client *client); -void mgcp_client_release_endpoint(uint16_t id, struct mgcp_client *client); - /* Invoked when an MGCP response is received or sending failed. When the * response is passed as NULL, this indicates failure during transmission. */ typedef void (* mgcp_response_cb_t )(struct mgcp_response *response, void *priv); @@ -137,20 +131,6 @@ enum mgcp_connection_mode; -struct msgb *mgcp_msg_crcx(struct mgcp_client *mgcp, - uint16_t rtp_endpoint, unsigned int call_id, - enum mgcp_connection_mode mode) -OSMO_DEPRECATED("Use mgcp_msg_gen() instead"); - -struct msgb *mgcp_msg_mdcx(struct mgcp_client *mgcp, - uint16_t rtp_endpoint, const char *rtp_conn_addr, - uint16_t rtp_port, enum mgcp_connection_mode mode) -OSMO_DEPRECATED("Use mgcp_msg_gen() instead"); - -struct msgb *mgcp_msg_dlcx(struct mgcp_client *mgcp, uint16_t rtp_endpoint, - unsigned int call_id) -OSMO_DEPRECATED("Use mgcp_msg_gen() instead"); - struct msgb *mgcp_msg_gen(struct mgcp_client *mgcp, struct mgcp_msg *mgcp_msg); mgcp_trans_id_t mgcp_msg_trans_id(struct msgb *msg); diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index fc9c5d3..2ceab3c 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -190,75 +190,9 @@ .local_port = -1, .remote_addr = NULL, .remote_port = -1, - .first_endpoint = 0, - .last_endpoint = 0, - .bts_base = 0, }; } -/* Test if a given endpoint id is currently in use */ -static bool endpoint_in_use(uint16_t id, struct mgcp_client *client) -{ - struct mgcp_inuse_endpoint *endpoint; - llist_for_each_entry(endpoint, &client->inuse_endpoints, entry) { - if (endpoint->id == id) - return true; - } - - return false; -} - -/*! Pick next free endpoint ID. - * \param[in,out] client MGCP client descriptor. - * \returns 0 on success, -EINVAL on error. */ -int mgcp_client_next_endpoint(struct mgcp_client *client) -{ - int i; - uint16_t first_endpoint = client->actual.first_endpoint; - uint16_t last_endpoint = client->actual.last_endpoint; - struct mgcp_inuse_endpoint *endpoint; - - /* Use the maximum permitted range if the VTY - * configuration does not specify a range */ - if (client->actual.last_endpoint == 0) { - first_endpoint = 1; - last_endpoint = 65534; - } - - /* Test the permitted endpoint range for an endpoint - * number that is not in use. When a suitable endpoint - * number can be found, seize it by adding it to the - * inuse list. */ - for (i=first_endpoint;iid = i; - llist_add_tail(&endpoint->entry, &client->inuse_endpoints); - return endpoint->id; - } - } - - /* All endpoints are busy! */ - return -EINVAL; -} - -/*! Release a seized endpoint ID to make it available again for other calls. - * \param[in] id Endpoint ID - * \param[in,out] client MGCP client descriptor. */ -/* Release a seized endpoint id to make it available again for other calls */ -void mgcp_client_release_endpoint(uint16_t id, struct mgcp_client *client) -{ - struct mgcp_inuse_endpoint *endpoint; - struct mgcp_inuse_endpoint *endpoint_tmp; - llist_for_each_entry_safe(endpoint, endpoint_tmp, &client->inuse_endpoints, entry) { - if (endpoint->id == id) { - llist_del(&endpoint->entry); - talloc_free(endpoint); - } - } -} - static void mgcp_client_handle_response(struct mgcp_client *mgcp, struct mgcp_response_pending *pending, struct mgcp_response *response) @@ -769,10 +703,6 @@ mgcp->actual.remote_port = conf->remote_port >= 0 ? (uint16_t)conf->remote_port : MGCP_CLIENT_REMOTE_PORT_DEFAULT; - mgcp->actual.first_endpoint = conf->first_endpoint > 0 ? (uint16_t)conf->first_endpoint : 0; - mgcp->actual.last_endpoint = conf->last_endpoint > 0 ? (uint16_t)conf->last_endpoint : 0; - mgcp->actual.bts_base = conf->bts_base > 0 ? (uint16_t)conf->bts_base : 4000; - return mgcp; } @@ -977,54 +907,6 @@ */ } -static struct msgb *mgcp_msg_from_buf(mgcp_trans_id_t trans_id, - const char *buf, int len) -{ - struct msgb *msg; - - if (len > (4096 - 128)) { - LOGP(DLMGCP, LOGL_ERROR, "Cannot send to MGCP GW:" - " message too large: %d\n", len); - return NULL; - } - - msg = msgb_alloc_headroom(4096, 128, "MGCP tx"); - OSMO_ASSERT(msg); - - char *dst = (char*)msgb_put(msg, len); - memcpy(dst, buf, len); - msg->l2h = msg->data; - msg->cb[MSGB_CB_MGCP_TRANS_ID] = trans_id; - - return msg; -} - -static struct msgb *mgcp_msg_from_str(mgcp_trans_id_t trans_id, - const char *fmt, ...) -{ - static char compose[4096 - 128]; - va_list ap; - int len; - OSMO_ASSERT(fmt); - - va_start(ap, fmt); - len = vsnprintf(compose, sizeof(compose), fmt, ap); - va_end(ap); - if (len >= sizeof(compose)) { - LOGP(DLMGCP, LOGL_ERROR, - "Message too large: trans_id=%u len=%d\n", - trans_id, len); - return NULL; - } - if (len < 1) { - LOGP(DLMGCP, LOGL_ERROR, - "Failed to compose message: trans_id=%u len=%d\n", - trans_id, len); - return NULL; - } - return mgcp_msg_from_buf(trans_id, compose, len); -} - static mgcp_trans_id_t mgcp_client_next_trans_id(struct mgcp_client *mgcp) { /* avoid zero trans_id to distinguish from unset trans_id */ @@ -1033,52 +915,6 @@ return mgcp->next_trans_id ++; } -struct msgb *mgcp_msg_crcx(struct mgcp_client *mgcp, - uint16_t rtp_endpoint, unsigned int call_id, - enum mgcp_connection_mode mode) -{ - mgcp_trans_id_t trans_id = mgcp_client_next_trans_id(mgcp); - return mgcp_msg_from_str(trans_id, - "CRCX %u %x at mgw MGCP 1.0\r\n" - "C: %x\r\n" - "L: p:20, a:AMR, nt:IN\r\n" - "M: %s\r\n" - , - trans_id, - rtp_endpoint, - call_id, - mgcp_client_cmode_name(mode)); -} - -struct msgb *mgcp_msg_mdcx(struct mgcp_client *mgcp, - uint16_t rtp_endpoint, const char *rtp_conn_addr, - uint16_t rtp_port, enum mgcp_connection_mode mode) - -{ - mgcp_trans_id_t trans_id = mgcp_client_next_trans_id(mgcp); - return mgcp_msg_from_str(trans_id, - "MDCX %u %x at mgw MGCP 1.0\r\n" - "M: %s\r\n" - "\r\n" - "c=IN IP4 %s\r\n" - "m=audio %u RTP/AVP 255\r\n" - , - trans_id, - rtp_endpoint, - mgcp_client_cmode_name(mode), - rtp_conn_addr, - rtp_port); -} - -struct msgb *mgcp_msg_dlcx(struct mgcp_client *mgcp, uint16_t rtp_endpoint, - unsigned int call_id) -{ - mgcp_trans_id_t trans_id = mgcp_client_next_trans_id(mgcp); - return mgcp_msg_from_str(trans_id, - "DLCX %u %x at mgw MGCP 1.0\r\n" - "C: %x\r\n", trans_id, rtp_endpoint, call_id); -} - #define MGCP_CRCX_MANDATORY (MGCP_MSG_PRESENCE_ENDPOINT | \ MGCP_MSG_PRESENCE_CALL_ID | \ MGCP_MSG_PRESENCE_CONN_MODE) diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index ecc205f..8fa0272 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -101,23 +101,14 @@ MGW_STR "remote bind to connect to MGCP gateway with\n" "remote bind port\n") -DEFUN(cfg_mgw_endpoint_range, cfg_mgw_endpoint_range_cmd, +DEFUN_DEPRECATED(cfg_mgw_endpoint_range, cfg_mgw_endpoint_range_cmd, "mgw endpoint-range <1-65534> <1-65534>", - MGW_STR "usable range of endpoint identifiers\n" - "set first usable endpoint identifier\n" - "set last usable endpoint identifier\n") + MGW_STR "DEPRECATED: the endpoint range cannot be defined by the client\n" + "-\n" "-\n") { - uint16_t first_endpoint = atoi(argv[0]); - uint16_t last_endpoint = atoi(argv[1]); - - if (last_endpoint < first_endpoint) { - vty_out(vty, "last endpoint must be greater than first endpoint!%s", - VTY_NEWLINE); - return CMD_SUCCESS; - } - - global_mgcp_client_conf->first_endpoint = first_endpoint; - global_mgcp_client_conf->last_endpoint = last_endpoint; + vty_out(vty, "Please do not use legacy config 'mgw endpoint-range'" + " (the range can no longer be defined by the MGCP client)%s", + VTY_NEWLINE); return CMD_SUCCESS; } ALIAS_DEPRECATED(cfg_mgw_endpoint_range, cfg_mgcpgw_endpoint_range_cmd, @@ -128,14 +119,15 @@ #define BTS_START_STR "First UDP port allocated for the BTS side\n" #define UDP_PORT_STR "UDP Port number\n" -DEFUN(cfg_mgw_rtp_bts_base_port, +DEFUN_DEPRECATED(cfg_mgw_rtp_bts_base_port, cfg_mgw_rtp_bts_base_port_cmd, "mgw bts-base <0-65534>", MGW_STR - BTS_START_STR - UDP_PORT_STR) + "DEPRECATED: there is no explicit BTS side in current osmo-mgw\n" "-\n") { - global_mgcp_client_conf->bts_base = atoi(argv[0]); + vty_out(vty, "Please do not use legacy config 'mgw bts-base'" + " (there is no explicit BTS side in an MGW anymore)%s", + VTY_NEWLINE); return CMD_SUCCESS; } ALIAS_DEPRECATED(cfg_mgw_rtp_bts_base_port, @@ -149,9 +141,6 @@ { const char *addr; int port; - uint16_t first_endpoint; - uint16_t last_endpoint; - uint16_t bts_base; addr = global_mgcp_client_conf->local_addr; if (addr) @@ -171,19 +160,6 @@ vty_out(vty, "%smgw remote-port %u%s", indent, (uint16_t)port, VTY_NEWLINE); - first_endpoint = global_mgcp_client_conf->first_endpoint; - last_endpoint = global_mgcp_client_conf->last_endpoint; - if (last_endpoint != 0) { - vty_out(vty, "%smgw endpoint-range %u %u%s", indent, - first_endpoint, last_endpoint, VTY_NEWLINE); - } - - bts_base = global_mgcp_client_conf->bts_base; - if (bts_base) { - vty_out(vty, "%smgw bts-base %u%s", indent, - bts_base, VTY_NEWLINE); - } - return CMD_SUCCESS; } diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index e6982e4..1db70cf 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -135,87 +135,6 @@ return trans_id; } -void test_crcx(void) -{ - struct msgb *msg; - mgcp_trans_id_t trans_id; - - printf("\n===== %s =====\n", __func__); - - if (mgcp) - talloc_free(mgcp); - mgcp = mgcp_client_init(ctx, &conf); - - msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK); - trans_id = dummy_mgcp_send(msg); - - reply_to(trans_id, 200, "OK", - "I: 1\r\n\r\n" - "v=0\r\n" - "o=- 1 23 IN IP4 10.9.1.120\r\n" - "s=-\r\n" - "c=IN IP4 10.9.1.120\r\n" - "t=0 0\r\n" - "m=audio 16002 RTP/AVP 110 96\r\n" - "a=rtpmap:110 AMR/8000\r\n" - "a=rtpmap:96 GSM-EFR/8000\r\n" - "a=ptime:20\r\n"); -} - -void test_crcx_long_conn_id(void) -{ - struct msgb *msg; - mgcp_trans_id_t trans_id; - - printf("\n===== %s =====\n", __func__); - - if (mgcp) - talloc_free(mgcp); - mgcp = mgcp_client_init(ctx, &conf); - - msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK); - trans_id = dummy_mgcp_send(msg); - - reply_to(trans_id, 200, "OK", - "I: 123456789abcdef0123456789ABCDEF0\r\n\r\n" - "v=0\r\n" - "o=- 1 23 IN IP4 10.9.1.120\r\n" - "s=-\r\n" - "c=IN IP4 10.9.1.120\r\n" - "t=0 0\r\n" - "m=audio 16002 RTP/AVP 110 96\r\n" - "a=rtpmap:110 AMR/8000\r\n" - "a=rtpmap:96 GSM-EFR/8000\r\n" - "a=ptime:20\r\n"); -} - -void test_crcx_too_long_conn_id(void) -{ - struct msgb *msg; - mgcp_trans_id_t trans_id; - - printf("\n===== %s =====\n", __func__); - - if (mgcp) - talloc_free(mgcp); - mgcp = mgcp_client_init(ctx, &conf); - - msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK); - trans_id = dummy_mgcp_send(msg); - - reply_to(trans_id, 200, "OK", - "I: 123456789abcdef0123456789ABCDEF01001029\r\n\r\n" - "v=0\r\n" - "o=- 1 23 IN IP4 10.9.1.120\r\n" - "s=-\r\n" - "c=IN IP4 10.9.1.120\r\n" - "t=0 0\r\n" - "m=audio 16002 RTP/AVP 110 96\r\n" - "a=rtpmap:110 AMR/8000\r\n" - "a=rtpmap:96 GSM-EFR/8000\r\n" - "a=ptime:20\r\n"); -} - void test_mgcp_msg(void) { struct msgb *msg; @@ -618,14 +537,11 @@ mgcp_client_conf_init(&conf); - test_crcx(); test_mgcp_msg(); test_mgcp_client_cancel(); test_sdp_section_start(); test_map_codec_to_pt_and_map_pt_to_codec(); test_map_pt_to_codec(); - test_crcx_long_conn_id(); - test_crcx_too_long_conn_id(); printf("Done\n"); fprintf(stderr, "Done\n"); diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err index b20f93f..1d5a1a0 100644 --- a/tests/mgcp_client/mgcp_client_test.err +++ b/tests/mgcp_client/mgcp_client_test.err @@ -66,6 +66,4 @@ DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100 DLMGCP ptmap contains illegal mapping: codec=113 maps to pt=2 DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100 -DLMGCP Failed to parse MGCP response (parameter label: I): the received conn ID is too long: 39, maximum is 32 characters -DLMGCP Cannot parse MGCP response (head parameters) Done diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index 40e32ba..65b5298 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -1,46 +1,4 @@ -===== test_crcx ===== -composed: ------ -CRCX 1 17 at mgw MGCP 1.0 -C: 2a -L: p:20, a:AMR, nt:IN -M: loopback - ------ -composed response: ------ -200 1 OK -I: 1 - -v=0 -o=- 1 23 IN IP4 10.9.1.120 -s=- -c=IN IP4 10.9.1.120 -t=0 0 -m=audio 16002 RTP/AVP 110 96 -a=rtpmap:110 AMR/8000 -a=rtpmap:96 GSM-EFR/8000 -a=ptime:20 - ------ -response cb received: - head.response_code = 200 - head.trans_id = 1 - head.conn_id = 1 - head.comment = OK - audio_port = 16002 - audio_ip = 10.9.1.120 - ptime = 20 - codecs_len = 2 - codecs[0] = 112 - codecs[1] = 110 - ptmap_len = 2 - ptmap[0].codec = 112 - ptmap[0].pt = 110 - ptmap[1].codec = 110 - ptmap[1].pt = 96 - Generated CRCX message: CRCX 1 23 at mgw MGCP 1.0 C: 2f @@ -196,72 +154,4 @@ 2 <= 2 100 <= 100 - -===== test_crcx_long_conn_id ===== -composed: ------ -CRCX 1 17 at mgw MGCP 1.0 -C: 2a -L: p:20, a:AMR, nt:IN -M: loopback - ------ -composed response: ------ -200 1 OK -I: 123456789abcdef0123456789ABCDEF0 - -v=0 -o=- 1 23 IN IP4 10.9.1.120 -s=- -c=IN IP4 10.9.1.120 -t=0 0 -m=audio 16002 RTP/AVP 110 96 -a=rtpmap:110 AMR/8000 -a=rtpmap:96 GSM-EFR/8000 -a=ptime:20 - ------ -response cb received: - head.response_code = 200 - head.trans_id = 1 - head.conn_id = 123456789abcdef0123456789ABCDEF0 - head.comment = OK - audio_port = 16002 - audio_ip = 10.9.1.120 - ptime = 20 - codecs_len = 2 - codecs[0] = 112 - codecs[1] = 110 - ptmap_len = 2 - ptmap[0].codec = 112 - ptmap[0].pt = 110 - ptmap[1].codec = 110 - ptmap[1].pt = 96 - -===== test_crcx_too_long_conn_id ===== -composed: ------ -CRCX 1 17 at mgw MGCP 1.0 -C: 2a -L: p:20, a:AMR, nt:IN -M: loopback - ------ -composed response: ------ -200 1 OK -I: 123456789abcdef0123456789ABCDEF01001029 - -v=0 -o=- 1 23 IN IP4 10.9.1.120 -s=- -c=IN IP4 10.9.1.120 -t=0 0 -m=audio 16002 RTP/AVP 110 96 -a=rtpmap:110 AMR/8000 -a=rtpmap:96 GSM-EFR/8000 -a=ptime:20 - ------ Done -- To view, visit https://gerrit.osmocom.org/12354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 Gerrit-Change-Number: 12354 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 19 22:26:24 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 19 Dec 2018 22:26:24 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7579?= Message-ID: <1091278477.75.1545258385017.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 826.51 KB...] no stats reporter statsd stats reporter log no stats reporter log stats interval <1-65535> network msc mncc-int hlr smpp OsmoMSC(config)# network OsmoMSC(config-net)# list help list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6502 bytes in 49 blocks) struct osmo_ss7_instance contains 2389 bytes in 27 blocks (ref 0) 0x61400000a6a0 struct osmo_sccp_instance contains 266 bytes in 3 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f0000091f0 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b00016ab20 struct osmo_ss7_asp contains 1084 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 359 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A)[0x612000016d20] contains 44 bytes in 1 blocks (ref 0) 0x60d000027da0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016abd0 struct osmo_fsm_inst contains 270 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b00016ac80 xua_default_lm(asp-clnt-OsmoMSC-A)[0x612000017020] contains 51 bytes in 1 blocks (ref 0) 0x60e00003a1e0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ae0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016ad30 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ba0 struct osmo_ss7_as contains 598 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 356 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A)[0x612000017320] contains 42 bytes in 1 blocks (ref 0) 0x60d000027e70 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046de0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046ea0 struct osmo_ss7_route_table contains 145 bytes in 4 blocks (ref 0) 0x60e00003a3a0 struct osmo_ss7_route contains 82 bytes in 2 blocks (ref 0) 0x60e00003a2c0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046d20 system contains 7 bytes in 1 blocks (ref 0) 0x60b00016ade0 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b0001592a0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3959 bytes in 15 blocks (ref 0) 0x61300000d0e0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d660 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b00013f200 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000140cd0 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000141300 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000cf20 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009aa0 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002bb60 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000158220 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a720 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d9e0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027c00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027cd0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000280e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000281b0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c380 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c450 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000010640 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Cannot find line ' mgw endpoint-range <1-65534> <1-65534>' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> ] Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-transcript-test] Error 1 make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 19 22:27:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 22:27:07 +0000 Subject: Change in libosmocore[master]: tests/gsm0808: use new msgb comparison API In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#3) to the change originally created by Max. ( https://gerrit.osmocom.org/12271 ) Change subject: tests/gsm0808: use new msgb comparison API ...................................................................... tests/gsm0808: use new msgb comparison API Since I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5, we have some helpers to compare certain msgb layer to a given buffer. Let's change 'VERIFY' macro to use msgb_eq_l3_data_print(). Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b --- M tests/gsm0808/gsm0808_test.c 1 file changed, 3 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/12271/3 -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: fixeria -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 19 22:27:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 19 Dec 2018 22:27:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7579?= Message-ID: <1936643958.76.1545258435575.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.10 MB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6640 bytes in 53 blocks) iu contains 2 bytes in 2 blocks (ref 0) 0x60b000168550 asn1 contains 1 bytes in 1 blocks (ref 0) 0x60b0001684a0 struct osmo_ss7_instance contains 2509 bytes in 29 blocks (ref 0) 0x61400000a4a0 struct osmo_sccp_instance contains 359 bytes in 5 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f000009010 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b000168340 struct osmo_sccp_user contains 93 bytes in 2 blocks (ref 0) 0x60f000009100 OsmoMSC-IuCS contains 13 bytes in 1 blocks (ref 0) 0x60b0001683f0 struct osmo_ss7_asp contains 1099 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 365 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A-Iu)[0x612000016d20] contains 47 bytes in 1 blocks (ref 0) 0x60d000027b30 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c0000465a0 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168600 struct osmo_fsm_inst contains 276 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b0001686b0 xua_default_lm(asp-clnt-OsmoMSC-A-Iu)[0x612000017020] contains 54 bytes in 1 blocks (ref 0) 0x60e000039e60 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046660 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168760 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046720 struct osmo_ss7_as contains 607 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 362 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A-Iu)[0x612000017320] contains 45 bytes in 1 blocks (ref 0) 0x60d000027c00 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046960 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_ss7_route_table contains 148 bytes in 4 blocks (ref 0) 0x60e00003a020 struct osmo_ss7_route contains 85 bytes in 2 blocks (ref 0) 0x60e000039f40 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c0000468a0 system contains 7 bytes in 1 blocks (ref 0) 0x60b000168810 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b000156cd0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3975 bytes in 15 blocks (ref 0) 0x61400000faa0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d570 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b000158430 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000159f00 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b00015a530 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000d0e0 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009c60 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002b8f0 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000155c50 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a3a0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d560 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027990 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027a60 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027e70 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027f40 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c110 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c1e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000103d0 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Mismatch: Expect: ' mgw endpoint-range <1-65534> <1-65534>' Got: ' iu rab-assign-addr-enc (x213|v4raw)' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) ] Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-transcript-test] Error 1 make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 19 22:29:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 22:29:42 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12368 ) Change subject: abort assignment on Assignment Failure ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12368/3/src/libmsc/msc_mgcp.c File src/libmsc/msc_mgcp.c: https://gerrit.osmocom.org/#/c/12368/3/src/libmsc/msc_mgcp.c at 1085 PS3, Line 1085: conn->fi->id); > Why not 'LOGPFSM(conn->fi, ... [?] because then it would be clamped to another logging category. To reiterate, the LOGPFSM() was initially intended for logging the FSM state transitions, but using the FSM instance's context is super useful. So at some point I added LOGPFSML() to be able to modify the logging level. However, so far each FSM definition is fixed to one particular logging category, ran_conn is always DMM. Maybe we also need LOGPFSMSL(FI, SUBSYS, LEVEL, fmt, args)? The next best thing is to use the FSM instance's context as a string in a normal log statement. That omits the current FSM state, but otherwise logs everything else of interest. -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 22:29:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 19 22:31:59 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 19 Dec 2018 22:31:59 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7580?= In-Reply-To: <1091278477.75.1545258385017.JavaMail.jenkins@jenkins.osmocom.org> References: <1091278477.75.1545258385017.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <984856914.77.1545258719315.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 826.56 KB...] no stats reporter statsd stats reporter log no stats reporter log stats interval <1-65535> network msc mncc-int hlr smpp OsmoMSC(config)# network OsmoMSC(config-net)# list help list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6502 bytes in 49 blocks) struct osmo_ss7_instance contains 2389 bytes in 27 blocks (ref 0) 0x61400000a6a0 struct osmo_sccp_instance contains 266 bytes in 3 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f0000091f0 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b00016ab20 struct osmo_ss7_asp contains 1084 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 359 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A)[0x612000016d20] contains 44 bytes in 1 blocks (ref 0) 0x60d000027da0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016abd0 struct osmo_fsm_inst contains 270 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b00016ac80 xua_default_lm(asp-clnt-OsmoMSC-A)[0x612000017020] contains 51 bytes in 1 blocks (ref 0) 0x60e00003a1e0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ae0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016ad30 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ba0 struct osmo_ss7_as contains 598 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 356 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A)[0x612000017320] contains 42 bytes in 1 blocks (ref 0) 0x60d000027e70 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046de0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046ea0 struct osmo_ss7_route_table contains 145 bytes in 4 blocks (ref 0) 0x60e00003a3a0 struct osmo_ss7_route contains 82 bytes in 2 blocks (ref 0) 0x60e00003a2c0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046d20 system contains 7 bytes in 1 blocks (ref 0) 0x60b00016ade0 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b0001592a0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3959 bytes in 15 blocks (ref 0) 0x61300000d0e0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d660 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b00013f200 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000140cd0 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000141300 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000cf20 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009aa0 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002bb60 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000158220 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a720 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d9e0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027c00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027cd0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000280e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000281b0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c380 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c450 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000010640 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Cannot find line ' mgw endpoint-range <1-65534> <1-65534>' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> ] make[7]: *** [vty-transcript-test] Error 1 Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 make[5]: *** [python-tests] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 19 22:32:26 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 19 Dec 2018 22:32:26 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7580?= In-Reply-To: <1936643958.76.1545258435575.JavaMail.jenkins@jenkins.osmocom.org> References: <1936643958.76.1545258435575.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <523068232.78.1545258746315.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.20 MB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6640 bytes in 53 blocks) iu contains 2 bytes in 2 blocks (ref 0) 0x60b000168550 asn1 contains 1 bytes in 1 blocks (ref 0) 0x60b0001684a0 struct osmo_ss7_instance contains 2509 bytes in 29 blocks (ref 0) 0x61400000a4a0 struct osmo_sccp_instance contains 359 bytes in 5 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f000009010 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b000168340 struct osmo_sccp_user contains 93 bytes in 2 blocks (ref 0) 0x60f000009100 OsmoMSC-IuCS contains 13 bytes in 1 blocks (ref 0) 0x60b0001683f0 struct osmo_ss7_asp contains 1099 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 365 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A-Iu)[0x612000016d20] contains 47 bytes in 1 blocks (ref 0) 0x60d000027b30 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c0000465a0 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168600 struct osmo_fsm_inst contains 276 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b0001686b0 xua_default_lm(asp-clnt-OsmoMSC-A-Iu)[0x612000017020] contains 54 bytes in 1 blocks (ref 0) 0x60e000039e60 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046660 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168760 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046720 struct osmo_ss7_as contains 607 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 362 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A-Iu)[0x612000017320] contains 45 bytes in 1 blocks (ref 0) 0x60d000027c00 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046960 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_ss7_route_table contains 148 bytes in 4 blocks (ref 0) 0x60e00003a020 struct osmo_ss7_route contains 85 bytes in 2 blocks (ref 0) 0x60e000039f40 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c0000468a0 system contains 7 bytes in 1 blocks (ref 0) 0x60b000168810 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b000156cd0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3975 bytes in 15 blocks (ref 0) 0x61400000faa0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d570 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b000158430 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000159f00 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b00015a530 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000d0e0 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009c60 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002b8f0 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000155c50 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a3a0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d560 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027990 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027a60 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027e70 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027f40 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c110 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c1e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000103d0 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Mismatch: Expect: ' mgw endpoint-range <1-65534> <1-65534>' Got: ' iu rab-assign-addr-enc (x213|v4raw)' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) ] make[7]: *** [vty-transcript-test] Error 1 Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 make[5]: *** [python-tests] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 19 22:46:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 22:46:35 +0000 Subject: Change in libosmo-sccp[master]: fix ipa_asp_fsm down state transition In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12364 ) Change subject: fix ipa_asp_fsm down state transition ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Gerrit-Change-Number: 12364 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 19 Dec 2018 22:46:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 22:47:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 22:47:50 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: logging tweaks In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12270 ) Change subject: mgcp_client: logging tweaks ...................................................................... Patch Set 2: Code-Review+2 let me pull "triviality" here. -- To view, visit https://gerrit.osmocom.org/12270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae728192f499330d16836d9435648f6b8ed213b6 Gerrit-Change-Number: 12270 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 22:47:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 22:47:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 22:47:53 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: logging tweaks In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12270 ) Change subject: mgcp_client: logging tweaks ...................................................................... mgcp_client: logging tweaks Fix typos, use osmo_sock_get_name2() to show the tx source and target IP:port, shorten some wording. Depends: I8ad89ac447c9c582742e70d082072bdd40a5a398 (libosmocore) Change-Id: Iae728192f499330d16836d9435648f6b8ed213b6 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 2ceab3c..8fa82cd 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -651,11 +651,13 @@ ret = read(fd->fd, msg->data, 4096 - 128); if (ret <= 0) { - LOGP(DLMGCP, LOGL_ERROR, "Failed to read: %d/%s\n", errno, strerror(errno)); + LOGP(DLMGCP, LOGL_ERROR, "Failed to read: %s: %d='%s'\n", osmo_sock_get_name2(fd->fd), + errno, strerror(errno)); + msgb_free(msg); return -1; } else if (ret > 4096 - 128) { - LOGP(DLMGCP, LOGL_ERROR, "Too much data: %d\n", ret); + LOGP(DLMGCP, LOGL_ERROR, "Too much data: %s: %d\n", osmo_sock_get_name2(fd->fd), ret); msgb_free(msg); return -1; } @@ -670,13 +672,13 @@ { int ret; - LOGP(DLMGCP, LOGL_DEBUG, "Sending msg to MGCP GW size: len=%u '%s'...\n", - msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len))); + LOGP(DLMGCP, LOGL_DEBUG, "Tx MGCP: %s: len=%u '%s'...\n", + osmo_sock_get_name2(fd->fd), msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len))); ret = write(fd->fd, msg->data, msg->len); if (ret != msg->len) - LOGP(DLMGCP, LOGL_ERROR, "Failed to Tx MGCP: %d='%s'; msg: len=%u '%s'...\n", - errno, strerror(errno), + LOGP(DLMGCP, LOGL_ERROR, "Failed to Tx MGCP: %s: %d='%s'; msg: len=%u '%s'...\n", + osmo_sock_get_name2(fd->fd), errno, strerror(errno), msg->len, osmo_escape_str((const char*)msg->data, OSMO_MIN(42, msg->len))); return ret; } @@ -733,12 +735,12 @@ /* Choose a new port number to try next */ LOGP(DLMGCP, LOGL_NOTICE, - "MGCPGW faild to bind to port %u, retrying with port %u -- check configuration!\n", - mgcp->actual.local_port, mgcp->actual.local_port + 1); + "MGCPGW failed to bind to %s:%u, retrying with port %u\n", + mgcp->actual.local_addr, mgcp->actual.local_port, mgcp->actual.local_port + 1); mgcp->actual.local_port++; } - LOGP(DLMGCP, LOGL_FATAL, "MGCPGW faild to find a port to bind on %i times.\n", i); + LOGP(DLMGCP, LOGL_FATAL, "MGCPGW failed to find a port to bind on %i times.\n", i); return -EINVAL; } @@ -776,9 +778,7 @@ wq->read_cb = mgcp_do_read; wq->write_cb = mgcp_do_write; - LOGP(DLMGCP, LOGL_INFO, "MGCP GW connection: %s:%u -> %s:%u\n", - mgcp->actual.local_addr, mgcp->actual.local_port, - mgcp->actual.remote_addr, mgcp->actual.remote_port); + LOGP(DLMGCP, LOGL_INFO, "MGCP GW connection: %s\n", osmo_sock_get_name2(wq->bfd.fd)); return 0; error_close_fd: -- To view, visit https://gerrit.osmocom.org/12270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iae728192f499330d16836d9435648f6b8ed213b6 Gerrit-Change-Number: 12270 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 22:49:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 22:49:54 +0000 Subject: Change in osmo-bts[master]: rsl: Send PDCH ACT NACK if TCH chan is still active In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12180 ) Change subject: rsl: Send PDCH ACT NACK if TCH chan is still active ...................................................................... Patch Set 1: > Well as it states it fixes the TTCN3 test, so if someone wants to get more deep knowledge on it, he can just read the scenario exposed in TTCN3 test from git description, run it with and without this patch and see the result. The idea of a commit log is that the reviewer can skip all that because you have explained it :) -- To view, visit https://gerrit.osmocom.org/12180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d Gerrit-Change-Number: 12180 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 19 Dec 2018 22:49:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 19 22:56:26 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 19 Dec 2018 22:56:26 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7581?= In-Reply-To: <984856914.77.1545258719315.JavaMail.jenkins@jenkins.osmocom.org> References: <984856914.77.1545258719315.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <36393203.79.1545260186293.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 858.20 KB...] no stats reporter statsd stats reporter log no stats reporter log stats interval <1-65535> network msc mncc-int hlr smpp OsmoMSC(config)# network OsmoMSC(config-net)# list help list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6502 bytes in 49 blocks) struct osmo_ss7_instance contains 2389 bytes in 27 blocks (ref 0) 0x61400000a6a0 struct osmo_sccp_instance contains 266 bytes in 3 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f0000091f0 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b00016ab20 struct osmo_ss7_asp contains 1084 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 359 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A)[0x612000016d20] contains 44 bytes in 1 blocks (ref 0) 0x60d000027da0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016abd0 struct osmo_fsm_inst contains 270 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b00016ac80 xua_default_lm(asp-clnt-OsmoMSC-A)[0x612000017020] contains 51 bytes in 1 blocks (ref 0) 0x60e00003a1e0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ae0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016ad30 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ba0 struct osmo_ss7_as contains 598 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 356 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A)[0x612000017320] contains 42 bytes in 1 blocks (ref 0) 0x60d000027e70 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046de0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046ea0 struct osmo_ss7_route_table contains 145 bytes in 4 blocks (ref 0) 0x60e00003a3a0 struct osmo_ss7_route contains 82 bytes in 2 blocks (ref 0) 0x60e00003a2c0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046d20 system contains 7 bytes in 1 blocks (ref 0) 0x60b00016ade0 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b0001592a0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3959 bytes in 15 blocks (ref 0) 0x61300000d0e0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d660 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b00013f200 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000140cd0 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000141300 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000cf20 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009aa0 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002bb60 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000158220 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a720 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d9e0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027c00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027cd0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000280e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000281b0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c380 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c450 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000010640 signal 15 received Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Cannot find line ' mgw endpoint-range <1-65534> <1-65534>' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> ] Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty make[7]: *** [vty-transcript-test] Error 1 Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 19 22:57:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 19 Dec 2018 22:57:22 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7581?= In-Reply-To: <523068232.78.1545258746315.JavaMail.jenkins@jenkins.osmocom.org> References: <523068232.78.1545258746315.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <103752291.80.1545260242291.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.20 MB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6640 bytes in 53 blocks) iu contains 2 bytes in 2 blocks (ref 0) 0x60b000168550 asn1 contains 1 bytes in 1 blocks (ref 0) 0x60b0001684a0 struct osmo_ss7_instance contains 2509 bytes in 29 blocks (ref 0) 0x61400000a4a0 struct osmo_sccp_instance contains 359 bytes in 5 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f000009010 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b000168340 struct osmo_sccp_user contains 93 bytes in 2 blocks (ref 0) 0x60f000009100 OsmoMSC-IuCS contains 13 bytes in 1 blocks (ref 0) 0x60b0001683f0 struct osmo_ss7_asp contains 1099 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 365 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A-Iu)[0x612000016d20] contains 47 bytes in 1 blocks (ref 0) 0x60d000027b30 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c0000465a0 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168600 struct osmo_fsm_inst contains 276 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b0001686b0 xua_default_lm(asp-clnt-OsmoMSC-A-Iu)[0x612000017020] contains 54 bytes in 1 blocks (ref 0) 0x60e000039e60 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046660 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168760 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046720 struct osmo_ss7_as contains 607 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 362 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A-Iu)[0x612000017320] contains 45 bytes in 1 blocks (ref 0) 0x60d000027c00 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046960 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_ss7_route_table contains 148 bytes in 4 blocks (ref 0) 0x60e00003a020 struct osmo_ss7_route contains 85 bytes in 2 blocks (ref 0) 0x60e000039f40 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c0000468a0 system contains 7 bytes in 1 blocks (ref 0) 0x60b000168810 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b000156cd0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3975 bytes in 15 blocks (ref 0) 0x61400000faa0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d570 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b000158430 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000159f00 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b00015a530 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000d0e0 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009c60 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002b8f0 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000155c50 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a3a0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d560 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027990 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027a60 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027e70 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027f40 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c110 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c1e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000103d0 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Mismatch: Expect: ' mgw endpoint-range <1-65534> <1-65534>' Got: ' iu rab-assign-addr-enc (x213|v4raw)' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) ] Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-transcript-test] Error 1 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: *** [python-tests] Error 2 make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 19 23:04:24 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 19 Dec 2018 23:04:24 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7582?= In-Reply-To: <36393203.79.1545260186293.JavaMail.jenkins@jenkins.osmocom.org> References: <36393203.79.1545260186293.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <959430462.81.1545260664697.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 857.00 KB...] no stats reporter statsd stats reporter log no stats reporter log stats interval <1-65535> network msc mncc-int hlr smpp OsmoMSC(config)# network OsmoMSC(config-net)# list help list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6502 bytes in 49 blocks) struct osmo_ss7_instance contains 2389 bytes in 27 blocks (ref 0) 0x61400000a6a0 struct osmo_sccp_instance contains 266 bytes in 3 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f0000091f0 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b00016ab20 struct osmo_ss7_asp contains 1084 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 359 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A)[0x612000016d20] contains 44 bytes in 1 blocks (ref 0) 0x60d000027da0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016abd0 struct osmo_fsm_inst contains 270 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b00016ac80 xua_default_lm(asp-clnt-OsmoMSC-A)[0x612000017020] contains 51 bytes in 1 blocks (ref 0) 0x60e00003a1e0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ae0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016ad30 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ba0 struct osmo_ss7_as contains 598 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 356 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A)[0x612000017320] contains 42 bytes in 1 blocks (ref 0) 0x60d000027e70 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046de0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046ea0 struct osmo_ss7_route_table contains 145 bytes in 4 blocks (ref 0) 0x60e00003a3a0 struct osmo_ss7_route contains 82 bytes in 2 blocks (ref 0) 0x60e00003a2c0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046d20 system contains 7 bytes in 1 blocks (ref 0) 0x60b00016ade0 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b0001592a0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3959 bytes in 15 blocks (ref 0) 0x61300000d0e0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d660 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b00013f200 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000140cd0 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000141300 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000cf20 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009aa0 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002bb60 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000158220 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a720 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d9e0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027c00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027cd0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000280e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000281b0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c380 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c450 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000010640 signal 15 received Terminating took 2.679s Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Cannot find line ' mgw endpoint-range <1-65534> <1-65534>' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> ] RESULTS: FAIL: ./test_nodes.vty make[7]: *** [vty-transcript-test] Error 1 Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 19 23:04:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 19 Dec 2018 23:04:57 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12368 ) Change subject: abort assignment on Assignment Failure ...................................................................... Patch Set 3: Code-Review+1 (1 comment) Code looks good, logging is not critical. https://gerrit.osmocom.org/#/c/12368/3/src/libmsc/msc_mgcp.c File src/libmsc/msc_mgcp.c: https://gerrit.osmocom.org/#/c/12368/3/src/libmsc/msc_mgcp.c at 1085 PS3, Line 1085: conn->fi->id); > Maybe we also need LOGPFSMSL(FI, SUBSYS, LEVEL, fmt, args)? I like this idea. -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 23:04:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 19 23:05:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 19 Dec 2018 23:05:14 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7582?= In-Reply-To: <103752291.80.1545260242291.JavaMail.jenkins@jenkins.osmocom.org> References: <103752291.80.1545260242291.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <742745641.82.1545260715004.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.20 MB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6640 bytes in 53 blocks) iu contains 2 bytes in 2 blocks (ref 0) 0x60b000168550 asn1 contains 1 bytes in 1 blocks (ref 0) 0x60b0001684a0 struct osmo_ss7_instance contains 2509 bytes in 29 blocks (ref 0) 0x61400000a4a0 struct osmo_sccp_instance contains 359 bytes in 5 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f000009010 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b000168340 struct osmo_sccp_user contains 93 bytes in 2 blocks (ref 0) 0x60f000009100 OsmoMSC-IuCS contains 13 bytes in 1 blocks (ref 0) 0x60b0001683f0 struct osmo_ss7_asp contains 1099 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 365 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A-Iu)[0x612000016d20] contains 47 bytes in 1 blocks (ref 0) 0x60d000027b30 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c0000465a0 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168600 struct osmo_fsm_inst contains 276 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b0001686b0 xua_default_lm(asp-clnt-OsmoMSC-A-Iu)[0x612000017020] contains 54 bytes in 1 blocks (ref 0) 0x60e000039e60 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046660 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168760 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046720 struct osmo_ss7_as contains 607 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 362 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A-Iu)[0x612000017320] contains 45 bytes in 1 blocks (ref 0) 0x60d000027c00 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046960 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_ss7_route_table contains 148 bytes in 4 blocks (ref 0) 0x60e00003a020 struct osmo_ss7_route contains 85 bytes in 2 blocks (ref 0) 0x60e000039f40 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c0000468a0 system contains 7 bytes in 1 blocks (ref 0) 0x60b000168810 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b000156cd0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3975 bytes in 15 blocks (ref 0) 0x61400000faa0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d570 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b000158430 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000159f00 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b00015a530 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000d0e0 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009c60 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002b8f0 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000155c50 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a3a0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d560 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027990 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027a60 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027e70 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027f40 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c110 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c1e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000103d0 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Mismatch: Expect: ' mgw endpoint-range <1-65534> <1-65534>' Got: ' iu rab-assign-addr-enc (x213|v4raw)' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) ] Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-transcript-test] Error 1 Makefile:723: recipe for target 'vty-test' failed make[6]: *** [vty-test] Error 2 make[6]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Dec 19 23:18:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 19 Dec 2018 23:18:22 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_sysmo,f?= =?UTF-8?Q?emtobts=5Fv2.7,1,default,osmocom-master-debian9_#1576?= Message-ID: <1244879687.83.1545261502907.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 54.07 KB...] CC timer_gettimeofday.lo CC select.lo CC timer_clockgettime.lo CC timer.lo CC signal.lo CC bits.lo CC msgb.lo CC bitvec.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stats.lo CC stat_item.lo CC stats_statsd.lo CC prim.lo CC conv_acc_generic.lo CC conv_acc.lo CC sercomm.lo CC prbs.lo CC conv_acc_sse.lo CC isdnhdlc.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC logging_vty.lo CC vty.lo CC telnet_interface.lo CC stats_vty.lo CC vector.lo CC utils.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC gsm690.lo CC ecu_fr.lo CC gsm660.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC rxlev_stat.lo CC a5.lo CC tlv_parser.lo CC comp128.lo CC rsl.lo CC gsm48.lo CC comp128v23.lo CC gsm_utils.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC sysinfo.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo /bin/bash: line 2: 13657 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gsm0411_smc.lo -MD -MP -MF $depbase.Tpo -c -o gsm0411_smc.lo gsm0411_smc.c Makefile:597: recipe for target 'gsm0411_smc.lo' failed make[3]: *** [gsm0411_smc.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:702: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 19 23:23:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 23:23:14 +0000 Subject: Change in libosmocore[master]: define LOGPFSM fmt only once, in LOGPFSMLSRC Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12383 Change subject: define LOGPFSM fmt only once, in LOGPFSMLSRC ...................................................................... define LOGPFSM fmt only once, in LOGPFSMLSRC Instead of duplicating the fmt and args in LOGPFSML and LOGPFSMLSRC, rather make LOGPFSML invoke LOGPFSMLSRC with __FILE__ and __LINE__. This is a cosmetic preparation for more tweaks coming up. Change-Id: I2f23c57ebfdb5355919c06ac5ded7732e3b17a97 --- M include/osmocom/core/fsm.h 1 file changed, 4 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/83/12383/1 diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 54bbad5..ee71451 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -120,13 +120,7 @@ void osmo_fsm_log_addr(bool log_addr); #define LOGPFSML(fi, level, fmt, args...) \ - LOGP((fi)->fsm->log_subsys, OSMO_MAX(level, (fi)->log_level), \ - "%s{%s}: " fmt, \ - osmo_fsm_inst_name(fi), \ - osmo_fsm_state_name((fi)->fsm, (fi)->state), ## args) - -#define LOGPFSM(fi, fmt, args...) \ - LOGPFSML(fi, (fi)->log_level, fmt, ## args) + LOGPFSMLSRC(fi, level, __FILE__, __LINE__, fmt, ## args) #define LOGPFSMLSRC(fi, level, caller_file, caller_line, fmt, args...) \ LOGPSRC((fi)->fsm->log_subsys, level, \ @@ -136,6 +130,9 @@ osmo_fsm_state_name((fi)->fsm, (fi)->state), \ ## args) +#define LOGPFSM(fi, fmt, args...) \ + LOGPFSML(fi, (fi)->log_level, fmt, ## args) + #define LOGPFSMSRC(fi, caller_file, caller_line, fmt, args...) \ LOGPFSMLSRC(fi, (fi)->log_level, \ caller_file, caller_line, \ -- To view, visit https://gerrit.osmocom.org/12383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2f23c57ebfdb5355919c06ac5ded7732e3b17a97 Gerrit-Change-Number: 12383 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 23:23:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 23:23:14 +0000 Subject: Change in libosmocore[master]: add API doc for LOGPFSM* macros Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12384 Change subject: add API doc for LOGPFSM* macros ...................................................................... add API doc for LOGPFSM* macros Change-Id: I3bf6500889aa58195f50a726dec0876c0c2baec3 --- M include/osmocom/core/fsm.h 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/12384/1 diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index ee71451..0b02e9a 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -119,9 +119,24 @@ void osmo_fsm_log_addr(bool log_addr); +/*! Log using FSM instance's context, on explicit logging level. + * \param fi An osmo_fsm_inst. + * \param level A logging level, e.g. LOGL_INFO. + * \param fmt printf-like string format. + * \param args String format arguments. + */ #define LOGPFSML(fi, level, fmt, args...) \ LOGPFSMLSRC(fi, level, __FILE__, __LINE__, fmt, ## args) +/*! Log using FSM instance's context, on explicit logging level, and with explicit source file and line info. + * The log subsystem to log on is obtained from the underlying FSM definition. + * \param fi An osmo_fsm_inst. + * \param level A logging level, e.g. LOGL_INFO. + * \param caller_file A string constant containing a source file path, like __FILE__. + * \param caller_line A number constant containing a source file line, like __LINE__. + * \param fmt printf-like string format. + * \param args String format arguments. + */ #define LOGPFSMLSRC(fi, level, caller_file, caller_line, fmt, args...) \ LOGPSRC((fi)->fsm->log_subsys, level, \ caller_file, caller_line, \ @@ -130,9 +145,25 @@ osmo_fsm_state_name((fi)->fsm, (fi)->state), \ ## args) +/*! Log using FSM instance's context. + * The log level to log on is obtained from the FSM instance. + * The log subsystem to log on is obtained from the underlying FSM definition. + * \param fi An osmo_fsm_inst. + * \param fmt printf-like string format. + * \param args String format arguments. + */ #define LOGPFSM(fi, fmt, args...) \ LOGPFSML(fi, (fi)->log_level, fmt, ## args) +/*! Log using FSM instance's context, with explicit source file and line info. + * The log level to log on is obtained from the FSM instance. + * The log subsystem to log on is obtained from the underlying FSM definition. + * \param fi An osmo_fsm_inst. + * \param caller_file A string constant containing a source file path, like __FILE__. + * \param caller_line A number constant containing a source file line, like __LINE__. + * \param fmt printf-like string format. + * \param args String format arguments. + */ #define LOGPFSMSRC(fi, caller_file, caller_line, fmt, args...) \ LOGPFSMLSRC(fi, (fi)->log_level, \ caller_file, caller_line, \ -- To view, visit https://gerrit.osmocom.org/12384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3bf6500889aa58195f50a726dec0876c0c2baec3 Gerrit-Change-Number: 12384 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 23:23:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 23:23:15 +0000 Subject: Change in libosmocore[master]: LOGPFSM*: guard against fi == NULL Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12385 Change subject: LOGPFSM*: guard against fi == NULL ...................................................................... LOGPFSM*: guard against fi == NULL The LOGPFSM macros are in such wide use that they should guard against a NULL fi pointer. In case of NULL, default to subsys = DLGLOBAL, loglevel = LOGL_ERROR and state = "fi=NULL". Change-Id: I9eaf8b7e2cf1e450ae626cb2fc928862008f6233 --- M include/osmocom/core/fsm.h 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/12385/1 diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 0b02e9a..5b43e56 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -138,11 +138,11 @@ * \param args String format arguments. */ #define LOGPFSMLSRC(fi, level, caller_file, caller_line, fmt, args...) \ - LOGPSRC((fi)->fsm->log_subsys, level, \ + LOGPSRC((fi) ? (fi)->fsm->log_subsys : DLGLOBAL, level, \ caller_file, caller_line, \ "%s{%s}: " fmt, \ osmo_fsm_inst_name(fi), \ - osmo_fsm_state_name((fi)->fsm, (fi)->state), \ + (fi) ? osmo_fsm_state_name((fi)->fsm, (fi)->state) : "fi=NULL", \ ## args) /*! Log using FSM instance's context. @@ -153,7 +153,7 @@ * \param args String format arguments. */ #define LOGPFSM(fi, fmt, args...) \ - LOGPFSML(fi, (fi)->log_level, fmt, ## args) + LOGPFSML(fi, (fi) ? (fi)->log_level : LOGL_ERROR, fmt, ## args) /*! Log using FSM instance's context, with explicit source file and line info. * The log level to log on is obtained from the FSM instance. @@ -165,7 +165,7 @@ * \param args String format arguments. */ #define LOGPFSMSRC(fi, caller_file, caller_line, fmt, args...) \ - LOGPFSMLSRC(fi, (fi)->log_level, \ + LOGPFSMLSRC(fi, (fi) ? (fi)->log_level : LOGL_ERROR, \ caller_file, caller_line, \ fmt, ## args) -- To view, visit https://gerrit.osmocom.org/12385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9eaf8b7e2cf1e450ae626cb2fc928862008f6233 Gerrit-Change-Number: 12385 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 23:23:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 23:23:15 +0000 Subject: Change in libosmocore[master]: add LOGPFSMSL(), LOGPFSMSLSRC() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12386 Change subject: add LOGPFSMSL(), LOGPFSMSLSRC() ...................................................................... add LOGPFSMSL(), LOGPFSMSLSRC() Using an FSM instace's logging context is very useful. Sometimes it makes sense to log something on a different logging category than the FSM definition's default category. For example, an MSC conn has aspects concerning MM, CC, RR, MGCP, ..., and currently all of those log on DMM. This came up in I358cfbaf0f44f25148e8b9bafcb9257b1952b35a, where I want to log an MGCP event using a ran_conn context, and used the conn->fi->id. That of course omits context like the current conn FSM state... I remember at least one other place where I recently added logging using some fi->id as context, so it might turn out useful in various places. Change-Id: I11b182a03f5ecb6df7cd8f260757d3626c8e945d --- M include/osmocom/core/fsm.h 1 file changed, 30 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/12386/1 diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 5b43e56..3c35c20 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -119,6 +119,34 @@ void osmo_fsm_log_addr(bool log_addr); +/*! Log using FSM instance's context, on explicit logging subsystem and level. + * \param fi An osmo_fsm_inst. + * \param subsys A logging subsystem, e.g. DLGLOBAL. + * \param level A logging level, e.g. LOGL_INFO. + * \param fmt printf-like string format. + * \param args String format arguments. + */ +#define LOGPFSMSL(fi, subsys, level, fmt, args...) \ + LOGPFSMSLSRC(fi, subsys, level, __FILE__, __LINE__, fmt, ## args) + +/*! Log using FSM instance's context, on explicit logging subsystem and level, + * and passing explicit source file and line information. + * \param fi An osmo_fsm_inst. + * \param subsys A logging subsystem, e.g. DLGLOBAL. + * \param level A logging level, e.g. LOGL_INFO. + * \param caller_file A string constant containing a source file path, like __FILE__. + * \param caller_line A number constant containing a source file line, like __LINE__. + * \param fmt printf-like string format. + * \param args String format arguments. + */ +#define LOGPFSMSLSRC(fi, subsys, level, caller_file, caller_line, fmt, args...) \ + LOGPSRC(subsys, level, \ + caller_file, caller_line, \ + "%s{%s}: " fmt, \ + osmo_fsm_inst_name(fi), \ + (fi) ? osmo_fsm_state_name((fi)->fsm, (fi)->state) : "fi=NULL", ## args) + + /*! Log using FSM instance's context, on explicit logging level. * \param fi An osmo_fsm_inst. * \param level A logging level, e.g. LOGL_INFO. @@ -138,12 +166,8 @@ * \param args String format arguments. */ #define LOGPFSMLSRC(fi, level, caller_file, caller_line, fmt, args...) \ - LOGPSRC((fi) ? (fi)->fsm->log_subsys : DLGLOBAL, level, \ - caller_file, caller_line, \ - "%s{%s}: " fmt, \ - osmo_fsm_inst_name(fi), \ - (fi) ? osmo_fsm_state_name((fi)->fsm, (fi)->state) : "fi=NULL", \ - ## args) + LOGPFSMSLSRC(fi, (fi) ? (fi)->fsm->log_subsys : DLGLOBAL, level, \ + caller_file, caller_line, fmt, ## args) /*! Log using FSM instance's context. * The log level to log on is obtained from the FSM instance. -- To view, visit https://gerrit.osmocom.org/12386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I11b182a03f5ecb6df7cd8f260757d3626c8e945d Gerrit-Change-Number: 12386 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 23:24:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 23:24:14 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12368 ) Change subject: abort assignment on Assignment Failure ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12368/3/src/libmsc/msc_mgcp.c File src/libmsc/msc_mgcp.c: https://gerrit.osmocom.org/#/c/12368/3/src/libmsc/msc_mgcp.c at 1085 PS3, Line 1085: conn->fi->id); > > Maybe we also need LOGPFSMSL(FI, SUBSYS, LEVEL, fmt, args)? [?] https://gerrit.osmocom.org/c/libosmocore/+/12386 -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 19 Dec 2018 23:24:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 23:26:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 23:26:51 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12368 to look at the new patch set (#4). Change subject: abort assignment on Assignment Failure ...................................................................... abort assignment on Assignment Failure If Assignment fails in the BSC, trigger an EV_TEARDOWN_ERROR in the mgcp_ctx FSM instance, so that the call gets torn down immediately. Before this, the non-call would idle around without anything happening. Related: OS#3236 Depends: I11b182a03f5ecb6df7cd8f260757d3626c8e945d (libosmocore) Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a --- M include/osmocom/msc/msc_mgcp.h M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 3 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/68/12368/4 -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 23:53:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 23:53:39 +0000 Subject: Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12387 Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section ...................................................................... vty cfg: move 'ipa-name' from 'msc' to 'hlr' section during code review, I completely overlooked this: We've added the 'ipa-name', which identifies the MSC on the GSUP link to the HLR, under the 'msc' section, while all other GSUP/HLR related config is under the 'hlr' section. Before we roll that out in a release, move it over to 'hlr'. Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 --- M src/libmsc/msc_vty.c 1 file changed, 21 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/12387/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index c5d2832..bb57d65 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -458,24 +458,6 @@ return CMD_SUCCESS; } -DEFUN(cfg_msc_ipa_name, - cfg_msc_ipa_name_cmd, - "ipa-name NAME", - "Set the IPA name of this MSC\n" - "A unique name for this MSC. For example: PLMN + redundancy server number: MSC-901-70-0. " - "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. " - "The default is 'MSC-00-00-00-00-00-00'.\n") -{ - if (!msc_parsing_config_file) { - vty_out(vty, "The IPA name cannot be changed at run-time; " - "It can only be set in the configuraton file.%s", VTY_NEWLINE); - return CMD_WARNING; - } - - gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]); - return CMD_SUCCESS; -} - static int config_write_msc(struct vty *vty) { vty_out(vty, "msc%s", VTY_NEWLINE); @@ -509,9 +491,6 @@ gsmnet->emergency.route_to_msisdn, VTY_NEWLINE); } - if (gsmnet->msc_ipa_name) - vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name, VTY_NEWLINE); - mgcp_client_config_write(vty, " "); #ifdef BUILD_IU ranap_iu_vty_config_write(vty, " "); @@ -1485,6 +1464,24 @@ return CMD_SUCCESS; } +DEFUN(cfg_hlr_ipa_name, + cfg_hlr_ipa_name_cmd, + "ipa-name NAME", + "Set the IPA name of this MSC\n" + "A unique name for this MSC. For example: PLMN + redundancy server number: MSC-901-70-0. " + "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. " + "The default is 'MSC-00-00-00-00-00-00'.\n") +{ + if (!msc_parsing_config_file) { + vty_out(vty, "The IPA name cannot be changed at run-time; " + "It can only be set in the configuraton file.%s", VTY_NEWLINE); + return CMD_WARNING; + } + + gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]); + return CMD_SUCCESS; +} + static int config_write_hlr(struct vty *vty) { vty_out(vty, "hlr%s", VTY_NEWLINE); @@ -1492,6 +1489,8 @@ gsmnet->gsup_server_addr_str, VTY_NEWLINE); vty_out(vty, " remote-port %u%s", gsmnet->gsup_server_port, VTY_NEWLINE); + if (gsmnet->msc_ipa_name) + vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name, VTY_NEWLINE); return CMD_SUCCESS; } @@ -1532,7 +1531,6 @@ install_element(MSC_NODE, &cfg_msc_cs7_instance_iu_cmd); install_element(MSC_NODE, &cfg_msc_paging_response_timer_cmd); install_element(MSC_NODE, &cfg_msc_emergency_msisdn_cmd); - install_element(MSC_NODE, &cfg_msc_ipa_name_cmd); mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf); #ifdef BUILD_IU @@ -1582,4 +1580,5 @@ install_node(&hlr_node, config_write_hlr); install_element(HLR_NODE, &cfg_hlr_remote_ip_cmd); install_element(HLR_NODE, &cfg_hlr_remote_port_cmd); + install_element(HLR_NODE, &cfg_hlr_ipa_name_cmd); } -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 23:56:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 23:56:34 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12357 ) Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... Patch Set 3: I'm going to remove that -1 because I think it is not actual code review related to this patch, more like a general question on how our MGCP works. -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 19 Dec 2018 23:56:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 19 23:56:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 19 Dec 2018 23:56:37 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... Removed Code-Review-1 by Max -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 20 00:01:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:01:04 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7583?= In-Reply-To: <959430462.81.1545260664697.JavaMail.jenkins@jenkins.osmocom.org> References: <959430462.81.1545260664697.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1575869064.84.1545264064704.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 857.41 KB...] no stats reporter statsd stats reporter log no stats reporter log stats interval <1-65535> network msc mncc-int hlr smpp OsmoMSC(config)# network OsmoMSC(config-net)# list help list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6502 bytes in 49 blocks) struct osmo_ss7_instance contains 2389 bytes in 27 blocks (ref 0) 0x61400000a6a0 struct osmo_sccp_instance contains 266 bytes in 3 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f0000091f0 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b00016ab20 struct osmo_ss7_asp contains 1084 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 359 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A)[0x612000016d20] contains 44 bytes in 1 blocks (ref 0) 0x60d000027da0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016abd0 struct osmo_fsm_inst contains 270 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b00016ac80 xua_default_lm(asp-clnt-OsmoMSC-A)[0x612000017020] contains 51 bytes in 1 blocks (ref 0) 0x60e00003a1e0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ae0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016ad30 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ba0 struct osmo_ss7_as contains 598 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 356 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A)[0x612000017320] contains 42 bytes in 1 blocks (ref 0) 0x60d000027e70 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046de0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046ea0 struct osmo_ss7_route_table contains 145 bytes in 4 blocks (ref 0) 0x60e00003a3a0 struct osmo_ss7_route contains 82 bytes in 2 blocks (ref 0) 0x60e00003a2c0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046d20 system contains 7 bytes in 1 blocks (ref 0) 0x60b00016ade0 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b0001592a0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3959 bytes in 15 blocks (ref 0) 0x61300000d0e0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d660 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b00013f200 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000140cd0 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000141300 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000cf20 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009aa0 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002bb60 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000158220 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a720 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d9e0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027c00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027cd0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000280e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000281b0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c380 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c450 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000010640 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Cannot find line ' mgw endpoint-range <1-65534> <1-65534>' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> ] make[7]: *** [vty-transcript-test] Error 1 Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:559: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Dec 20 00:02:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 00:02:17 +0000 Subject: Change in libosmocore[master]: define LOGPFSM fmt only once, in LOGPFSMLSRC In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12383 ) Change subject: define LOGPFSM fmt only once, in LOGPFSMLSRC ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12383/1/include/osmocom/core/fsm.h File include/osmocom/core/fsm.h: https://gerrit.osmocom.org/#/c/12383/1/include/osmocom/core/fsm.h at 122 PS1, Line 122: LOGPFSML Maybe rather place it between LOGPFSMLSRC and LOGPFSM? Not mandatory, but would look cleaner. -- To view, visit https://gerrit.osmocom.org/12383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f23c57ebfdb5355919c06ac5ded7732e3b17a97 Gerrit-Change-Number: 12383 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 00:02:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 20 00:02:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:02:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7583?= In-Reply-To: <742745641.82.1545260715004.JavaMail.jenkins@jenkins.osmocom.org> References: <742745641.82.1545260715004.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2111262758.85.1545264141887.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.20 MB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6640 bytes in 53 blocks) iu contains 2 bytes in 2 blocks (ref 0) 0x60b000168550 asn1 contains 1 bytes in 1 blocks (ref 0) 0x60b0001684a0 struct osmo_ss7_instance contains 2509 bytes in 29 blocks (ref 0) 0x61400000a4a0 struct osmo_sccp_instance contains 359 bytes in 5 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f000009010 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b000168340 struct osmo_sccp_user contains 93 bytes in 2 blocks (ref 0) 0x60f000009100 OsmoMSC-IuCS contains 13 bytes in 1 blocks (ref 0) 0x60b0001683f0 struct osmo_ss7_asp contains 1099 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 365 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A-Iu)[0x612000016d20] contains 47 bytes in 1 blocks (ref 0) 0x60d000027b30 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c0000465a0 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168600 struct osmo_fsm_inst contains 276 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b0001686b0 xua_default_lm(asp-clnt-OsmoMSC-A-Iu)[0x612000017020] contains 54 bytes in 1 blocks (ref 0) 0x60e000039e60 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046660 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168760 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046720 struct osmo_ss7_as contains 607 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 362 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A-Iu)[0x612000017320] contains 45 bytes in 1 blocks (ref 0) 0x60d000027c00 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046960 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_ss7_route_table contains 148 bytes in 4 blocks (ref 0) 0x60e00003a020 struct osmo_ss7_route contains 85 bytes in 2 blocks (ref 0) 0x60e000039f40 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c0000468a0 system contains 7 bytes in 1 blocks (ref 0) 0x60b000168810 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b000156cd0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3975 bytes in 15 blocks (ref 0) 0x61400000faa0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d570 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b000158430 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000159f00 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b00015a530 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000d0e0 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009c60 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002b8f0 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000155c50 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a3a0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d560 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027990 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027a60 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027e70 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027f40 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c110 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c1e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000103d0 signal 15 received Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Mismatch: Expect: ' mgw endpoint-range <1-65534> <1-65534>' Got: ' iu rab-assign-addr-enc (x213|v4raw)' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) ] Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty make[7]: *** [vty-transcript-test] Error 1 Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 20 00:04:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:04:29 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB_sys?= =?UTF-8?Q?mo,femtobts=5Fv2.7,1,default,osmocom-master-debian9_#1577?= In-Reply-To: <1244879687.83.1545261502907.JavaMail.jenkins@jenkins.osmocom.org> References: <1244879687.83.1545261502907.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <632081212.86.1545264269274.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Dec 20 00:12:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:12:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7584?= In-Reply-To: <1575869064.84.1545264064704.JavaMail.jenkins@jenkins.osmocom.org> References: <1575869064.84.1545264064704.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1933676017.87.1545264735674.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 859.61 KB...] no stats reporter statsd stats reporter log no stats reporter log stats interval <1-65535> network msc mncc-int hlr smpp OsmoMSC(config)# network OsmoMSC(config-net)# list help list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6502 bytes in 49 blocks) struct osmo_ss7_instance contains 2389 bytes in 27 blocks (ref 0) 0x61400000a6a0 struct osmo_sccp_instance contains 266 bytes in 3 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f0000091f0 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b00016ab20 struct osmo_ss7_asp contains 1084 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 359 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A)[0x612000016d20] contains 44 bytes in 1 blocks (ref 0) 0x60d000027da0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016abd0 struct osmo_fsm_inst contains 270 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b00016ac80 xua_default_lm(asp-clnt-OsmoMSC-A)[0x612000017020] contains 51 bytes in 1 blocks (ref 0) 0x60e00003a1e0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ae0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016ad30 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ba0 struct osmo_ss7_as contains 598 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 356 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A)[0x612000017320] contains 42 bytes in 1 blocks (ref 0) 0x60d000027e70 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046de0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046ea0 struct osmo_ss7_route_table contains 145 bytes in 4 blocks (ref 0) 0x60e00003a3a0 struct osmo_ss7_route contains 82 bytes in 2 blocks (ref 0) 0x60e00003a2c0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046d20 system contains 7 bytes in 1 blocks (ref 0) 0x60b00016ade0 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b0001592a0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3959 bytes in 15 blocks (ref 0) 0x61300000d0e0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d660 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b00013f200 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000140cd0 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000141300 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000cf20 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009aa0 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002bb60 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000158220 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a720 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d9e0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027c00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027cd0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000280e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000281b0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c380 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c450 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000010640 signal 15 received Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Cannot find line ' mgw endpoint-range <1-65534> <1-65534>' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> ] Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: *** [vty-transcript-test] Error 1 make[7]: Leaving directory '/build/tests' Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory '/build/tests' Makefile:452: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory '/build' make: *** [check] Error 2 Makefile:743: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 20 00:12:40 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:12:40 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7584?= In-Reply-To: <2111262758.85.1545264141887.JavaMail.jenkins@jenkins.osmocom.org> References: <2111262758.85.1545264141887.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1313810669.88.1545264760352.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.10 MB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6640 bytes in 53 blocks) iu contains 2 bytes in 2 blocks (ref 0) 0x60b000168550 asn1 contains 1 bytes in 1 blocks (ref 0) 0x60b0001684a0 struct osmo_ss7_instance contains 2509 bytes in 29 blocks (ref 0) 0x61400000a4a0 struct osmo_sccp_instance contains 359 bytes in 5 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f000009010 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b000168340 struct osmo_sccp_user contains 93 bytes in 2 blocks (ref 0) 0x60f000009100 OsmoMSC-IuCS contains 13 bytes in 1 blocks (ref 0) 0x60b0001683f0 struct osmo_ss7_asp contains 1099 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 365 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A-Iu)[0x612000016d20] contains 47 bytes in 1 blocks (ref 0) 0x60d000027b30 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c0000465a0 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168600 struct osmo_fsm_inst contains 276 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b0001686b0 xua_default_lm(asp-clnt-OsmoMSC-A-Iu)[0x612000017020] contains 54 bytes in 1 blocks (ref 0) 0x60e000039e60 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046660 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168760 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046720 struct osmo_ss7_as contains 607 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 362 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A-Iu)[0x612000017320] contains 45 bytes in 1 blocks (ref 0) 0x60d000027c00 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046960 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_ss7_route_table contains 148 bytes in 4 blocks (ref 0) 0x60e00003a020 struct osmo_ss7_route contains 85 bytes in 2 blocks (ref 0) 0x60e000039f40 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c0000468a0 system contains 7 bytes in 1 blocks (ref 0) 0x60b000168810 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b000156cd0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3975 bytes in 15 blocks (ref 0) 0x61400000faa0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d570 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b000158430 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000159f00 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b00015a530 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000d0e0 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009c60 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002b8f0 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000155c50 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a3a0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d560 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027990 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027a60 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027e70 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027f40 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c110 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c1e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000103d0 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Mismatch: Expect: ' mgw endpoint-range <1-65534> <1-65534>' Got: ' iu rab-assign-addr-enc (x213|v4raw)' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) ] make[7]: *** [vty-transcript-test] Error 1 Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 20 00:15:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:15:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7585?= In-Reply-To: <1933676017.87.1545264735674.JavaMail.jenkins@jenkins.osmocom.org> References: <1933676017.87.1545264735674.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <887196297.89.1545264916979.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 828.66 KB...] no stats reporter statsd stats reporter log no stats reporter log stats interval <1-65535> network msc mncc-int hlr smpp OsmoMSC(config)# network OsmoMSC(config-net)# list help list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6502 bytes in 49 blocks) struct osmo_ss7_instance contains 2389 bytes in 27 blocks (ref 0) 0x61400000a6a0 struct osmo_sccp_instance contains 266 bytes in 3 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f0000091f0 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b00016ab20 struct osmo_ss7_asp contains 1084 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 359 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A)[0x612000016d20] contains 44 bytes in 1 blocks (ref 0) 0x60d000027da0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016abd0 struct osmo_fsm_inst contains 270 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b00016ac80 xua_default_lm(asp-clnt-OsmoMSC-A)[0x612000017020] contains 51 bytes in 1 blocks (ref 0) 0x60e00003a1e0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ae0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016ad30 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ba0 struct osmo_ss7_as contains 598 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 356 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A)[0x612000017320] contains 42 bytes in 1 blocks (ref 0) 0x60d000027e70 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046de0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046ea0 struct osmo_ss7_route_table contains 145 bytes in 4 blocks (ref 0) 0x60e00003a3a0 struct osmo_ss7_route contains 82 bytes in 2 blocks (ref 0) 0x60e00003a2c0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046d20 system contains 7 bytes in 1 blocks (ref 0) 0x60b00016ade0 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b0001592a0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3959 bytes in 15 blocks (ref 0) 0x61300000d0e0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d660 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b00013f200 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000140cd0 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000141300 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000cf20 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009aa0 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002bb60 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000158220 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a720 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d9e0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027c00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027cd0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000280e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000281b0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c380 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c450 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000010640 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Cannot find line ' mgw endpoint-range <1-65534> <1-65534>' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> ] Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-transcript-test] Error 1 make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 20 00:15:28 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:15:28 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-iuh_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#2707?= In-Reply-To: <120045755.74.1545253755954.JavaMail.jenkins@jenkins.osmocom.org> References: <120045755.74.1545253755954.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1376346244.90.1545264928092.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Dec 20 00:16:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:16:52 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7585?= In-Reply-To: <1313810669.88.1545264760352.JavaMail.jenkins@jenkins.osmocom.org> References: <1313810669.88.1545264760352.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <284335302.91.1545265012277.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.10 MB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6640 bytes in 53 blocks) iu contains 2 bytes in 2 blocks (ref 0) 0x60b000168550 asn1 contains 1 bytes in 1 blocks (ref 0) 0x60b0001684a0 struct osmo_ss7_instance contains 2509 bytes in 29 blocks (ref 0) 0x61400000a4a0 struct osmo_sccp_instance contains 359 bytes in 5 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f000009010 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b000168340 struct osmo_sccp_user contains 93 bytes in 2 blocks (ref 0) 0x60f000009100 OsmoMSC-IuCS contains 13 bytes in 1 blocks (ref 0) 0x60b0001683f0 struct osmo_ss7_asp contains 1099 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 365 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A-Iu)[0x612000016d20] contains 47 bytes in 1 blocks (ref 0) 0x60d000027b30 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c0000465a0 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168600 struct osmo_fsm_inst contains 276 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b0001686b0 xua_default_lm(asp-clnt-OsmoMSC-A-Iu)[0x612000017020] contains 54 bytes in 1 blocks (ref 0) 0x60e000039e60 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046660 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168760 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046720 struct osmo_ss7_as contains 607 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 362 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A-Iu)[0x612000017320] contains 45 bytes in 1 blocks (ref 0) 0x60d000027c00 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046960 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_ss7_route_table contains 148 bytes in 4 blocks (ref 0) 0x60e00003a020 struct osmo_ss7_route contains 85 bytes in 2 blocks (ref 0) 0x60e000039f40 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c0000468a0 system contains 7 bytes in 1 blocks (ref 0) 0x60b000168810 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b000156cd0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3975 bytes in 15 blocks (ref 0) 0x61400000faa0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d570 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b000158430 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000159f00 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b00015a530 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000d0e0 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009c60 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002b8f0 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000155c50 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a3a0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d560 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027990 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027a60 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027e70 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027f40 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c110 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c1e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000103d0 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Mismatch: Expect: ' mgw endpoint-range <1-65534> <1-65534>' Got: ' iu rab-assign-addr-enc (x213|v4raw)' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) ] Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-transcript-test] Error 1 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: *** [check-local] Error 2 make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 20 00:19:05 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:19:05 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7586?= In-Reply-To: <887196297.89.1545264916979.JavaMail.jenkins@jenkins.osmocom.org> References: <887196297.89.1545264916979.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1195406045.92.1545265145245.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 860.11 KB...] no stats reporter statsd stats reporter log no stats reporter log stats interval <1-65535> network msc mncc-int hlr smpp OsmoMSC(config)# network OsmoMSC(config-net)# list help list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6502 bytes in 49 blocks) struct osmo_ss7_instance contains 2389 bytes in 27 blocks (ref 0) 0x61400000a6a0 struct osmo_sccp_instance contains 266 bytes in 3 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f0000091f0 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b00016ab20 struct osmo_ss7_asp contains 1084 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 359 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A)[0x612000016d20] contains 44 bytes in 1 blocks (ref 0) 0x60d000027da0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016abd0 struct osmo_fsm_inst contains 270 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b00016ac80 xua_default_lm(asp-clnt-OsmoMSC-A)[0x612000017020] contains 51 bytes in 1 blocks (ref 0) 0x60e00003a1e0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ae0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016ad30 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ba0 struct osmo_ss7_as contains 598 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 356 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A)[0x612000017320] contains 42 bytes in 1 blocks (ref 0) 0x60d000027e70 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046de0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046ea0 struct osmo_ss7_route_table contains 145 bytes in 4 blocks (ref 0) 0x60e00003a3a0 struct osmo_ss7_route contains 82 bytes in 2 blocks (ref 0) 0x60e00003a2c0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046d20 system contains 7 bytes in 1 blocks (ref 0) 0x60b00016ade0 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b0001592a0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3959 bytes in 15 blocks (ref 0) 0x61300000d0e0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d660 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b00013f200 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000140cd0 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000141300 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000cf20 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009aa0 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002bb60 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000158220 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a720 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d9e0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027c00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027cd0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000280e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000281b0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c380 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c450 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000010640 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Cannot find line ' mgw endpoint-range <1-65534> <1-65534>' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> ] make[7]: *** [vty-transcript-test] Error 1 Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 make[5]: *** [python-tests] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:743: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Dec 20 00:20:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 00:20:45 +0000 Subject: Change in libosmocore[master]: add API doc for LOGPFSM* macros In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12384 ) Change subject: add API doc for LOGPFSM* macros ...................................................................... Patch Set 1: Code-Review+1 (3 comments) This is exactly what I was thinking about while reading previous change - comments! Looks fine, my comments are not critical. https://gerrit.osmocom.org/#/c/12384/1/include/osmocom/core/fsm.h File include/osmocom/core/fsm.h: https://gerrit.osmocom.org/#/c/12384/1/include/osmocom/core/fsm.h at 123 PS1, Line 123: osmo_fsm_inst \ref https://gerrit.osmocom.org/#/c/12384/1/include/osmocom/core/fsm.h at 125 PS1, Line 125: string format "format string" is more common term I think https://gerrit.osmocom.org/#/c/12384/1/include/osmocom/core/fsm.h at 126 PS1, Line 126: String format same -- To view, visit https://gerrit.osmocom.org/12384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bf6500889aa58195f50a726dec0876c0c2baec3 Gerrit-Change-Number: 12384 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 00:20:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 20 00:21:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:21:52 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7586?= In-Reply-To: <284335302.91.1545265012277.JavaMail.jenkins@jenkins.osmocom.org> References: <284335302.91.1545265012277.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2034734022.93.1545265312295.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.20 MB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6640 bytes in 53 blocks) iu contains 2 bytes in 2 blocks (ref 0) 0x60b000168550 asn1 contains 1 bytes in 1 blocks (ref 0) 0x60b0001684a0 struct osmo_ss7_instance contains 2509 bytes in 29 blocks (ref 0) 0x61400000a4a0 struct osmo_sccp_instance contains 359 bytes in 5 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f000009010 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b000168340 struct osmo_sccp_user contains 93 bytes in 2 blocks (ref 0) 0x60f000009100 OsmoMSC-IuCS contains 13 bytes in 1 blocks (ref 0) 0x60b0001683f0 struct osmo_ss7_asp contains 1099 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 365 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A-Iu)[0x612000016d20] contains 47 bytes in 1 blocks (ref 0) 0x60d000027b30 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c0000465a0 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168600 struct osmo_fsm_inst contains 276 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b0001686b0 xua_default_lm(asp-clnt-OsmoMSC-A-Iu)[0x612000017020] contains 54 bytes in 1 blocks (ref 0) 0x60e000039e60 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046660 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168760 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046720 struct osmo_ss7_as contains 607 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 362 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A-Iu)[0x612000017320] contains 45 bytes in 1 blocks (ref 0) 0x60d000027c00 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046960 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_ss7_route_table contains 148 bytes in 4 blocks (ref 0) 0x60e00003a020 struct osmo_ss7_route contains 85 bytes in 2 blocks (ref 0) 0x60e000039f40 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c0000468a0 system contains 7 bytes in 1 blocks (ref 0) 0x60b000168810 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b000156cd0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3975 bytes in 15 blocks (ref 0) 0x61400000faa0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d570 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b000158430 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000159f00 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b00015a530 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000d0e0 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009c60 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002b8f0 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000155c50 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a3a0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d560 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027990 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027a60 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027e70 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027f40 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c110 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c1e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000103d0 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Mismatch: Expect: ' mgw endpoint-range <1-65534> <1-65534>' Got: ' iu rab-assign-addr-enc (x213|v4raw)' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) ] make[7]: *** [vty-transcript-test] Error 1 Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 make[5]: *** [python-tests] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Dec 20 00:23:40 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 00:23:40 +0000 Subject: Change in libosmocore[master]: LOGPFSM*: guard against fi == NULL In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12385 ) Change subject: LOGPFSM*: guard against fi == NULL ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12385/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12385/1//COMMIT_MSG at 9 PS1, Line 9: they should guard against a NULL Any reasons why should we tolerate NULL? -- To view, visit https://gerrit.osmocom.org/12385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9eaf8b7e2cf1e450ae626cb2fc928862008f6233 Gerrit-Change-Number: 12385 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 00:23:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 00:30:35 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 00:30:35 +0000 Subject: Change in libosmocore[master]: add LOGPFSMSL(), LOGPFSMSLSRC() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12386 ) Change subject: add LOGPFSMSL(), LOGPFSMSLSRC() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12386/1/include/osmocom/core/fsm.h File include/osmocom/core/fsm.h: https://gerrit.osmocom.org/#/c/12386/1/include/osmocom/core/fsm.h at 122 PS1, Line 122: /*! Log using FSM instance's context, on explicit logging subsystem and level. Same comments apply here. Both macros depend on other macros, which defined below. Also, \ref and "format string". -- To view, visit https://gerrit.osmocom.org/12386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11b182a03f5ecb6df7cd8f260757d3626c8e945d Gerrit-Change-Number: 12386 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 00:30:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 00:32:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 00:32:25 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12368 ) Change subject: abort assignment on Assignment Failure ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12368/4/src/libmsc/osmo_msc.c File src/libmsc/osmo_msc.c: https://gerrit.osmocom.org/#/c/12368/4/src/libmsc/osmo_msc.c at 128 PS4, Line 128: rr_cause? Missing space. -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 00:32:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 00:41:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 00:41:38 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12357 ) Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client.c File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client.c at 822 PS3, Line 822: name[0]? Missing space. https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client.c at 830 PS3, Line 830: "rtpbridge/*@%s" Oh, wow, this breaks Gerrit's syntax highlighting :D -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 00:41:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 20 00:56:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:56:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7587?= In-Reply-To: <1195406045.92.1545265145245.JavaMail.jenkins@jenkins.osmocom.org> References: <1195406045.92.1545265145245.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <854515016.94.1545267407917.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 859.14 KB...] no stats reporter statsd stats reporter log no stats reporter log stats interval <1-65535> network msc mncc-int hlr smpp OsmoMSC(config)# network OsmoMSC(config-net)# list help list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6502 bytes in 49 blocks) struct osmo_ss7_instance contains 2389 bytes in 27 blocks (ref 0) 0x61400000a6a0 struct osmo_sccp_instance contains 266 bytes in 3 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f0000091f0 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b00016ab20 struct osmo_ss7_asp contains 1084 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 359 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A)[0x612000016d20] contains 44 bytes in 1 blocks (ref 0) 0x60d000027da0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016abd0 struct osmo_fsm_inst contains 270 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b00016ac80 xua_default_lm(asp-clnt-OsmoMSC-A)[0x612000017020] contains 51 bytes in 1 blocks (ref 0) 0x60e00003a1e0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ae0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016ad30 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ba0 struct osmo_ss7_as contains 598 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 356 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A)[0x612000017320] contains 42 bytes in 1 blocks (ref 0) 0x60d000027e70 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046de0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046ea0 struct osmo_ss7_route_table contains 145 bytes in 4 blocks (ref 0) 0x60e00003a3a0 struct osmo_ss7_route contains 82 bytes in 2 blocks (ref 0) 0x60e00003a2c0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046d20 system contains 7 bytes in 1 blocks (ref 0) 0x60b00016ade0 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b0001592a0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3959 bytes in 15 blocks (ref 0) 0x61300000d0e0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d660 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b00013f200 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000140cd0 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000141300 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000cf20 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009aa0 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002bb60 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000158220 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a720 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d9e0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027c00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027cd0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000280e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000281b0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c380 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c450 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000010640 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Cannot find line ' mgw endpoint-range <1-65534> <1-65534>' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> ] Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-transcript-test] Error 1 make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 20 00:56:48 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:56:48 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7588?= In-Reply-To: <854515016.94.1545267407917.JavaMail.jenkins@jenkins.osmocom.org> References: <854515016.94.1545267407917.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <11051647.95.1545267408554.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 859.12 KB...] no stats reporter statsd stats reporter log no stats reporter log stats interval <1-65535> network msc mncc-int hlr smpp OsmoMSC(config)# network OsmoMSC(config-net)# list help list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6502 bytes in 49 blocks) struct osmo_ss7_instance contains 2389 bytes in 27 blocks (ref 0) 0x61400000a6a0 struct osmo_sccp_instance contains 266 bytes in 3 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f0000091f0 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b00016ab20 struct osmo_ss7_asp contains 1084 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 359 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A)[0x612000016d20] contains 44 bytes in 1 blocks (ref 0) 0x60d000027da0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016abd0 struct osmo_fsm_inst contains 270 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b00016ac80 xua_default_lm(asp-clnt-OsmoMSC-A)[0x612000017020] contains 51 bytes in 1 blocks (ref 0) 0x60e00003a1e0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ae0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016ad30 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ba0 struct osmo_ss7_as contains 598 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 356 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A)[0x612000017320] contains 42 bytes in 1 blocks (ref 0) 0x60d000027e70 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046de0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046ea0 struct osmo_ss7_route_table contains 145 bytes in 4 blocks (ref 0) 0x60e00003a3a0 struct osmo_ss7_route contains 82 bytes in 2 blocks (ref 0) 0x60e00003a2c0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046d20 system contains 7 bytes in 1 blocks (ref 0) 0x60b00016ade0 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b0001592a0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3959 bytes in 15 blocks (ref 0) 0x61300000d0e0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d660 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b00013f200 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000140cd0 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000141300 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000cf20 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009aa0 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002bb60 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000158220 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a720 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d9e0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027c00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027cd0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000280e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000281b0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c380 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c450 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000010640 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Cannot find line ' mgw endpoint-range <1-65534> <1-65534>' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> ] Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-transcript-test] Error 1 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:743: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 20 00:57:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:57:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7587?= In-Reply-To: <2034734022.93.1545265312295.JavaMail.jenkins@jenkins.osmocom.org> References: <2034734022.93.1545265312295.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1004365680.96.1545267435679.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.20 MB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6640 bytes in 53 blocks) iu contains 2 bytes in 2 blocks (ref 0) 0x60b000168550 asn1 contains 1 bytes in 1 blocks (ref 0) 0x60b0001684a0 struct osmo_ss7_instance contains 2509 bytes in 29 blocks (ref 0) 0x61400000a4a0 struct osmo_sccp_instance contains 359 bytes in 5 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f000009010 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b000168340 struct osmo_sccp_user contains 93 bytes in 2 blocks (ref 0) 0x60f000009100 OsmoMSC-IuCS contains 13 bytes in 1 blocks (ref 0) 0x60b0001683f0 struct osmo_ss7_asp contains 1099 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 365 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A-Iu)[0x612000016d20] contains 47 bytes in 1 blocks (ref 0) 0x60d000027b30 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c0000465a0 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168600 struct osmo_fsm_inst contains 276 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b0001686b0 xua_default_lm(asp-clnt-OsmoMSC-A-Iu)[0x612000017020] contains 54 bytes in 1 blocks (ref 0) 0x60e000039e60 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046660 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168760 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046720 struct osmo_ss7_as contains 607 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 362 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A-Iu)[0x612000017320] contains 45 bytes in 1 blocks (ref 0) 0x60d000027c00 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046960 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_ss7_route_table contains 148 bytes in 4 blocks (ref 0) 0x60e00003a020 struct osmo_ss7_route contains 85 bytes in 2 blocks (ref 0) 0x60e000039f40 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c0000468a0 system contains 7 bytes in 1 blocks (ref 0) 0x60b000168810 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b000156cd0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3975 bytes in 15 blocks (ref 0) 0x61400000faa0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d570 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b000158430 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000159f00 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b00015a530 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000d0e0 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009c60 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002b8f0 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000155c50 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a3a0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d560 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027990 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027a60 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027e70 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027f40 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c110 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c1e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000103d0 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Mismatch: Expect: ' mgw endpoint-range <1-65534> <1-65534>' Got: ' iu rab-assign-addr-enc (x213|v4raw)' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) ] make[7]: *** [vty-transcript-test] Error 1 Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make: *** [check] Error 2 Makefile:743: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 20 00:57:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 00:57:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7588?= In-Reply-To: <1004365680.96.1545267435679.JavaMail.jenkins@jenkins.osmocom.org> References: <1004365680.96.1545267435679.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1172582427.97.1545267440486.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.20 MB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6640 bytes in 53 blocks) iu contains 2 bytes in 2 blocks (ref 0) 0x60b000168550 asn1 contains 1 bytes in 1 blocks (ref 0) 0x60b0001684a0 struct osmo_ss7_instance contains 2509 bytes in 29 blocks (ref 0) 0x61400000a4a0 struct osmo_sccp_instance contains 359 bytes in 5 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f000009010 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b000168340 struct osmo_sccp_user contains 93 bytes in 2 blocks (ref 0) 0x60f000009100 OsmoMSC-IuCS contains 13 bytes in 1 blocks (ref 0) 0x60b0001683f0 struct osmo_ss7_asp contains 1099 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 365 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A-Iu)[0x612000016d20] contains 47 bytes in 1 blocks (ref 0) 0x60d000027b30 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c0000465a0 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168600 struct osmo_fsm_inst contains 276 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b0001686b0 xua_default_lm(asp-clnt-OsmoMSC-A-Iu)[0x612000017020] contains 54 bytes in 1 blocks (ref 0) 0x60e000039e60 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046660 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168760 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046720 struct osmo_ss7_as contains 607 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 362 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A-Iu)[0x612000017320] contains 45 bytes in 1 blocks (ref 0) 0x60d000027c00 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046960 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_ss7_route_table contains 148 bytes in 4 blocks (ref 0) 0x60e00003a020 struct osmo_ss7_route contains 85 bytes in 2 blocks (ref 0) 0x60e000039f40 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c0000468a0 system contains 7 bytes in 1 blocks (ref 0) 0x60b000168810 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b000156cd0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3975 bytes in 15 blocks (ref 0) 0x61400000faa0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d570 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b000158430 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000159f00 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b00015a530 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000d0e0 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009c60 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002b8f0 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000155c50 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a3a0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d560 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027990 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027a60 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027e70 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027f40 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c110 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c1e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000103d0 signal 15 received Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Mismatch: Expect: ' mgw endpoint-range <1-65534> <1-65534>' Got: ' iu rab-assign-addr-enc (x213|v4raw)' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) ] Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-transcript-test] Error 1 make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Dec 20 00:58:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Dec 2018 00:58:12 +0000 Subject: Change in osmo-bts[master]: rsl: Send PDCH ACT NACK if TCH chan is still active In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12180 ) Change subject: rsl: Send PDCH ACT NACK if TCH chan is still active ...................................................................... Patch Set 1: > The idea of a commit log is that the reviewer can skip all that > because you have explained it :) I think the commit description provides enough context to understand the issue and how it was added (originating commit), how to reproduce the issue (TTCN3 test, and how it behaves in commit description), and why exactly the added code behaves (there's a comment explaining the case/scenario on top of the code). Feel free to provide an explicit change in order to merge the change, or we can keep with osmo-bts misbehaving and a TTCN3 failing for a few more months for apparently no good reason. It's a 2 lines change with a TTCN3 test behind it showcasing the issue, not a complete refactor of 1000 code lines. -- To view, visit https://gerrit.osmocom.org/12180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d Gerrit-Change-Number: 12180 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 20 Dec 2018 00:58:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 20 01:04:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 01:04:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7589?= In-Reply-To: <11051647.95.1545267408554.JavaMail.jenkins@jenkins.osmocom.org> References: <11051647.95.1545267408554.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1451028917.98.1545267847192.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 859.21 KB...] no stats reporter statsd stats reporter log no stats reporter log stats interval <1-65535> network msc mncc-int hlr smpp OsmoMSC(config)# network OsmoMSC(config-net)# list help list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15  help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> full talloc report on 'osmo_msc' (total 6502 bytes in 49 blocks) struct osmo_ss7_instance contains 2389 bytes in 27 blocks (ref 0) 0x61400000a6a0 struct osmo_sccp_instance contains 266 bytes in 3 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f0000091f0 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b00016ab20 struct osmo_ss7_asp contains 1084 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 359 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A)[0x612000016d20] contains 44 bytes in 1 blocks (ref 0) 0x60d000027da0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016abd0 struct osmo_fsm_inst contains 270 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b00016ac80 xua_default_lm(asp-clnt-OsmoMSC-A)[0x612000017020] contains 51 bytes in 1 blocks (ref 0) 0x60e00003a1e0 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ae0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b00016ad30 asp-clnt-OsmoMSC-A contains 19 bytes in 1 blocks (ref 0) 0x60c000046ba0 struct osmo_ss7_as contains 598 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 356 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A)[0x612000017320] contains 42 bytes in 1 blocks (ref 0) 0x60d000027e70 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046de0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046ea0 struct osmo_ss7_route_table contains 145 bytes in 4 blocks (ref 0) 0x60e00003a3a0 struct osmo_ss7_route contains 82 bytes in 2 blocks (ref 0) 0x60e00003a2c0 as-clnt-OsmoMSC-A contains 18 bytes in 1 blocks (ref 0) 0x60c000046d20 system contains 7 bytes in 1 blocks (ref 0) 0x60b00016ade0 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b0001592a0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3959 bytes in 15 blocks (ref 0) 0x61300000d0e0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d660 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b00013f200 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000140cd0 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000141300 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000cf20 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009aa0 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002bb60 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000158220 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a720 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d9e0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027c00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027cd0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000280e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000281b0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c380 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c450 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000010640 signal 15 received Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Cannot find line ' mgw endpoint-range <1-65534> <1-65534>' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> ] Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-transcript-test] Error 1 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 make[5]: *** [python-tests] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 20 01:05:44 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 01:05:44 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7589?= In-Reply-To: <1172582427.97.1545267440486.JavaMail.jenkins@jenkins.osmocom.org> References: <1172582427.97.1545267440486.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1767696899.99.1545267944956.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.20 MB...] list write terminal write file write memory write show running-config exit end network country code <1-999> mobile network code <0-999> short name NAME long name NAME encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>] authentication (optional|required) rrlp mode (none|ms-based|ms-preferred|ass-preferred) mm info (0|1) timezone <-19-19> (0|15|30|45) timezone <-19-19> (0|15|30|45) <0-2> no timezone periodic location update <6-1530> no periodic location update OsmoMSC(config-net)# exit OsmoMSC(config)# msc OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) Error during transcript step 8: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Error while verifying transcript file './test_nodes.vty' <0006> msc_main.c:236 Terminating due to signal 15 full talloc report on 'osmo_msc' (total 6640 bytes in 53 blocks) iu contains 2 bytes in 2 blocks (ref 0) 0x60b000168550 asn1 contains 1 bytes in 1 blocks (ref 0) 0x60b0001684a0 struct osmo_ss7_instance contains 2509 bytes in 29 blocks (ref 0) 0x61400000a4a0 struct osmo_sccp_instance contains 359 bytes in 5 blocks (ref 0) 0x612000016ba0 struct osmo_sccp_user contains 90 bytes in 2 blocks (ref 0) 0x60f000009010 OsmoMSC-A contains 10 bytes in 1 blocks (ref 0) 0x60b000168340 struct osmo_sccp_user contains 93 bytes in 2 blocks (ref 0) 0x60f000009100 OsmoMSC-IuCS contains 13 bytes in 1 blocks (ref 0) 0x60b0001683f0 struct osmo_ss7_asp contains 1099 bytes in 13 blocks (ref 0) 0x6120000171a0 struct osmo_fsm_inst contains 365 bytes in 4 blocks (ref 0) 0x612000016d20 struct xua_asp_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000e60 XUA_ASP(asp-clnt-OsmoMSC-A-Iu)[0x612000016d20] contains 47 bytes in 1 blocks (ref 0) 0x60d000027b30 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c0000465a0 struct osmo_stream_cli contains 234 bytes in 2 blocks (ref 0) 0x612000016ea0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168600 struct osmo_fsm_inst contains 276 bytes in 4 blocks (ref 0) 0x612000017020 struct lm_fsm_priv contains 8 bytes in 1 blocks (ref 0) 0x60b0001686b0 xua_default_lm(asp-clnt-OsmoMSC-A-Iu)[0x612000017020] contains 54 bytes in 1 blocks (ref 0) 0x60e000039e60 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046660 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000168760 asp-clnt-OsmoMSC-A-Iu contains 22 bytes in 1 blocks (ref 0) 0x60c000046720 struct osmo_ss7_as contains 607 bytes in 6 blocks (ref 0) 0x6120000174a0 struct osmo_fsm_inst contains 362 bytes in 4 blocks (ref 0) 0x612000017320 struct xua_as_fsm_priv contains 104 bytes in 1 blocks (ref 0) 0x611000000fa0 XUA_AS(as-clnt-OsmoMSC-A-Iu)[0x612000017320] contains 45 bytes in 1 blocks (ref 0) 0x60d000027c00 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046960 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c000046a20 struct osmo_ss7_route_table contains 148 bytes in 4 blocks (ref 0) 0x60e00003a020 struct osmo_ss7_route contains 85 bytes in 2 blocks (ref 0) 0x60e000039f40 as-clnt-OsmoMSC-A-Iu contains 21 bytes in 1 blocks (ref 0) 0x60c0000468a0 system contains 7 bytes in 1 blocks (ref 0) 0x60b000168810 telnet_connection contains 1 bytes in 1 blocks (ref 0) 0x60b000156cd0 struct smsc contains 152 bytes in 1 blocks (ref 0) 0x611000004420 struct gsm_network contains 3975 bytes in 15 blocks (ref 0) 0x61400000faa0 struct mgcp_client contains 176 bytes in 1 blocks (ref 0) 0x612000017620 struct gsm_sms_queue contains 216 bytes in 1 blocks (ref 0) 0x612000001ba0 struct ctrl_handle contains 80 bytes in 1 blocks (ref 0) 0x60f00000d570 10.23.24.1 contains 11 bytes in 1 blocks (ref 0) 0x60b000158430 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b000159f00 OsmoMSC contains 8 bytes in 1 blocks (ref 0) 0x60b00015a530 struct vlr_instance contains 810 bytes in 6 blocks (ref 0) 0x61300000d0e0 struct osmo_gsup_client contains 490 bytes in 4 blocks (ref 0) 0x613000009c60 struct osmo_fd contains 48 bytes in 1 blocks (ref 0) 0x60d00002b8f0 struct ipa_client_conn contains 186 bytes in 2 blocks (ref 0) 0x612000009fa0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000155c50 struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e00003a3a0 127.0.0.1 contains 10 bytes in 1 blocks (ref 0) 0x60b000067400 rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0 transaction contains 0 bytes in 1 blocks (ref 0) 0x60800000bd80 gsm_call contains 0 bytes in 1 blocks (ref 0) 0x60800000be00 sms contains 0 bytes in 1 blocks (ref 0) 0x60800000be80 msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80 full talloc report on 'null_context' (total 400 bytes in 12 blocks) struct lookup_helper contains 24 bytes in 1 blocks (ref 0) 0x60c00004d560 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d0000070c0 struct osmo_counter contains 48 bytes in 1 blocks (ref 0) 0x60d000007190 osmo_signal contains 280 bytes in 8 blocks (ref 0) 0x60800000bf00 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027990 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027a60 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027e70 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d000027f40 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c110 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d00002c1e0 struct signal_handler contains 40 bytes in 1 blocks (ref 0) 0x60d0000103d0 signal 15 received Traceback (most recent call last): File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 362, in verify_application interact.verify_transcript_file(transcript_file) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 116, in verify_transcript_file result = self.verify_transcript(content) File "/usr/local/lib/python3.4/dist-packages/osmopython-0.1.0-py3.4.egg/osmopy/osmo_interact/common.py", line 205, in verify_transcript % (match_result, step, step.command_str(), '\n'.join(res))) Exception: Result mismatch: Mismatch: Expect: ' mgw endpoint-range <1-65534> <1-65534>' Got: ' iu rab-assign-addr-enc (x213|v4raw)' Expected: [ OsmoMSC(config-msc)# list ... assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> mgw endpoint-range <1-65534> <1-65534> mgw bts-base <0-65534> ... ] Got: [ OsmoMSC(config-msc)# list help list write terminal write file write memory write show running-config exit end assign-tmsi mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> no assign-tmsi auth-tuple-max-reuse-count <-1-2147483647> auth-tuple-reuse-on-error (0|1) cs7-instance-a <0-15> cs7-instance-iu <0-15> paging response-timer (default|<1-65535>) emergency-call route-to-msisdn MSISDN ipa-name NAME mgw local-ip A.B.C.D mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> iu rab-assign-addr-enc (x213|v4raw) asn1 debug (1|0) asn1 xer-print (1|0) ] Terminating took 2.679s RESULTS: FAIL: ./test_nodes.vty make[7]: *** [vty-transcript-test] Error 1 Makefile:715: recipe for target 'vty-transcript-test' failed make[7]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Dec 20 01:33:32 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Dec 2018 01:33:32 +0000 Subject: Change in osmo-bsc[master]: make sure early lchan act failure resets the lchan Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12388 Change subject: make sure early lchan act failure resets the lchan ...................................................................... make sure early lchan act failure resets the lchan Fix crash after AMR configuration fails. The crash is due to an assertion that finds a non-NULL conn in the lchan, when re-using an lchan that has failed in AMR configuration earlier on. That is because the AMR config still happens in state UNUSED. DCHAN ERROR lchan(0-0-2-TCH_F_TCH_H_PDCH-0)[0x6120000066a0]{UNUSED}: (type=TCH_F) lchan allocation failed in state UNUSED: Can not generate multirate configuration IE ... DCHAN DEBUG lchan(0-0-2-TCH_F_TCH_H_PDCH-0)[0x6120000066a0]{UNUSED}: (type=TCH_F) After failure handling, already in state UNUSED ... ... DCHAN DEBUG lchan(0-0-2-TCH_F_TCH_H_PDCH-0)[0x6120000066a0]{UNUSED}: Received Event LCHAN_EV_ACTIVATE (lchan_fsm.c:324) Assert failed !lchan->conn ../../../../src/osmo-bsc/src/osmo-bsc/lchan_fsm.c:491 The FSM design idea is that when returning to the UNUSED state, all lchan state is cleared. However, when calling lchan_activate(), a failure may happen still in state UNUSED, so that we don't transition *back* to UNUSED properly. So, first transition out of UNUSED before failures can happen. (Other ways to solve this would be to invoke lchan clearing even if already in UNUSED, but semantically, transitioning first makes more sense.) Upon LCHAN_EV_ACTIVATE, just remember the lchan_activate_info and transition to WAIT_TS_READY, so that on lchan_fail(), we can normally transition back to UNUSED and clear the lchan. Move the initial lchan activation code to lchan_fsm_wait_ts_ready_onenter(). Also, there is a bit of duplication of members of the lchan->activate (lchan state) and the lchan_activate_info (passed to lchan_activate()) structs. The fix for this also removes the dup: Add struct lchan_activate_info as child struct at lchan->activate.info, drop the other lchan->activate members that would dup .info.*. Move struct lchan_activate_info declaration to gsm_data.h. Apply the new '.info' member struct throughout the code. Related: OS#3737 Change-Id: Ide665b10fa3f4583059c55346db8da833959e3cc --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c 8 files changed, 104 insertions(+), 106 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/88/12388/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index cf34c6f..2090142 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -503,6 +503,19 @@ static inline const char *lchan_activate_mode_name(enum lchan_activate_mode activ_for) { return get_value_string(lchan_activate_mode_names, activ_for); } +struct lchan_activate_info { + enum lchan_activate_mode activ_for; + struct gsm_subscriber_connection *for_conn; + /* This always is for a specific lchan, so its lchan->type indicates full or half rate. + * When a dyn TS was selected, the lchan->type has been set to the desired rate. */ + enum gsm48_chan_mode chan_mode; + uint16_t s15_s0; + bool requires_voice_stream; + bool wait_before_switching_rtp; /*< true = requires LCHAN_EV_READY_TO_SWITCH_RTP */ + uint16_t msc_assigned_cic; + struct gsm_lchan *re_use_mgw_endpoint_from_lchan; +}; + struct gsm_lchan { /* The TS that we're part of */ struct gsm_bts_trx_ts *ts; @@ -517,18 +530,14 @@ struct mgwep_ci *mgw_endpoint_ci_bts; struct { - enum lchan_activate_mode activ_for; + struct lchan_activate_info info; bool activ_ack; /*< true as soon as RSL Chan Activ Ack is received */ bool immediate_assignment_sent; /*! This flag ensures that when an lchan activation has succeeded, and we have already * sent ACKs like Immediate Assignment or BSSMAP Assignment Complete, and if other errors * occur later, e.g. during release, that we don't send a NACK out of context. */ bool concluded; - bool requires_voice_stream; - bool wait_before_switching_rtp; /*< true = requires LCHAN_EV_READY_TO_SWITCH_RTP */ - uint16_t msc_assigned_cic; enum gsm0808_cause gsm0808_error_cause; - struct gsm_lchan *re_use_mgw_endpoint_from_lchan; } activate; struct { diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index 48cd383..55ab024 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -52,19 +52,6 @@ void lchan_release(struct gsm_lchan *lchan, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr); -struct lchan_activate_info { - enum lchan_activate_mode activ_for; - struct gsm_subscriber_connection *for_conn; - /* This always is for a specific lchan, so its lchan->type indicates full or half rate. - * When a dyn TS was selected, the lchan->type has been set to the desired rate. */ - enum gsm48_chan_mode chan_mode; - uint16_t s15_s0; - bool requires_voice_stream; - bool wait_before_switching_rtp; - uint16_t msc_assigned_cic; - struct gsm_lchan *old_lchan; -}; - void lchan_activate(struct gsm_lchan *lchan, struct lchan_activate_info *info); void lchan_ready_to_switch_rtp(struct gsm_lchan *lchan); diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 93362f8..a24f7f9 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -385,7 +385,7 @@ .s15_s0 = req->s15_s0, .requires_voice_stream = conn->assignment.requires_voice_stream, .msc_assigned_cic = req->msc_assigned_cic, - .old_lchan = conn->lchan, + .re_use_mgw_endpoint_from_lchan = conn->lchan, }; lchan_activate(conn->assignment.new_lchan, &info); } diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 85e754f..c1ac6eb 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -550,7 +550,7 @@ } else verb = MGCP_VERB_CRCX; - gscon_ensure_mgw_endpoint(conn, for_lchan->activate.msc_assigned_cic); + gscon_ensure_mgw_endpoint(conn, for_lchan->activate.info.msc_assigned_cic); if (!conn->user_plane.mgw_endpoint) { LOGPFSML(conn->fi, LOGL_ERROR, "Unable to allocate endpoint info\n"); diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index aae50b9..35f2e55 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -360,7 +360,7 @@ .chan_mode = conn->lchan->tch_mode, .requires_voice_stream = conn->lchan->mgw_endpoint_ci_bts ? true : false, .msc_assigned_cic = conn->ho.inter_bsc_in.msc_assigned_cic, - .old_lchan = conn->lchan, + .re_use_mgw_endpoint_from_lchan = conn->lchan, .wait_before_switching_rtp = true, }; @@ -706,7 +706,7 @@ ho_perf_params.chosen_encr_alg = lchan->encr.alg_id; ho_perf_params.chosen_encr_alg_present = true; - if (ho->new_lchan->activate.requires_voice_stream) { + if (ho->new_lchan->activate.info.requires_voice_stream) { /* Speech Version (chosen) 3.2.2.51 */ ho_perf_params.speech_version_chosen = gsm0808_permitted_speech(lchan->type, lchan->tch_mode); ho_perf_params.speech_version_chosen_present = true; @@ -1010,7 +1010,7 @@ struct gsm_subscriber_connection *conn = ho_fi_conn(fi); struct handover *ho = &conn->ho; - if (ho->new_lchan->activate.requires_voice_stream + if (ho->new_lchan->activate.info.requires_voice_stream && (ho->scope & HO_INTER_BSC_IN)) ho_fsm_state_chg(HO_ST_WAIT_MGW_ENDPOINT_TO_MSC); else diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index c873025..85edcbb 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -151,7 +151,7 @@ return; lchan->activate.concluded = true; - switch (lchan->activate.activ_for) { + switch (lchan->activate.info.activ_for) { case FOR_MS_CHANNEL_REQUEST: /* No signalling to do here, MS is free to use the channel, and should go on to connect * to the MSC and establish a subscriber connection. */ @@ -201,7 +201,7 @@ default: LOG_LCHAN(lchan, LOGL_NOTICE, "lchan %s fully established\n", - lchan_activate_mode_name(lchan->activate.activ_for)); + lchan_activate_mode_name(lchan->activate.info.activ_for)); break; } } @@ -238,7 +238,7 @@ lchan_set_last_error(_lchan, "lchan %s in state %s: " fmt, \ _lchan->activate.concluded ? "failure" : "allocation failed", \ osmo_fsm_state_name(fsm, state_was), ## args); \ - lchan_on_activation_failure(_lchan, _lchan->activate.activ_for, _lchan->conn); \ + lchan_on_activation_failure(_lchan, _lchan->activate.info.activ_for, _lchan->conn); \ if (fi->state != state_chg) \ lchan_fsm_state_chg(state_chg); \ else \ @@ -481,8 +481,6 @@ { struct lchan_activate_info *info = data; struct gsm_lchan *lchan = lchan_fi_lchan(fi); - struct gsm_bts *bts = lchan->ts->trx->bts; - struct gsm48_multi_rate_conf mr_conf; switch (event) { @@ -493,63 +491,8 @@ lchan_set_last_error(lchan, NULL); lchan->release.requested = false; - lchan->conn = info->for_conn; - lchan->activate.activ_for = info->activ_for; - lchan->activate.requires_voice_stream = info->requires_voice_stream; - lchan->activate.wait_before_switching_rtp = info->wait_before_switching_rtp; - lchan->activate.msc_assigned_cic = info->msc_assigned_cic; + lchan->activate.info = *info; lchan->activate.concluded = false; - lchan->activate.re_use_mgw_endpoint_from_lchan = info->old_lchan; - - if (info->old_lchan) - lchan->encr = info->old_lchan->encr; - else { - lchan->encr = (struct gsm_encr){ - .alg_id = RSL_ENC_ALG_A5(0), /* no encryption */ - }; - } - - /* If there is a previous lchan, and the new lchan is on the same cell as previous one, - * take over power and TA values. Otherwise, use max power and zero TA. */ - if (info->old_lchan && info->old_lchan->ts->trx->bts == bts) { - lchan->ms_power = info->old_lchan->ms_power; - lchan->bs_power = info->old_lchan->bs_power; - lchan->rqd_ta = info->old_lchan->rqd_ta; - } else { - lchan->ms_power = ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); - /* From lchan_reset(): - * - bs_power is still zero, 0dB reduction, output power = Pn. - * - TA is still zero, to be determined by RACH. */ - } - - if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) { - gsm48_mr_cfg_from_gsm0808_sc_cfg(&mr_conf, info->s15_s0); - if (lchan_mr_config(lchan, &mr_conf) < 0) { - lchan_fail("Can not generate multirate configuration IE\n"); - return; - } - } - - switch (info->chan_mode) { - - case GSM48_CMODE_SIGN: - lchan->rsl_cmode = RSL_CMOD_SPD_SIGN; - lchan->tch_mode = GSM48_CMODE_SIGN; - break; - - case GSM48_CMODE_SPEECH_V1: - case GSM48_CMODE_SPEECH_EFR: - case GSM48_CMODE_SPEECH_AMR: - lchan->rsl_cmode = RSL_CMOD_SPD_SPEECH; - lchan->tch_mode = info->chan_mode; - break; - - default: - lchan_fail("Not implemented: cannot activate for chan mode %s", - gsm48_chan_mode_name(info->chan_mode)); - return; - } - lchan_fsm_state_chg(LCHAN_ST_WAIT_TS_READY); break; @@ -561,18 +504,75 @@ static void lchan_fsm_wait_ts_ready_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_lchan *lchan = lchan_fi_lchan(fi); + struct gsm48_multi_rate_conf mr_conf; + struct gsm_bts *bts = lchan->ts->trx->bts; struct mgwep_ci *use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); + struct gsm_lchan *old_lchan = lchan->activate.info.re_use_mgw_endpoint_from_lchan; + struct lchan_activate_info *info = &lchan->activate.info; if (lchan->release.requested) { lchan_fail("Release requested while activating"); return; } + lchan->conn = info->for_conn; + + if (old_lchan) + lchan->encr = old_lchan->encr; + else { + lchan->encr = (struct gsm_encr){ + .alg_id = RSL_ENC_ALG_A5(0), /* no encryption */ + }; + } + + /* If there is a previous lchan, and the new lchan is on the same cell as previous one, + * take over power and TA values. Otherwise, use max power and zero TA. */ + if (old_lchan && old_lchan->ts->trx->bts == bts) { + lchan->ms_power = old_lchan->ms_power; + lchan->bs_power = old_lchan->bs_power; + lchan->rqd_ta = old_lchan->rqd_ta; + } else { + lchan->ms_power = ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); + /* From lchan_reset(): + * - bs_power is still zero, 0dB reduction, output power = Pn. + * - TA is still zero, to be determined by RACH. */ + } + + if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) { + gsm48_mr_cfg_from_gsm0808_sc_cfg(&mr_conf, info->s15_s0); + if (lchan_mr_config(lchan, &mr_conf) < 0) { + lchan_fail("Can not generate multirate configuration IE\n"); + return; + } + } + + switch (info->chan_mode) { + + case GSM48_CMODE_SIGN: + lchan->rsl_cmode = RSL_CMOD_SPD_SIGN; + lchan->tch_mode = GSM48_CMODE_SIGN; + break; + + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_AMR: + lchan->rsl_cmode = RSL_CMOD_SPD_SPEECH; + lchan->tch_mode = info->chan_mode; + break; + + default: + lchan_fail("Not implemented: cannot activate for chan mode %s", + gsm48_chan_mode_name(info->chan_mode)); + return; + } + + use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); + LOG_LCHAN(lchan, LOGL_INFO, "Activation requested: %s voice=%s MGW-ci=%s type=%s tch-mode=%s\n", - lchan_activate_mode_name(lchan->activate.activ_for), - lchan->activate.requires_voice_stream ? "yes" : "no", - lchan->activate.requires_voice_stream ? + 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 ? mgwep_ci_name(use_mgwep_ci) : "new") : "none", gsm_lchant_name(lchan->type), @@ -583,7 +583,7 @@ osmo_fsm_inst_dispatch(lchan->ts->fi, TS_EV_LCHAN_REQUESTED, lchan); /* Prepare an MGW endpoint CI if appropriate. */ - if (lchan->activate.requires_voice_stream) + if (lchan->activate.info.requires_voice_stream) lchan_rtp_fsm_start(lchan); } @@ -627,7 +627,7 @@ return; } - switch (lchan->activate.activ_for) { + switch (lchan->activate.info.activ_for) { case FOR_MS_CHANNEL_REQUEST: act_type = RSL_ACT_INTRA_IMM_ASS; break; @@ -709,7 +709,7 @@ return; } - switch (lchan->activate.activ_for) { + switch (lchan->activate.info.activ_for) { case FOR_MS_CHANNEL_REQUEST: rc = rsl_tx_imm_assignment(lchan); @@ -764,7 +764,7 @@ default: LOG_LCHAN(lchan, LOGL_NOTICE, "lchan %s is now active\n", - lchan_activate_mode_name(lchan->activate.activ_for)); + lchan_activate_mode_name(lchan->activate.info.activ_for)); break; } @@ -784,7 +784,7 @@ switch (event) { case LCHAN_EV_RLL_ESTABLISH_IND: - if (!lchan->activate.requires_voice_stream + if (!lchan->activate.info.requires_voice_stream || lchan_rtp_established(lchan)) lchan_fsm_state_chg(LCHAN_ST_ESTABLISHED); return; @@ -1381,6 +1381,8 @@ if (!lchan) return; + lchan->activate.info.for_conn = NULL; + conn = lchan->conn; if (conn) { /* Log for both lchan FSM and conn FSM to ease reading the log in case of problems */ diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 6ab3da4..84cc287 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -111,9 +111,9 @@ /* Use old lchan only if there is an MGW endpoint present. Otherwise, on ROLLBACK, we might put * an endpoint "back" to an lchan that never had one to begin with. */ - if (lchan->activate.re_use_mgw_endpoint_from_lchan - && !lchan->activate.re_use_mgw_endpoint_from_lchan->mgw_endpoint_ci_bts) - lchan->activate.re_use_mgw_endpoint_from_lchan = NULL; + if (lchan->activate.info.re_use_mgw_endpoint_from_lchan + && !lchan->activate.info.re_use_mgw_endpoint_from_lchan->mgw_endpoint_ci_bts) + lchan->activate.info.re_use_mgw_endpoint_from_lchan = NULL; lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_AVAILABLE); } @@ -127,8 +127,8 @@ return lchan->mgw_endpoint_ci_bts; if (lchan_state_is(lchan, LCHAN_ST_ESTABLISHED)) return NULL; - if (lchan->activate.re_use_mgw_endpoint_from_lchan) - return lchan->activate.re_use_mgw_endpoint_from_lchan->mgw_endpoint_ci_bts; + if (lchan->activate.info.re_use_mgw_endpoint_from_lchan) + return lchan->activate.info.re_use_mgw_endpoint_from_lchan->mgw_endpoint_ci_bts; return NULL; } @@ -147,7 +147,7 @@ return; } - mgwep = gscon_ensure_mgw_endpoint(lchan->conn, lchan->activate.msc_assigned_cic); + mgwep = gscon_ensure_mgw_endpoint(lchan->conn, lchan->activate.info.msc_assigned_cic); if (!mgwep) { lchan_rtp_fail("Internal error: cannot obtain MGW endpoint handle for conn"); return; @@ -232,7 +232,7 @@ { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); - if (lchan->activate.wait_before_switching_rtp) { + if (lchan->activate.info.wait_before_switching_rtp) { LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Waiting for an event by caller before switching RTP\n"); lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_READY_TO_SWITCH_RTP); @@ -305,7 +305,7 @@ return; case LCHAN_RTP_EV_READY_TO_SWITCH_RTP: - lchan->activate.wait_before_switching_rtp = false; + lchan->activate.info.wait_before_switching_rtp = false; return; case LCHAN_RTP_EV_RELEASE: @@ -365,7 +365,7 @@ return; case LCHAN_RTP_EV_READY_TO_SWITCH_RTP: - lchan->activate.wait_before_switching_rtp = false; + lchan->activate.info.wait_before_switching_rtp = false; return; case LCHAN_RTP_EV_RELEASE: @@ -437,7 +437,7 @@ uint32_t prev_state) { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); - struct gsm_lchan *old_lchan = lchan->activate.re_use_mgw_endpoint_from_lchan; + struct gsm_lchan *old_lchan = lchan->activate.info.re_use_mgw_endpoint_from_lchan; if (lchan->release.requested) { lchan_rtp_fail("Release requested while activating"); @@ -514,7 +514,7 @@ static void lchan_rtp_fsm_rollback_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); - struct gsm_lchan *old_lchan = lchan->activate.re_use_mgw_endpoint_from_lchan; + struct gsm_lchan *old_lchan = lchan->activate.info.re_use_mgw_endpoint_from_lchan; if (!lchan->mgw_endpoint_ci_bts || !old_lchan) { osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, 0); @@ -526,7 +526,7 @@ static void lchan_rtp_fsm_rollback(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); - struct gsm_lchan *old_lchan = lchan->activate.re_use_mgw_endpoint_from_lchan; + struct gsm_lchan *old_lchan = lchan->activate.info.re_use_mgw_endpoint_from_lchan; switch (event) { @@ -560,7 +560,7 @@ struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); /* Make sure that we will not hand back the MGW endpoint to any old lchan from here on. */ - lchan->activate.re_use_mgw_endpoint_from_lchan = NULL; + lchan->activate.info.re_use_mgw_endpoint_from_lchan = NULL; } static void lchan_rtp_fsm_established(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 60ec5fb..f2ccf2c 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1101,7 +1101,7 @@ }; /* speech_codec_chosen */ - if (ho->new_lchan->activate.requires_voice_stream && gscon_is_aoip(conn)) { + if (ho->new_lchan->activate.info.requires_voice_stream && gscon_is_aoip(conn)) { int perm_spch = gsm0808_permitted_speech(lchan->type, lchan->tch_mode); params.speech_codec_chosen_present = true; rc = gsm0808_speech_codec_from_chan_type(¶ms.speech_codec_chosen, perm_spch); -- To view, visit https://gerrit.osmocom.org/12388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ide665b10fa3f4583059c55346db8da833959e3cc Gerrit-Change-Number: 12388 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 03:42:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Dec 2018 03:42:52 +0000 Subject: Change in osmo-msc[master]: fix test_nodes.vty after libosmo-mgcp-client vty changes Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12389 Change subject: fix test_nodes.vty after libosmo-mgcp-client vty changes ...................................................................... fix test_nodes.vty after libosmo-mgcp-client vty changes osmo-mgw I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 broke the build here. Fix that. Change-Id: I20e37c5228928b67e67f16aef0eb2930d21ef60a --- M tests/test_nodes.vty 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/89/12389/1 diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index dcbf580..d080082 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -45,8 +45,6 @@ mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> - mgw endpoint-range <1-65534> <1-65534> - mgw bts-base <0-65534> ... OsmoMSC(config-msc)# mncc? -- To view, visit https://gerrit.osmocom.org/12389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I20e37c5228928b67e67f16aef0eb2930d21ef60a Gerrit-Change-Number: 12389 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 03:49:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Dec 2018 03:49:48 +0000 Subject: Change in osmo-msc[master]: fix test_nodes.vty after libosmo-mgcp-client vty changes In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12389 ) Change subject: fix test_nodes.vty after libosmo-mgcp-client vty changes ...................................................................... Patch Set 1: Code-Review+2 urgent: fix build -- To view, visit https://gerrit.osmocom.org/12389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I20e37c5228928b67e67f16aef0eb2930d21ef60a Gerrit-Change-Number: 12389 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 20 Dec 2018 03:49:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 03:49:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Dec 2018 03:49:50 +0000 Subject: Change in osmo-msc[master]: fix test_nodes.vty after libosmo-mgcp-client vty changes In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12389 ) Change subject: fix test_nodes.vty after libosmo-mgcp-client vty changes ...................................................................... fix test_nodes.vty after libosmo-mgcp-client vty changes osmo-mgw I98a9f1f17a1c4ab20cea3b08c7d21663592134d6 broke the build here. Fix that. Change-Id: I20e37c5228928b67e67f16aef0eb2930d21ef60a --- M tests/test_nodes.vty 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index dcbf580..d080082 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -45,8 +45,6 @@ mgw local-port <0-65535> mgw remote-ip A.B.C.D mgw remote-port <0-65535> - mgw endpoint-range <1-65534> <1-65534> - mgw bts-base <0-65534> ... OsmoMSC(config-msc)# mncc? -- To view, visit https://gerrit.osmocom.org/12389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I20e37c5228928b67e67f16aef0eb2930d21ef60a Gerrit-Change-Number: 12389 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 20 03:56:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 03:56:35 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--disa?= =?UTF-8?Q?ble-iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7590?= In-Reply-To: <1451028917.98.1545267847192.JavaMail.jenkins@jenkins.osmocom.org> References: <1451028917.98.1545267847192.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1938858202.108.1545278195154.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Dec 20 03:57:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 03:57:22 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--enab?= =?UTF-8?Q?le-iu,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7590?= In-Reply-To: <1767696899.99.1545267944956.JavaMail.jenkins@jenkins.osmocom.org> References: <1767696899.99.1545267944956.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1772654541.109.1545278242420.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Dec 20 07:03:58 2018 From: gerrit-no-reply at lists.osmocom.org (Mykola Shchetinin) Date: Thu, 20 Dec 2018 07:03:58 +0000 Subject: Change in osmo-mgw[neels/iuup]: iuup_cn_node.c: make it work for AMR 12.2k codec Message-ID: Mykola Shchetinin has uploaded this change for review. ( https://gerrit.osmocom.org/12390 Change subject: iuup_cn_node.c: make it work for AMR 12.2k codec ...................................................................... iuup_cn_node.c: make it work for AMR 12.2k codec rx_data: prepend hardcoded AMR 12.2 header "0xf03c" to the front of RTP payload osmo_iuup_cn_tx_payload: strip AMR header (2 bytes) from the front of RTP payload Change-Id: I244c4c4778798912c818812a15709695d3251f87 --- M src/libosmo-mgcp/iuup_cn_node.c M tests/iuup/iuup_test.c M tests/iuup/iuup_test.ok 3 files changed, 17 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/90/12390/1 diff --git a/src/libosmo-mgcp/iuup_cn_node.c b/src/libosmo-mgcp/iuup_cn_node.c index f555e36..fda7a7a 100644 --- a/src/libosmo-mgcp/iuup_cn_node.c +++ b/src/libosmo-mgcp/iuup_cn_node.c @@ -85,10 +85,12 @@ struct osmo_iuup_hdr_data *hdr) { /* Remove the IuUP bit from the middle of the buffer by writing the RTP header forward. */ + /* And append AMR 12.2k header "0xf03c". - AD HOC fix */ unsigned int pre_hdr_len = ((uint8_t*)hdr) - pdu->data; - memmove(pdu->data + sizeof(*hdr), pdu->data, pre_hdr_len); - - msgb_pull(pdu, sizeof(*hdr)); + memmove(pdu->data + sizeof(*hdr) - 2, pdu->data, pre_hdr_len); + ((uint8_t*)hdr)[2] = 0xf0; + ((uint8_t*)hdr)[3] = 0x3c; + msgb_pull(pdu, sizeof(*hdr) - 2); LOGP(DIUUP, LOGL_DEBUG, "(%s) IuUP stripping IuUP header from RTP data\n", cn->name); cn->cfg.rx_payload(pdu, cn->cfg.node_priv); @@ -191,7 +193,8 @@ rtp_was = (void*)pdu->data; /* copy the RTP header part backwards by the size needed for the IuUP header */ - rtp = (void*)msgb_push(pdu, sizeof(*iuup_hdr)); + /* also strips 2 bytes from the front of RTP payload - AMR header - AD HOC fix */ + rtp = (void*)msgb_push(pdu, sizeof(*iuup_hdr) - 2); memmove(rtp, rtp_was, sizeof(*rtp)); /* Send the same payload type to the peer (erm...) */ diff --git a/tests/iuup/iuup_test.c b/tests/iuup/iuup_test.c index 8d96f06..e6f2ca5 100644 --- a/tests/iuup/iuup_test.c +++ b/tests/iuup/iuup_test.c @@ -111,7 +111,7 @@ #define RTP_PAYLOAD "6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0" printf("\nReceive payload encapsulated in IuUP. Expecting rx_payload() of just RTP packet\n"); printf("i.e. should strip away " IUUP_HEADER "\n"); - expect_rx_payload = RTP_HEADER RTP_PAYLOAD; + expect_rx_payload = RTP_HEADER "f03c" RTP_PAYLOAD; rx_pdu(cn, msgb_from_hex("IuUP-Data", RTP_HEADER IUUP_HEADER RTP_PAYLOAD)); @@ -119,18 +119,18 @@ printf("\nTransmit RTP. Expecting tx_msg() with inserted IuUP header\n"); expect_tx_msg = RTP_HEADER "000002b3" RTP_PAYLOAD; tx_payload(cn, - msgb_from_hex("RTP data", RTP_HEADER RTP_PAYLOAD)); + msgb_from_hex("RTP data", RTP_HEADER "f03c" RTP_PAYLOAD)); printf("\nMore RTP, each time the Frame Nr advances, causing a new header CRC.\n"); expect_tx_msg = RTP_HEADER "0100e2b3" RTP_PAYLOAD; tx_payload(cn, - msgb_from_hex("RTP data", RTP_HEADER RTP_PAYLOAD)); + msgb_from_hex("RTP data", RTP_HEADER "f03c" RTP_PAYLOAD)); expect_tx_msg = RTP_HEADER "02007eb3" RTP_PAYLOAD; tx_payload(cn, - msgb_from_hex("RTP data", RTP_HEADER RTP_PAYLOAD)); + msgb_from_hex("RTP data", RTP_HEADER "f03c" RTP_PAYLOAD)); expect_tx_msg = RTP_HEADER "03009eb3" RTP_PAYLOAD; tx_payload(cn, - msgb_from_hex("RTP data", RTP_HEADER RTP_PAYLOAD)); + msgb_from_hex("RTP data", RTP_HEADER "f03c" RTP_PAYLOAD)); printf("All done.\n"); } diff --git a/tests/iuup/iuup_test.ok b/tests/iuup/iuup_test.ok index 2b09c66..8c473d6 100644 --- a/tests/iuup/iuup_test.ok +++ b/tests/iuup/iuup_test.ok @@ -15,14 +15,14 @@ 8060944c6256042c000101020100e2b36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 rx_payload() invoked by iuup_cn! [IuUP] -RTP-> -8060944c6256042c000101026cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 node_priv=0x2342 ok: matches expected msg rc=0 Transmit RTP. Expecting tx_msg() with inserted IuUP header [IuUP] <-RTP- -8060944c6256042c000101026cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 tx_msg() invoked by iuup_cn! <-PDU- [IuUP] 8060944c6256042c00010102000002b36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 @@ -32,7 +32,7 @@ More RTP, each time the Frame Nr advances, causing a new header CRC. [IuUP] <-RTP- -8060944c6256042c000101026cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 tx_msg() invoked by iuup_cn! <-PDU- [IuUP] 8060944c6256042c000101020100e2b36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 @@ -40,7 +40,7 @@ ok: matches expected msg rc=0 [IuUP] <-RTP- -8060944c6256042c000101026cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 tx_msg() invoked by iuup_cn! <-PDU- [IuUP] 8060944c6256042c0001010202007eb36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 @@ -48,7 +48,7 @@ ok: matches expected msg rc=0 [IuUP] <-RTP- -8060944c6256042c000101026cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 tx_msg() invoked by iuup_cn! <-PDU- [IuUP] 8060944c6256042c0001010203009eb36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 -- To view, visit https://gerrit.osmocom.org/12390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: neels/iuup Gerrit-MessageType: newchange Gerrit-Change-Id: I244c4c4778798912c818812a15709695d3251f87 Gerrit-Change-Number: 12390 Gerrit-PatchSet: 1 Gerrit-Owner: Mykola Shchetinin -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 07:05:04 2018 From: gerrit-no-reply at lists.osmocom.org (Mykola Shchetinin) Date: Thu, 20 Dec 2018 07:05:04 +0000 Subject: Change in osmo-mgw[neels/iuup]: iuup_cn_node.c: make it work for AMR 12.2k codec In-Reply-To: References: Message-ID: Mykola Shchetinin has posted comments on this change. ( https://gerrit.osmocom.org/12390 ) Change subject: iuup_cn_node.c: make it work for AMR 12.2k codec ...................................................................... Patch Set 1: I've uploaded the commit to gerrit as it seems that I am not allowed to create new branches. -- To view, visit https://gerrit.osmocom.org/12390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: neels/iuup Gerrit-MessageType: comment Gerrit-Change-Id: I244c4c4778798912c818812a15709695d3251f87 Gerrit-Change-Number: 12390 Gerrit-PatchSet: 1 Gerrit-Owner: Mykola Shchetinin Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Mykola Shchetinin Gerrit-Comment-Date: Thu, 20 Dec 2018 07:05:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 08:02:09 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 20 Dec 2018 08:02:09 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/12369 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 1: (1 comment) > Build Successful > > https://jenkins.osmocom.org/jenkins/job/gerrit-libosmocore/1353/ : > SUCCESS' --verified 1 --code-review 0 https://gerrit.osmocom.org/#/c/12369/1/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/12369/1/include/osmocom/gsm/gsm0808.h at a160 PS1, Line 160: > Is this bit then set by the user of the API? If there's users using this API, we should modify them [?] The bit is set by the API user. Probably its best to ask neels, he designed this part of the API. I just modeled the API of the handover performed message after what was already there. (I still don't get whats the problem here.) -- To view, visit https://gerrit.osmocom.org/12369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2958a8613627c4e54c004ffa3578c300ed0360b Gerrit-Change-Number: 12369 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 20 Dec 2018 08:02:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 09:47:48 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 09:47:48 +0000 Subject: Change in libosmocore[master]: TLV: add convenience function for 1-byte values In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12373 to look at the new patch set (#3). Change subject: TLV: add convenience function for 1-byte values ...................................................................... TLV: add convenience function for 1-byte values Similar to existing 16 and 32 bit value helpers but simpler because we don't have to worry about alingment and endianness. Change-Id: Ic0a148bd04b8860e321f509fdcd913f688c8e920 --- M include/osmocom/gsm/tlv.h 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/12373/3 -- To view, visit https://gerrit.osmocom.org/12373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic0a148bd04b8860e321f509fdcd913f688c8e920 Gerrit-Change-Number: 12373 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 09:51:02 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 09:51:02 +0000 Subject: Change in libosmocore[master]: Use define for key buffers In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12381 ) Change subject: Use define for key buffers ...................................................................... Use define for key buffers Add corresponding spec. references and comments where appropriate. Change-Id: If5e2aad86eaecd8eada667b3488ba415d81c6312 --- M include/osmocom/crypt/auth.h M src/gsm/auth_core.c M tests/auth/milenage_test.c 3 files changed, 9 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/crypt/auth.h b/include/osmocom/crypt/auth.h index e544126..c653b61 100644 --- a/include/osmocom/crypt/auth.h +++ b/include/osmocom/crypt/auth.h @@ -42,7 +42,7 @@ union { struct { uint8_t opc[16]; /*!< operator invariant value */ - uint8_t k[16]; /*!< secret key of the subscriber */ + uint8_t k[OSMO_A5_MAX_KEY_LEN_BYTES]; /*!< secret key of the subscriber */ uint8_t amf[2]; uint64_t sqn; /*!< sequence number (in: prev sqn; out: used sqn) */ int opc_is_op; /*!< is the OPC field OPC (0) or OP (1) ? */ @@ -60,8 +60,8 @@ struct osmo_auth_vector { uint8_t rand[16]; /*!< random challenge */ uint8_t autn[16]; /*!< authentication nonce */ - uint8_t ck[16]; /*!< ciphering key */ - uint8_t ik[16]; /*!< integrity key */ + uint8_t ck[OSMO_A5_MAX_KEY_LEN_BYTES]; /*!< ciphering key */ + uint8_t ik[OSMO_A5_MAX_KEY_LEN_BYTES]; /*!< integrity key */ uint8_t res[16]; /*!< authentication result */ uint8_t res_len; /*!< length (in bytes) of res */ uint8_t kc[8]; /*!< Kc for GSM encryption (A5) */ diff --git a/src/gsm/auth_core.c b/src/gsm/auth_core.c index f171ed4..9e750a0 100644 --- a/src/gsm/auth_core.c +++ b/src/gsm/auth_core.c @@ -98,7 +98,7 @@ return 0; } -/* C5 function to derive UMTS IK from GSM Kc */ +/* 3GPP TS 33.102 ?6.8.2.3 C5 function to derive UMTS IK from GSM Kc */ static inline void c5_function(uint8_t *ik, const uint8_t *kc) { unsigned int i; @@ -110,7 +110,7 @@ ik[i] = ik[i-12]; } -/* C4 function to derive UMTS CK from GSM Kc */ +/* 3GPP TS 33.102 ?6.8.2.3 C4 function to derive UMTS CK from GSM Kc */ void osmo_c4(uint8_t *ck, const uint8_t *kc) { memcpy(ck, kc, 8); diff --git a/tests/auth/milenage_test.c b/tests/auth/milenage_test.c index 2bd3cf2..8b058e5 100644 --- a/tests/auth/milenage_test.c +++ b/tests/auth/milenage_test.c @@ -23,7 +23,10 @@ if (vec->auth_types & OSMO_AUTH_TYPE_GSM) { printf("SRES:\t%s\n", osmo_hexdump(vec->sres, sizeof(vec->sres))); - printf("Kc:\t%s\n", osmo_hexdump(vec->kc, sizeof(vec->kc))); + /* According to 3GPP TS 55.205 Sec. 4 the GSM-MILENAGE output is limited to 64 bits. + According to 3GPP TS 33.102 Annex. B5 in UMTS security context Kc can be 128 bits. + Here we test the former, so make sure we only print interesting Kc bits. */ + printf("Kc:\t%s\n", osmo_hexdump(vec->kc, OSMO_A5_MAX_KEY_LEN_BYTES/2)); } } -- To view, visit https://gerrit.osmocom.org/12381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If5e2aad86eaecd8eada667b3488ba415d81c6312 Gerrit-Change-Number: 12381 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 09:52:12 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 09:52:12 +0000 Subject: Change in libosmocore[master]: TLV: add convenience function for 1-byte values In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12373 ) Change subject: TLV: add convenience function for 1-byte values ...................................................................... Patch Set 3: Code-Review+2 > Patch Set 2: Code-Review-1 > > (1 comment) Fixed. -- To view, visit https://gerrit.osmocom.org/12373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0a148bd04b8860e321f509fdcd913f688c8e920 Gerrit-Change-Number: 12373 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 09:52:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 09:52:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 09:52:15 +0000 Subject: Change in libosmocore[master]: TLV: fix doc copy-paste error In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12372 ) Change subject: TLV: fix doc copy-paste error ...................................................................... TLV: fix doc copy-paste error Change-Id: I8aa79cab7505585de00ee2aaae125462108906e8 --- M include/osmocom/gsm/tlv.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index 51bedd6..4c39264 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -489,7 +489,7 @@ * \param[in] _tp pointer to \ref tlv_parsed. * \param[in] tag IE tag to return. * \param[in] min_len Minimum value length in bytes. - * \returns struct tlv_p_entry pointer, or NULL if not present or too short. + * \returns const uint8_t pointer to value, or NULL if not present or too short. */ #define TLVP_VAL_MINLEN(_tp, tag, min_len) \ (TLVP_PRES_LEN(_tp, tag, min_len)? (_tp)->lv[tag].val : NULL) -- To view, visit https://gerrit.osmocom.org/12372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8aa79cab7505585de00ee2aaae125462108906e8 Gerrit-Change-Number: 12372 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 09:52:16 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 09:52:16 +0000 Subject: Change in libosmocore[master]: TLV: add convenience function for 1-byte values In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12373 ) Change subject: TLV: add convenience function for 1-byte values ...................................................................... TLV: add convenience function for 1-byte values Similar to existing 16 and 32 bit value helpers but simpler because we don't have to worry about alingment and endianness. Change-Id: Ic0a148bd04b8860e321f509fdcd913f688c8e920 --- M include/osmocom/gsm/tlv.h 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Max: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index 4c39264..d0c9552 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -495,6 +495,22 @@ (TLVP_PRES_LEN(_tp, tag, min_len)? (_tp)->lv[tag].val : NULL) +/*! Obtain 1-byte TLV element. + * \param[in] tp pointer to \ref tlv_parsed + * \param[in] tag the Tag to look for + * \param[in] default_val default value to use if tag not available + * \returns the 1st byte of value with a given tag or default_val if tag was not found + */ +static inline uint8_t tlvp_val8(const struct tlv_parsed *tp, uint8_t tag, uint8_t default_val) +{ + const uint8_t *res = TLVP_VAL_MINLEN(tp, tag, 1); + + if (res) + return res[0]; + + return default_val; +} + /*! Align given TLV element with 16 bit value to an even address * \param[in] tp pointer to \ref tlv_parsed * \param[in] pos element to return -- To view, visit https://gerrit.osmocom.org/12373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic0a148bd04b8860e321f509fdcd913f688c8e920 Gerrit-Change-Number: 12373 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 09:52:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 09:52:55 +0000 Subject: Change in libosmocore[master]: LCLS: enc/dec entire parameter set instead of GCR In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12371 ) Change subject: LCLS: enc/dec entire parameter set instead of GCR ...................................................................... Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icfbb2404e1a1d500243e2071173299b557369335 Gerrit-Change-Number: 12371 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 20 Dec 2018 09:52:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 10:13:17 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 10:13:17 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12357 ) Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client.c File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client.c at 833 PS3, Line 833: LOGP(DLMGCP, LOGL_ERROR, "MGCP endpoint exceeds maximum length ('" RTPBRIDGE_WILDCARD_FMT "')\n", Better say what is the expected max length in the log message. -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 10:13:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 10:17:27 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 10:17:27 +0000 Subject: Change in osmo-msc[master]: libmsc/VTY: introduce kill-switch for routing SMS over GSUP In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11918 ) Change subject: libmsc/VTY: introduce kill-switch for routing SMS over GSUP ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie57685ed2ce1e4c978e775b68fdffe58de44882b Gerrit-Change-Number: 11918 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 10:17:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 10:24:48 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 10:24:48 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12369 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 6: Ok, I've split API-change into separate patch from behavior fix. Hopefully this will make review easier. -- To view, visit https://gerrit.osmocom.org/12369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2958a8613627c4e54c004ffa3578c300ed0360b Gerrit-Change-Number: 12369 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 20 Dec 2018 10:24:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 10:27:32 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 10:27:32 +0000 Subject: Change in libosmocore[master]: LCLS: don't encode incorrect values In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12375 to look at the new patch set (#2). Change subject: LCLS: don't encode incorrect values ...................................................................... LCLS: don't encode incorrect values Change-Id: I9ac4bae75f5796e6e11346b8cb34d3897ae70b59 --- M src/gsm/gsm0808.c 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/12375/2 -- To view, visit https://gerrit.osmocom.org/12375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9ac4bae75f5796e6e11346b8cb34d3897ae70b59 Gerrit-Change-Number: 12375 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 10:57:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 10:57:41 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12377 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2dc3a2896b133298cbf850d68e6898300884bbce Gerrit-Change-Number: 12377 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 20 Dec 2018 10:57:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:01:22 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:01:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add a test for LU with invalid LAI In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12380 ) Change subject: add a test for LU with invalid LAI ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12380/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/12380/1/msc/MSC_Tests.ttcn at 2839 PS1, Line 2839: f_enc_mcc_mnc > This function is private in BSSMAP_Templates. [?] Sorry, I forgot to 'git add' another file. https://gerrit.osmocom.org/#/c/12380/1/msc/MSC_Tests.ttcn at 2844 PS1, Line 2844: tr_ML3_MT_LU_Rej > Should we expect any particular reject cause? I don't know which cause would be appropriate per the spec. osmo-msc sends reject cause '16'O, which maps to GSM48_REJECT_MSC_TMP_NOT_REACHABLE. Should we check just for this one or allow a few additional causes? -- To view, visit https://gerrit.osmocom.org/12380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1 Gerrit-Change-Number: 12380 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 11:01:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:02:06 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:02:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add a test for LU with invalid LAI In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12380 to look at the new patch set (#2). Change subject: add a test for LU with invalid LAI ...................................................................... add a test for LU with invalid LAI Verify that the MSC rejects a location update with a LAI that contains a PLMN which does not match the network's PLMN. Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1 Related: OS#3162 --- M library/BSSMAP_Templates.ttcn M msc/MSC_Tests.cfg M msc/MSC_Tests.ttcn M msc/expected-results.xml 4 files changed, 37 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/12380/2 -- To view, visit https://gerrit.osmocom.org/12380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1 Gerrit-Change-Number: 12380 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:06:10 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:06:10 +0000 Subject: Change in osmo-bsc[master]: LCLS: log config/control update In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12366 ) Change subject: LCLS: log config/control update ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iac493014144ca0e5e1a83081e6e01ea7910deac2 Gerrit-Change-Number: 12366 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 11:06:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:08:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:08:41 +0000 Subject: Change in libosmocore[master]: tests/gsm0808: use new msgb comparison API In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: tests/gsm0808: use new msgb comparison API ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12271/3/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12271/3/tests/gsm0808/gsm0808_test.c at 45 PS3, Line 45: To avoid unintended side-effects from indentation without braces, this macro should be wrapped in do { ... } while (0); like EXPECTED_ENCODED above. Or just make this a proper function... -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 20 Dec 2018 11:08:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:15:35 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:15:35 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12377 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2dc3a2896b133298cbf850d68e6898300884bbce Gerrit-Change-Number: 12377 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:15:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:16:43 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:16:43 +0000 Subject: Change in osmo-bsc[master]: LCLS: use enum values instead of magic numbers In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12378 ) Change subject: LCLS: use enum values instead of magic numbers ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f49f74edb5400df1b13bb75da3d524f234c8d03 Gerrit-Change-Number: 12378 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:16:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:16:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Dec 2018 11:16:48 +0000 Subject: Change in libosmocore[master]: LCLS: use proper types for value_string wrappers In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12367 ) Change subject: LCLS: use proper types for value_string wrappers ...................................................................... Patch Set 2: When changing APIs, please provide information on when where they added and if a release was already done with previous version of the API. Also, did you make sure all users of this API in all osmocom repositories build fine with this file applied to libosmocore? I can image the compiler warning/erroring because you pass a uint8_t to an enum param. -- To view, visit https://gerrit.osmocom.org/12367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0f47a610e06ac99bd60a5aad6f50f3658480165e Gerrit-Change-Number: 12367 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 20 Dec 2018 11:16:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:18:14 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:18:14 +0000 Subject: Change in libosmocore[master]: LCLS: don't encode incorrect values In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12375 ) Change subject: LCLS: don't encode incorrect values ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9ac4bae75f5796e6e11346b8cb34d3897ae70b59 Gerrit-Change-Number: 12375 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 20 Dec 2018 11:18:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:20:11 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:20:11 +0000 Subject: Change in libosmocore[master]: LCLS: fix LCLS-CONNECT-CONTROL encoder In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12376 ) Change subject: LCLS: fix LCLS-CONNECT-CONTROL encoder ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b33a771acbd391c5f9a494d6450edb18511433f Gerrit-Change-Number: 12376 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:20:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:21:25 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:21:25 +0000 Subject: Change in libosmocore[master]: LCLS: use proper types for value_string wrappers In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12367 ) Change subject: LCLS: use proper types for value_string wrappers ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0f47a610e06ac99bd60a5aad6f50f3658480165e Gerrit-Change-Number: 12367 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:21:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:27:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Dec 2018 11:27:02 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12377 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 5: Code-Review-1 This is still an API change because the boolean struct field is not used anymore, which means the way you are expected to use the API changed. Please again, provide information on when was this API added in order to see if it's worth changing it. -- To view, visit https://gerrit.osmocom.org/12377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2dc3a2896b133298cbf850d68e6898300884bbce Gerrit-Change-Number: 12377 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:27:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:28:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Dec 2018 11:28:36 +0000 Subject: Change in libosmocore[master]: tests/gsm0808: use new msgb comparison API In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: tests/gsm0808: use new msgb comparison API ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12271/3/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12271/3/tests/gsm0808/gsm0808_test.c at 45 PS3, Line 45: > To avoid unintended side-effects from indentation without braces, this macro should be wrapped in do [?] agree -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 20 Dec 2018 11:28:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:28:39 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 11:28:39 +0000 Subject: Change in libosmo-sccp[master]: fix ipa_asp_fsm down state transition In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12364 ) Change subject: fix ipa_asp_fsm down state transition ...................................................................... Patch Set 1: Code-Review-1 (3 comments) Being unfamiliar with the code helps to highlight things which makes review difficult :) https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c File src/xua_asp_fsm.c: https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c at 920 PS1, Line 920: { So the only use of fi is to get *priv? Than better just pass struct ipa_asp_fsm_priv *iafp as parameter and let caller take care of fi-priv. This function have nothing to do with osmo_fsm_inst so it's better if this is immediately obvious when you look at type signature, which you're effectively changing compared to ipa_asp_fsm_cleanup() anyway. https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c at 939 PS1, Line 939: osmo_timer_del(&iafp->pong_timer); I don't understand how it works if we bail out before reaching here. Does pong_timer kept forever? Or it's removed by some other code? Please double-check and clarify in a comment or commit message. https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c at 1060 PS1, Line 1060: ipa_asp_fsm_del_route(fi); I'd rather see ipa_asp_fsm_cleanup() moved in place of ipa_asp_fsm_del_route() instead of keeping it as this wrapper. If we ever have to change ipa_asp_fsm_del_route() in a way which requires updating its callees than this wrapper is unnecessary indirection which makes it less trivial than it should be. Even in this commit you've de-facto dropped unused cause parameter but because of this indirection it's unclear which parts of the code are affected. -- To view, visit https://gerrit.osmocom.org/12364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Gerrit-Change-Number: 12364 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 20 Dec 2018 11:28:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:28:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:28:44 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11919 ) Change subject: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/#/c/11919/2/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/11919/2/src/libmsc/gsm_04_11.c at 674 PS2, Line 674: > Yep, I expected this question. The main idea is that some [?] I agree that if { } else { } would be better. We shouldn't let code quality suffer just because code we write is supposed to be temporary. -- To view, visit https://gerrit.osmocom.org/11919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8 Gerrit-Change-Number: 11919 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:28:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:31:04 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 11:31:04 +0000 Subject: Change in osmo-bsc[master]: LCLS: log config/control update In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12366 ) Change subject: LCLS: log config/control update ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iac493014144ca0e5e1a83081e6e01ea7910deac2 Gerrit-Change-Number: 12366 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 11:31:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:31:05 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 11:31:05 +0000 Subject: Change in osmo-bsc[master]: LCLS: log config/control update In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12366 ) Change subject: LCLS: log config/control update ...................................................................... LCLS: log config/control update Change-Id: Iac493014144ca0e5e1a83081e6e01ea7910deac2 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Max: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 622611d..26b3244 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -169,13 +169,17 @@ if (!lcls_is_supported_config(new_cfg_csc->config)) return NULL; if (conn->lcls.config != new_cfg_csc->config) { - /* TODO: logging */ + LOGPFSM(conn->lcls.fi, "LCLS update Config %s -> %s\n", + gsm0808_lcls_config_name(conn->lcls.config), + gsm0808_lcls_config_name(new_cfg_csc->config)); conn->lcls.config = new_cfg_csc->config; } } if (new_cfg_csc->control != GSM0808_LCLS_CSC_NA) { if (conn->lcls.control != new_cfg_csc->control) { - /* TODO: logging */ + LOGPFSM(conn->lcls.fi, "LCLS update Control %s -> %s\n", + gsm0808_lcls_control_name(conn->lcls.control), + gsm0808_lcls_control_name(new_cfg_csc->control)); conn->lcls.control = new_cfg_csc->control; } } -- To view, visit https://gerrit.osmocom.org/12366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iac493014144ca0e5e1a83081e6e01ea7910deac2 Gerrit-Change-Number: 12366 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:35:22 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:35:22 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11920 ) Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... Patch Set 8: (3 comments) https://gerrit.osmocom.org/#/c/11920/8/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/11920/8/src/libmsc/gsm_04_11.c at 802 PS8, Line 802: goto sms_over_gsup; Could put this right here on this line: return gsm411_gsup_mt_fwd_sm_res(trans, rph->msg_ref); Instead of using 'goto'. https://gerrit.osmocom.org/#/c/11920/8/src/libmsc/gsm_04_11.c at 825 PS8, Line 825: return gsm411_gsup_mt_fwd_sm_res(trans, rph->msg_ref); And then we could remove this part. https://gerrit.osmocom.org/#/c/11920/8/src/libmsc/gsm_04_11.c at 845 PS8, Line 845: goto sms_over_gsup; Same here, just use the patern if (..) return foo(); -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:35:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:35:53 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:35:53 +0000 Subject: Change in osmo-msc[master]: libmsc/VTY: introduce kill-switch for routing SMS over GSUP In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11918 ) Change subject: libmsc/VTY: introduce kill-switch for routing SMS over GSUP ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie57685ed2ce1e4c978e775b68fdffe58de44882b Gerrit-Change-Number: 11918 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 11:35:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:42:45 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 11:42:45 +0000 Subject: Change in libosmo-sccp[master]: fix ipa_asp_fsm down state transition In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12364 ) Change subject: fix ipa_asp_fsm down state transition ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c File src/xua_asp_fsm.c: https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c at 920 PS1, Line 920: { > So the only use of fi is to get *priv? Than better just pass struct ipa_asp_fsm_priv *iafp as parame [?] Hmm, yes, good suggestion. https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c at 939 PS1, Line 939: osmo_timer_del(&iafp->pong_timer); > I don't understand how it works if we bail out before reaching here. [?] This timer is actually never scheduled as far as I can see. And indeed it is bogus that we won't delete it if returning early. But note that this bug is part of code I merely moved around, so I'd rather fix it in a separate patch. https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c at 1060 PS1, Line 1060: ipa_asp_fsm_del_route(fi); > I'd rather see ipa_asp_fsm_cleanup() moved in place of ipa_asp_fsm_del_route() instead of keeping it [?] In an earlier version of this patch I just called ipa_asp_fsm_cleanup() from ipa_asp_fsm_active(). What made me uncomfortable about that is that it looks like this cleanup handler is supposed to be invoked by the generic FSM code, not from within the FSM itself. It just so happens that we need to run the same code when the FSM terminates and when we transition ACTIVE->DOWN. I don't really care though because both approaches work. Would you prefer to call ipa_asp_fsm_cleanup() from ipa_asp_fsm_active()? -- To view, visit https://gerrit.osmocom.org/12364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Gerrit-Change-Number: 12364 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 11:42:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:52:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Dec 2018 11:52:11 +0000 Subject: Change in osmo-bsc[master]: make sure early lchan act failure resets the lchan In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12388 ) Change subject: make sure early lchan act failure resets the lchan ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/12388/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/12388/1/include/osmocom/bsc/gsm_data.h at 516 PS1, Line 516: struct gsm_lchan *re_use_mgw_endpoint_from_lchan; While at it, it would be great if you could please document better some of these fields. This one for instance I didn't exactly understand. From field name it actually looks like it should be a bool ;) Feel free to provide descriptions or renames in follow-up changes if you prefer. https://gerrit.osmocom.org/#/c/12388/1/src/osmo-bsc/lchan_fsm.c File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/#/c/12388/1/src/osmo-bsc/lchan_fsm.c at 536 PS1, Line 536: /* From lchan_reset(): Where is lchan_reset() called? please provide that info in this line. (I know it's a cpy-paste from previous position, maybe a follow-up patch?). https://gerrit.osmocom.org/#/c/12388/1/src/osmo-bsc/lchan_fsm.c at 569 PS1, Line 569: use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); where does this line come from? I don't see it in the previous block (previous commit file state <-). -- To view, visit https://gerrit.osmocom.org/12388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ide665b10fa3f4583059c55346db8da833959e3cc Gerrit-Change-Number: 12388 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 20 Dec 2018 11:52:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 11:53:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Dec 2018 11:53:05 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 11:53:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 12:01:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 12:01:54 +0000 Subject: Change in libosmo-sccp[master]: fix ipa_asp_fsm down state transition In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12364 ) Change subject: fix ipa_asp_fsm down state transition ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c File src/xua_asp_fsm.c: https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c at 939 PS1, Line 939: osmo_timer_del(&iafp->pong_timer); > This timer is actually never scheduled as far as I can see. [?] Sure, simple /* FIXME: ... */ will do as well. https://gerrit.osmocom.org/#/c/12364/1/src/xua_asp_fsm.c at 1060 PS1, Line 1060: ipa_asp_fsm_del_route(fi); > In an earlier version of this patch I just called ipa_asp_fsm_cleanup() from ipa_asp_fsm_active(). [?] Ah, now I see. Than your variant with separate function and wrapper is better indeed. I still would prefer not to pass fi to ipa_asp_fsm_del_route() to make the distinction between fsm-specific part and generic cleanup more obvious. -- To view, visit https://gerrit.osmocom.org/12364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Gerrit-Change-Number: 12364 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 12:01:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 12:09:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 12:09:24 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 4: Code-Review-1 Please see: https://gerrit.osmocom.org/#/c/osmo-msc/+/12387/ -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 12:09:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 13:01:02 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 20 Dec 2018 13:01:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12391 Change subject: BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL ...................................................................... BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL Usually the MS power is controlled by the BTS and there is no continou supervison by the BSC needed. However, a scheme where the BSC takes care of the power control loop exists. The power is then set via RSL using an RSL MS POWER CONTROL message. This tests establishes a dchan and then sends MS POWER CONTROL messages with differen power levels and then checks the presence of the power level set in the MS POWER LEVEL field of the SACCH L1 header. Change-Id: I82b04a3bf94d355175f7f6ff3fdc43672e8080a2 Related: OS#1622 --- M bts/BTS_Tests.ttcn M bts/expected-results.xml M library/RSL_Types.ttcn 3 files changed, 84 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/12391/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 753d89b..5f8885f 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1502,6 +1502,76 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +/* establish DChan, and send MS POWER CONTROL messages via RSL, verify that + * the BTS is forwarding those values to the MS via the SACCH L1 header. */ +function f_tc_rsl_ms_pwr_ctrl(charstring id) runs on ConnHdlr { + var L1ctlDlMessage l1_dl; + var RSL_IE_MS_Power ms_power; + var RSL_Message rsl; + var uint5_t power_level := 0; + + f_l1_tune(L1CTL); + RSL.clear; + + f_est_dchan(); + + ms_power.reserved := 0; + ms_power.fpc_epc := false; + + /* Send the first power control command. This will disable any BTS/TRX + * internal power control and switch the MS (which is not in scope of + * this test) to a constant power level. We start with a power level + * of 0 */ + ms_power.power_level := power_level; + rsl := valueof(ts_RSL_MS_PWR_CTRL(g_chan_nr, ms_power)); + RSL.send(rsl); + + alt { + + /* Pick all SACCH blocks for checking */ + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { + + /* The first byte of the L1 header contains the power level. + * The reserved bits and the fpc bit is set to 0, so we may + * compare directly. */ + if (not (l1_dl.payload.data_ind.payload[0] == int2oct(power_level, 1))) { + setverdict(fail, "Power level in L1 header does not match the signaled (RSL) power level."); + } + + /* Signal a new power level via RSL for the next turn. */ + if (power_level < 31) { + power_level := power_level + 1; + ms_power.power_level := power_level; + rsl := valueof(ts_RSL_MS_PWR_CTRL(g_chan_nr, ms_power)); + RSL.send(rsl); + repeat; + } + + } + + /* Ignore all other blocks */ + [] L1CTL.receive { repeat; } + + } + + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + + setverdict(pass); +} + +testcase TC_rsl_ms_pwr_ctrl() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + f_init(testcasename()); + + for (var integer tn := 1; tn <= 4; tn := tn+1) { + pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN)); + vc_conn := f_start_handler(refers(f_tc_rsl_ms_pwr_ctrl), pars); + vc_conn.done; + } + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} /* Test if a channel without valid uplink bursts generates RSL CONN FAIL IND (TS 48.058 4.10) */ private function f_TC_conn_fail_crit(charstring id) runs on ConnHdlr { @@ -4164,6 +4234,7 @@ execute( TC_meas_res_sign_sdcch4() ); execute( TC_meas_res_sign_sdcch8() ); execute( TC_meas_res_sign_tchh_toa256() ); + execute( TC_rsl_ms_pwr_ctrl() ); execute( TC_conn_fail_crit() ); execute( TC_paging_imsi_80percent() ); execute( TC_paging_tmsi_80percent() ); diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 73de1fb..bad4d6f 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -17,6 +17,7 @@ + diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index cd4ba58..3b1a311 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -1318,6 +1318,18 @@ } } + /* 8.4.15: BTS <- BSC */ + template (value) RSL_Message ts_RSL_MS_PWR_CTRL(template (value) RslChannelNr chan_nr, + template (value) RSL_IE_MS_Power ms_power) := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false), + msg_type := RSL_MT_MS_POWER_CONTROL, + ies := { + t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), + t_RSL_IE(RSL_IE_MS_POWER, RSL_IE_Body:{ms_power := ms_power}) + /* One optional IE: MS POWER PARAMETERS */ + } + } + /* 8.4.19 BTS -> BSC */ template (value) RSL_Message ts_RSL_RF_CHAN_REL_ACK(template (value) RslChannelNr chan_nr) := ts_RSL_MsgDiscType(ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false), -- To view, visit https://gerrit.osmocom.org/12391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I82b04a3bf94d355175f7f6ff3fdc43672e8080a2 Gerrit-Change-Number: 12391 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 14:34:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 14:34:41 +0000 Subject: Change in libosmocore[master]: utils: drop redundant _SOURCES entries Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12392 Change subject: utils: drop redundant _SOURCES entries ...................................................................... utils: drop redundant _SOURCES entries Automake use the .c file corresponding to the program name automatically, there's no need to use _SOURCES unless they have multiple files in them. Change-Id: Ia0374e2d38e6bdc416eec182030af94b89d65ab7 --- M utils/Makefile.am 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/92/12392/1 diff --git a/utils/Makefile.am b/utils/Makefile.am index fb79190..c3d174d 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -7,11 +7,6 @@ bin_PROGRAMS = osmo-arfcn osmo-auc-gen osmo-config-merge -osmo_arfcn_SOURCES = osmo-arfcn.c - -osmo_auc_gen_SOURCES = osmo-auc-gen.c - -osmo_config_merge_SOURCES = osmo-config-merge.c osmo_config_merge_LDADD = $(LDADD) $(TALLOC_LIBS) osmo_config_merge_CFLAGS = $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/12392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0374e2d38e6bdc416eec182030af94b89d65ab7 Gerrit-Change-Number: 12392 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 14:39:09 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 14:39:09 +0000 Subject: Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12387 ) Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section ...................................................................... Patch Set 1: Please update expected VTY test output as well. -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 14:39:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 14:40:03 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 14:40:03 +0000 Subject: Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12387 ) Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section ...................................................................... Patch Set 1: Also please add this to the log msg: Related: OS#3355 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 14:40:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 14:40:40 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 14:40:40 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 4: > Patch Set 4: Code-Review-1 > > Please see: https://gerrit.osmocom.org/#/c/osmo-msc/+/12387/ OK we discussed this internally and I'll update this patch. Thanks. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 14:40:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 14:42:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Dec 2018 14:42:15 +0000 Subject: Change in libosmocore[master]: utils: drop redundant _SOURCES entries In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12392 ) Change subject: utils: drop redundant _SOURCES entries ...................................................................... Patch Set 1: Code-Review-1 I still prefer having them listed explicitly, it clearer and easier to find which kind of binaries are built by looking at the Makefile.am. -- To view, visit https://gerrit.osmocom.org/12392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0374e2d38e6bdc416eec182030af94b89d65ab7 Gerrit-Change-Number: 12392 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 20 Dec 2018 14:42:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 14:48:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 14:48:21 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12243 to look at the new patch set (#5). Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... make gsup ipa name configurable in osmo-sgsn.cfg Add a 'gsup ipa-name' VTY command which overrides the default IPA name used by the SGSN on the GSUP link towards the HLR. This is required for GSUP routing in multi-SGSN networks. The 'gsup ipa-name' option can only be set via the config file because changing the IPA name at run-time conflicts with active GSUP connections and routes configured in the HLR. The osmo-sgsn program must be restarted if its IPA name needs to change. Related: OS#3356 Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_subscriber.c M src/gprs/sgsn_vty.c 3 files changed, 36 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/12243/5 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:00:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 15:00:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12346 ) Change subject: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher ...................................................................... Patch Set 1: > Patch Set 1: > > > Patch Set 1: Code-Review+1 > > > > Did some tests fail because of this? > > Not sure. I found the issue by code inspection. This tests is failing on Jenkins and it seems to be related to not cleaning up the connection: 04:43:31.397996 596 - Removing unterminated connection between port GSUP and MSC_Test-GSUP(594):GSUP_CLIENT. 04:43:31.398018 588 BSSMAP_Emulation.ttcn:390 Dynamic test case error: Sending data on the connection of port CLIENT to 596:BSSAP failed. (Broken pipe) 04:43:31.398043 596 - Message with id 2 was extracted from the queue of GSUP. 04:43:31.398053 588 BSSMAP_Emulation.ttcn:390 setverdict(error): none -> error -- To view, visit https://gerrit.osmocom.org/12346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706 Gerrit-Change-Number: 12346 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 15:00:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:06:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 15:06:57 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12243 to look at the new patch set (#6). Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... make gsup ipa name configurable in osmo-sgsn.cfg Add a 'gsup ipa-name' VTY command which overrides the default IPA name used by the SGSN on the GSUP link towards the HLR. This is required for GSUP routing in multi-SGSN networks. The 'gsup ipa-name' option can only be set via the config file because changing the IPA name at run-time conflicts with active GSUP connections and routes configured in the HLR. The osmo-sgsn program must be restarted if its IPA name needs to change. Related: OS#3356 Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_subscriber.c M src/gprs/sgsn_vty.c 3 files changed, 37 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/12243/6 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:07:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 15:07:37 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 5: (3 comments) https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c at 181 PS5, Line 181: ipa-name Missing "gsup" prefix. Maybe rather place it together with other GSUP parameters? https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c at 1084 PS5, Line 1084: Other DEFUNs are using a single tab here as far as I can see. https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c at 1092 PS5, Line 1092: return CMD_WARNING; Could we just warn user that this change has no effect until restart? Or would it break anything at run-time? -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 15:07:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:08:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 15:08:25 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 6: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 15:08:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:10:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 15:10:15 +0000 Subject: Change in libosmocore[master]: tests/gsm0808: use new msgb comparison API In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#4) to the change originally created by Max. ( https://gerrit.osmocom.org/12271 ) Change subject: tests/gsm0808: use new msgb comparison API ...................................................................... tests/gsm0808: use new msgb comparison API Since I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5, we have some helpers to compare certain msgb layer to a given buffer. Let's change 'VERIFY' macro to use msgb_eq_l3_data_print(). Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b --- M tests/gsm0808/gsm0808_test.c 1 file changed, 4 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/12271/4 -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: fixeria -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:10:54 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 15:10:54 +0000 Subject: Change in libosmocore[master]: tests/gsm0808: use new msgb comparison API In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: tests/gsm0808: use new msgb comparison API ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12271/3/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12271/3/tests/gsm0808/gsm0808_test.c at 45 PS3, Line 45: > To avoid unintended side-effects from indentation without braces, this macro should be wrapped in do [?] Done, thanks! -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 20 Dec 2018 15:10:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:11:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 15:11:52 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 6: (2 comments) https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c at 181 PS5, Line 181: ipa-name > Missing "gsup" prefix. [?] Ooops, thanks nice catch. https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c at 1092 PS5, Line 1092: "It can only be se > Could we just warn user that this change has no effect until restart? [?] Please read the long discussion above before adding further input to this topic. -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 15:11:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:13:12 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 15:13:12 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12243 to look at the new patch set (#7). Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... make gsup ipa name configurable in osmo-sgsn.cfg Add a 'gsup ipa-name' VTY command which overrides the default IPA name used by the SGSN on the GSUP link towards the HLR. This is required for GSUP routing in multi-SGSN networks. The 'gsup ipa-name' option can only be set via the config file because changing the IPA name at run-time conflicts with active GSUP connections and routes configured in the HLR. The osmo-sgsn program must be restarted if its IPA name needs to change. Related: OS#3356 Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_subscriber.c M src/gprs/sgsn_vty.c 3 files changed, 36 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/12243/7 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 20 15:13:37 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 20 Dec 2018 15:13:37 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-asn1c_=C2=BB_a1=3Ddefault,?= =?UTF-8?Q?a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#345?= In-Reply-To: <1867477161.73.1545232207343.JavaMail.jenkins@jenkins.osmocom.org> References: <1867477161.73.1545232207343.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <420120245.115.1545318817926.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:14:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Dec 2018 15:14:25 +0000 Subject: Change in libosmocore[master]: tests/gsm0808: use new msgb comparison API In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: tests/gsm0808: use new msgb comparison API ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 20 Dec 2018 15:14:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:15:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 15:15:20 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/12243/5/src/gprs/sgsn_vty.c at 1092 PS5, Line 1092: return CMD_WARNING; > Please read the long discussion above before adding further input to this topic. It seems to be kinda hidden in later patch sets :( See https://gerrit.osmocom.org/c/osmo-sgsn/+/12243/3/src/gprs/sgsn_vty.c#1195 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 15:15:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:22:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 15:22:12 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 7: Code-Review+1 Ok, fine for me now :) -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 15:22:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:23:49 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 15:23:49 +0000 Subject: Change in libosmo-sccp[master]: fix ipa_asp_fsm down state transition In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12364 to look at the new patch set (#2). Change subject: fix ipa_asp_fsm down state transition ...................................................................... fix ipa_asp_fsm down state transition Properly transition into IPA_ASP_S_DOWN from IPA_ASP_S_ACTIVE and fix the mask of legal out states from IPA_ASP_S_ACTIVE. BSC-sccplite tests are still passing with this change. Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Related: OS#3111 --- M src/xua_asp_fsm.c 1 file changed, 27 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/12364/2 -- To view, visit https://gerrit.osmocom.org/12364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Gerrit-Change-Number: 12364 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:31:39 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 15:31:39 +0000 Subject: Change in osmo-sysmon[master]: Move shared libs into common LDADD Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12393 Change subject: Move shared libs into common LDADD ...................................................................... Move shared libs into common LDADD Change-Id: I8b2f2cd60426cf3b52dd463959a48fd7619cfcce --- M src/Makefile.am 1 file changed, 3 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/93/12393/1 diff --git a/src/Makefile.am b/src/Makefile.am index 9ad5947..412337b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,5 @@ +LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + AM_CPPFLAGS = \ $(all_includes) \ -I$(top_srcdir) \ @@ -20,9 +22,7 @@ osmo-ctrl-client \ $(NULL) -osmo_sysmon_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ +osmo_sysmon_LDADD = $(LDADD) \ $(LIBOSMOVTY_LIBS) \ $(LIBMNL_LIBS) \ $(NULL) @@ -37,11 +37,6 @@ osysmon_main.c \ $(NULL) -osmo_ctrl_client_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - osmo_ctrl_client_SOURCES = \ simple_ctrl.c \ osmo-ctrl-client.c \ -- To view, visit https://gerrit.osmocom.org/12393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8b2f2cd60426cf3b52dd463959a48fd7619cfcce Gerrit-Change-Number: 12393 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:31:58 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 15:31:58 +0000 Subject: Change in osmo-sysmon[master]: ctrl: pass config struct to all simple_ctrl_*() In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/12317 ) Change subject: ctrl: pass config struct to all simple_ctrl_*() ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I783dda27dfc5fd57401d971b2e970ede0efc7b2c Gerrit-Change-Number: 12317 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:37:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 15:37:11 +0000 Subject: Change in osmo-sysmon[master]: ctrl: separate config structure In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12316 ) Change subject: ctrl: separate config structure ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Gerrit-Change-Number: 12316 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 15:37:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:37:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 15:37:15 +0000 Subject: Change in osmo-sysmon[master]: ctrl: log host/port on errors In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12318 ) Change subject: ctrl: log host/port on errors ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Gerrit-Change-Number: 12318 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 15:37:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:39:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Dec 2018 15:39:28 +0000 Subject: Change in osmo-sysmon[master]: Move shared libs into common LDADD In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12393 ) Change subject: Move shared libs into common LDADD ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8b2f2cd60426cf3b52dd463959a48fd7619cfcce Gerrit-Change-Number: 12393 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 20 Dec 2018 15:39:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:42:19 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 15:42:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Tear down all RTP flows to avoid race condition on tear down In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12297 ) Change subject: mgw: Tear down all RTP flows to avoid race condition on tear down ...................................................................... Patch Set 1: (1 comment) Maybe move it to separate func or comment extensively? https://gerrit.osmocom.org/#/c/12297/1/mgw/MGCP_Test.ttcn File mgw/MGCP_Test.ttcn: https://gerrit.osmocom.org/#/c/12297/1/mgw/MGCP_Test.ttcn at 1215 PS1, Line 1215: f_rtpem_mode(RTPEM[2], RTPEM_MODE_NONE); I'm kinda confused by this: why do we have to do this for RTPEM[2] but not for 0 and 1? And where do we call f_flow_delete(RTPEM[2])? -- To view, visit https://gerrit.osmocom.org/12297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ied839596589609e75fa487046a85db48991e4c73 Gerrit-Change-Number: 12297 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 20 Dec 2018 15:42:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:43:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 15:43:49 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 15:43:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:45:29 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 15:45:29 +0000 Subject: Change in libosmo-sccp[master]: fix ipa_asp_fsm down state transition In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12364 ) Change subject: fix ipa_asp_fsm down state transition ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Gerrit-Change-Number: 12364 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 15:45:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:45:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Dec 2018 15:45:34 +0000 Subject: Change in osmo-sysmon[master]: ctrl: log host/port on errors In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12318 ) Change subject: ctrl: log host/port on errors ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12318/2/src/osysmon_ctrl.c File src/osysmon_ctrl.c: https://gerrit.osmocom.org/#/c/12318/2/src/osysmon_ctrl.c at 25 PS2, Line 25: #include Why is this one needed? Doesn't seem related to the patch. https://gerrit.osmocom.org/#/c/12318/2/src/simple_ctrl.c File src/simple_ctrl.c: https://gerrit.osmocom.org/#/c/12318/2/src/simple_ctrl.c at 53 PS2, Line 53: static void ctrl_cfg_printf(const struct ctrl_cfg *cfg, const char *fmt, ...) Having this instead of a macro looks overkill to me, but fine. -- To view, visit https://gerrit.osmocom.org/12318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Gerrit-Change-Number: 12318 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 15:45:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:46:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 20 Dec 2018 15:46:49 +0000 Subject: Change in libosmocore[master]: tests/gsm0808: use new msgb comparison API In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: tests/gsm0808: use new msgb comparison API ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 20 Dec 2018 15:46:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:48:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 20 Dec 2018 15:48:15 +0000 Subject: Change in osmo-sysmon[master]: ctrl: separate config structure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12316 ) Change subject: ctrl: separate config structure ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12316/2/src/osysmon_ctrl.c File src/osysmon_ctrl.c: https://gerrit.osmocom.org/#/c/12316/2/src/osysmon_ctrl.c at 41 PS2, Line 41: struct ctrl_cfg *cfg; Do we really need a pointer allocated by talloc here? and an alloc function? just to have 2 strings and one int, all this seems overengineered to me. What's the benefit from previous code? Just move the struct to the shared header, that's all needed right? -- To view, visit https://gerrit.osmocom.org/12316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Gerrit-Change-Number: 12316 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 15:48:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:58:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 15:58:34 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11919 to look at the new patch set (#9). Change subject: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP ...................................................................... libmsc/gsm_04_11.c: forward MO SMS messages over GSUP Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8 Depends-on: (core) Ic37f3b2114b8095cfce22977e67133b9103942e3 Depends-on: (core) Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Depends-on: (OsmoHLR) I0589ff27933e9bca2bcf93b8259004935778db8f Related Change-Id: (TTCN) I7abc95b8e416f7308d54e11be11c08586d18e6c5 Related Change-Id: (TTCN) Id14bbd8bd51558cdacefea0fe042769cd69ed5c8 Related: OS#3587 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/gsm_04_11.h A include/osmocom/msc/gsm_04_11_gsup.h M src/libmsc/Makefile.am M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_11.c A src/libmsc/gsm_04_11_gsup.c 7 files changed, 249 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/19/11919/9 -- To view, visit https://gerrit.osmocom.org/11919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8 Gerrit-Change-Number: 11919 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:58:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 15:58:34 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11920 to look at the new patch set (#9). Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... libmsc/gsm_04_11.c: accept MT SMS messages over GSUP Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Depends-on: (core) Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Depends-on: (OsmoHLR) I0589ff27933e9bca2bcf93b8259004935778db8f Related Change-Id: (TTCN) I63a25c8366cce0852df6b628365151661a22a25f Related: OS#3587 --- M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/gsm_04_11_gsup.h M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_11_gsup.c 5 files changed, 174 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/11920/9 -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 15:59:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 15:59:38 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11919 ) Change subject: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11919/2/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/11919/2/src/libmsc/gsm_04_11.c at 674 PS2, Line 674: if (trans->net->enable_sms_over_gsup) > I agree that if { } else { } would be better. [?] Done -- To view, visit https://gerrit.osmocom.org/11919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8 Gerrit-Change-Number: 11919 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 15:59:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 16:00:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 16:00:25 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11920 ) Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... Patch Set 8: (3 comments) https://gerrit.osmocom.org/#/c/11920/8/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/11920/8/src/libmsc/gsm_04_11.c at 802 PS8, Line 802: goto sms_over_gsup; > Could put this right here on this line: return gsm411_gsup_mt_fwd_sm_res(trans, rph->msg_ref); [?] Done https://gerrit.osmocom.org/#/c/11920/8/src/libmsc/gsm_04_11.c at 825 PS8, Line 825: return gsm411_gsup_mt_fwd_sm_res(trans, rph->msg_ref); > And then we could remove this part. Done https://gerrit.osmocom.org/#/c/11920/8/src/libmsc/gsm_04_11.c at 845 PS8, Line 845: goto sms_over_gsup; > Same here, just use the patern if (.. [?] Done -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 8 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 16:00:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 16:07:39 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 16:07:39 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11919 ) Change subject: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP ...................................................................... Patch Set 9: > Build Failed > > Exception: Result mismatch: > Cannot find line ' mgw endpoint-range <1-65534> <1-65534> Hmm, interesting... Let's try to rebase. I20e37c5228928b67e67f16aef0eb2930d21ef60a should solve the problem. -- To view, visit https://gerrit.osmocom.org/11919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8 Gerrit-Change-Number: 11919 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 16:07:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 17:06:05 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 17:06:05 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 20 Dec 2018 17:06:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 17:06:06 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 17:06:06 +0000 Subject: Change in osmo-sgsn[master]: make gsup ipa name configurable in osmo-sgsn.cfg In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/12243 ) Change subject: make gsup ipa name configurable in osmo-sgsn.cfg ...................................................................... make gsup ipa name configurable in osmo-sgsn.cfg Add a 'gsup ipa-name' VTY command which overrides the default IPA name used by the SGSN on the GSUP link towards the HLR. This is required for GSUP routing in multi-SGSN networks. The 'gsup ipa-name' option can only be set via the config file because changing the IPA name at run-time conflicts with active GSUP connections and routes configured in the HLR. The osmo-sgsn program must be restarted if its IPA name needs to change. Related: OS#3356 Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f --- M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_subscriber.c M src/gprs/sgsn_vty.c 3 files changed, 36 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Max: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, approved diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 3a34ff9..c80355d 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -124,6 +124,12 @@ enum ranap_nsap_addr_enc rab_assign_addr_enc; } iu; #endif + + /* This is transmitted as IPA Serial Number tag, which is used for GSUP routing (e.g. in OsmoHLR). + * This name must be set in a multi-SGSN network, and it must be unique to each SGSN. + * If no name is set, the IPA Serial Number will be the same as the Unit Name, + * and will be of the form 'SGSN-00-00-00-00-00-00' */ + char *sgsn_ipa_name; }; struct sgsn_instance { diff --git a/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c index 4ab45c2..484c7ef 100644 --- a/src/gprs/gprs_subscriber.c +++ b/src/gprs/gprs_subscriber.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -63,15 +64,20 @@ int gprs_subscr_init(struct sgsn_instance *sgi) { const char *addr_str; + struct ipaccess_unit *ipa_dev; if (!sgi->cfg.gsup_server_addr.sin_addr.s_addr) return 0; addr_str = inet_ntoa(sgi->cfg.gsup_server_addr.sin_addr); - sgi->gsup_client = osmo_gsup_client_create( + ipa_dev = talloc_zero(sgi, struct ipaccess_unit); + ipa_dev->unit_name = "SGSN"; + ipa_dev->serno = sgi->cfg.sgsn_ipa_name; /* NULL unless configured via VTY */ + + sgi->gsup_client = osmo_gsup_client_create2( sgi, - "SGSN", + ipa_dev, addr_str, sgi->cfg.gsup_server_port, &gsup_read_cb, &sgi->cfg.oap); diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 601b3c5..3757c07 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -203,6 +203,8 @@ vty_out(vty, " encryption %s%s", get_value_string(gprs_cipher_names, g_cfg->cipher), VTY_NEWLINE); + if (g_cfg->sgsn_ipa_name) + vty_out(vty, " gsup ipa-name %s%s", g_cfg->sgsn_ipa_name, VTY_NEWLINE); if (g_cfg->gsup_server_addr.sin_addr.s_addr) vty_out(vty, " gsup remote-ip %s%s", inet_ntoa(g_cfg->gsup_server_addr.sin_addr), VTY_NEWLINE); @@ -1075,6 +1077,25 @@ return CMD_SUCCESS; } +DEFUN(cfg_gsup_ipa_name, + cfg_gsup_ipa_name_cmd, + "gsup ipa-name NAME", + "GSUP Parameters\n" + "Set the IPA name of this SGSN\n" + "A unique name for this SGSN. For example: PLMN + redundancy server number: SGSN-901-70-0. " + "This name is used for GSUP routing and must be set if more than one SGSN is connected to the network. " + "The default is 'SGSN-00-00-00-00-00-00'.\n") +{ + if (vty->type != VTY_FILE) { + vty_out(vty, "The IPA name cannot be changed at run-time; " + "It can only be set in the configuraton file.%s", VTY_NEWLINE); + return CMD_WARNING; + } + + g_cfg->sgsn_ipa_name = talloc_strdup(tall_vty_ctx, argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_gsup_remote_ip, cfg_gsup_remote_ip_cmd, "gsup remote-ip A.B.C.D", "GSUP Parameters\n" @@ -1365,6 +1386,7 @@ install_element(SGSN_NODE, &cfg_imsi_acl_cmd); install_element(SGSN_NODE, &cfg_auth_policy_cmd); install_element(SGSN_NODE, &cfg_encrypt_cmd); + install_element(SGSN_NODE, &cfg_gsup_ipa_name_cmd); install_element(SGSN_NODE, &cfg_gsup_remote_ip_cmd); install_element(SGSN_NODE, &cfg_gsup_remote_port_cmd); install_element(SGSN_NODE, &cfg_gsup_oap_id_cmd); -- To view, visit https://gerrit.osmocom.org/12243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f Gerrit-Change-Number: 12243 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 17:09:08 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 17:09:08 +0000 Subject: Change in libosmocore[master]: tests/gsm0808: use new msgb comparison API In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12271 ) Change subject: tests/gsm0808: use new msgb comparison API ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 20 Dec 2018 17:09:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 17:16:25 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 17:16:25 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12357 ) Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client.c File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client.c at 709 PS3, Line 709: sizeof(mgcp->actual.endpoint_domain_name)); Check for truncation and log a warning if name is truncated? Or perhaps even error out because truncation of multiple names risks duplicates? if (strlcpy(pname, dir, sizeof(pname)) >= sizeof(pname)) goto toolong; http://man.openbsd.org/strlcpy#EXAMPLES https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client_vty.c File src/libosmo-mgcp-client/mgcp_client_vty.c: https://gerrit.osmocom.org/#/c/12357/3/src/libosmo-mgcp-client/mgcp_client_vty.c at 147 PS3, Line 147: sizeof(global_mgcp_client_conf->endpoint_domain_name)); Truncation check? -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 17:16:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 17:22:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 20 Dec 2018 17:22:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Tear down all RTP flows to avoid race condition on tear down In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12297 ) Change subject: mgw: Tear down all RTP flows to avoid race condition on tear down ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12297/1/mgw/MGCP_Test.ttcn File mgw/MGCP_Test.ttcn: https://gerrit.osmocom.org/#/c/12297/1/mgw/MGCP_Test.ttcn at 1215 PS1, Line 1215: f_rtpem_mode(RTPEM[2], RTPEM_MODE_NONE); > I'm kinda confused by this: why do we have to do this for RTPEM[2] but not for 0 and 1? And where do [?] It is done for RTPEM[0] and RTPEM[1], inside f_flow_delete(). -- To view, visit https://gerrit.osmocom.org/12297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ied839596589609e75fa487046a85db48991e4c73 Gerrit-Change-Number: 12297 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 20 Dec 2018 17:22:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 22:31:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Dec 2018 22:31:23 +0000 Subject: Change in libosmocore[master]: define LOGPFSM fmt only once, in LOGPFSMLSRC In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12383 ) Change subject: define LOGPFSM fmt only once, in LOGPFSMLSRC ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12383/1/include/osmocom/core/fsm.h File include/osmocom/core/fsm.h: https://gerrit.osmocom.org/#/c/12383/1/include/osmocom/core/fsm.h at 122 PS1, Line 122: LOGPFSML > Maybe rather place it between LOGPFSMLSRC and LOGPFSM? [?] i chose this order: most-explicit first, most-implicit last, and each one followed by its *SRC version. Whichever way you choose, something will look out of order. -- To view, visit https://gerrit.osmocom.org/12383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f23c57ebfdb5355919c06ac5ded7732e3b17a97 Gerrit-Change-Number: 12383 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 22:31:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 22:40:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Dec 2018 22:40:57 +0000 Subject: Change in libosmocore[master]: LOGPFSM*: guard against fi == NULL In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12385 ) Change subject: LOGPFSM*: guard against fi == NULL ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12385/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12385/1//COMMIT_MSG at 9 PS1, Line 9: they should guard against a NULL > Any reasons why should we tolerate NULL? We have various places where an FSM instance is only allocated if something starts, like lchan->fi or assignment->fi etc. If we put some LOGPFSM() using that ->fi pointer that happens to still be NULL, it's more stable to log "NULL" instead of segfault straight away. So if anyone anywhere doesn't pay attention about an unpopulated ->fi, we introduce program crashes. This patch generally avoids those, and if someone cares enough they can fix the NULL logging later. -- To view, visit https://gerrit.osmocom.org/12385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9eaf8b7e2cf1e450ae626cb2fc928862008f6233 Gerrit-Change-Number: 12385 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 22:40:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 22:42:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Dec 2018 22:42:21 +0000 Subject: Change in libosmocore[master]: add LOGPFSMSL(), LOGPFSMSLSRC() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12386 ) Change subject: add LOGPFSMSL(), LOGPFSMSLSRC() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12386/1/include/osmocom/core/fsm.h File include/osmocom/core/fsm.h: https://gerrit.osmocom.org/#/c/12386/1/include/osmocom/core/fsm.h at 122 PS1, Line 122: /*! Log using FSM instance's context, on explicit logging subsystem and level. > Same comments apply here. Both macros depend on other macros, [?] "string format" fixed, others discussed in first patch -- To view, visit https://gerrit.osmocom.org/12386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11b182a03f5ecb6df7cd8f260757d3626c8e945d Gerrit-Change-Number: 12386 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 22:42:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 22:43:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Dec 2018 22:43:28 +0000 Subject: Change in libosmocore[master]: add API doc for LOGPFSM* macros In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12384 ) Change subject: add API doc for LOGPFSM* macros ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12384/1/include/osmocom/core/fsm.h File include/osmocom/core/fsm.h: https://gerrit.osmocom.org/#/c/12384/1/include/osmocom/core/fsm.h at 123 PS1, Line 123: osmo_fsm_inst > \ref I'm personally no fan of \ref or \a or such things in API doc. For me it's fine to have a doxygen generated html that someone may read (though I don't know who). But IMHO it's not worth it to break the flow of normal C-file API reading. I know laforge says he's not even seeing those \refs anymore. But for me they are quite distracting ... I just want to write and read English with names; can't doxygen figure out on its own which of the words are references? -- To view, visit https://gerrit.osmocom.org/12384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bf6500889aa58195f50a726dec0876c0c2baec3 Gerrit-Change-Number: 12384 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 20 Dec 2018 22:43:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 22:43:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Dec 2018 22:43:50 +0000 Subject: Change in libosmocore[master]: add API doc for LOGPFSM* macros In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12384 to look at the new patch set (#2). Change subject: add API doc for LOGPFSM* macros ...................................................................... add API doc for LOGPFSM* macros Change-Id: I3bf6500889aa58195f50a726dec0876c0c2baec3 --- M include/osmocom/core/fsm.h 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/12384/2 -- To view, visit https://gerrit.osmocom.org/12384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3bf6500889aa58195f50a726dec0876c0c2baec3 Gerrit-Change-Number: 12384 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 22:43:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 20 Dec 2018 22:43:50 +0000 Subject: Change in libosmocore[master]: add LOGPFSMSL(), LOGPFSMSLSRC() In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12386 to look at the new patch set (#2). Change subject: add LOGPFSMSL(), LOGPFSMSLSRC() ...................................................................... add LOGPFSMSL(), LOGPFSMSLSRC() Using an FSM instace's logging context is very useful. Sometimes it makes sense to log something on a different logging category than the FSM definition's default category. For example, an MSC conn has aspects concerning MM, CC, RR, MGCP, ..., and currently all of those log on DMM. This came up in I358cfbaf0f44f25148e8b9bafcb9257b1952b35a, where I want to log an MGCP event using a ran_conn context, and used the conn->fi->id. That of course omits context like the current conn FSM state... I remember at least one other place where I recently added logging using some fi->id as context, so it might turn out useful in various places. Change-Id: I11b182a03f5ecb6df7cd8f260757d3626c8e945d --- M include/osmocom/core/fsm.h 1 file changed, 30 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/12386/2 -- To view, visit https://gerrit.osmocom.org/12386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I11b182a03f5ecb6df7cd8f260757d3626c8e945d Gerrit-Change-Number: 12386 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 23:56:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 23:56:10 +0000 Subject: Change in gr-gsm[master]: trx/txtime_setter: print error if reference fn is missing Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12395 Change subject: trx/txtime_setter: print error if reference fn is missing ...................................................................... trx/txtime_setter: print error if reference fn is missing Change-Id: I2a6e3f41b6fe79b92d85ff98bc2cd9afd9bdc568 --- M lib/transmitter/txtime_setter_impl.cc 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/95/12395/1 diff --git a/lib/transmitter/txtime_setter_impl.cc b/lib/transmitter/txtime_setter_impl.cc index 50092f4..9f3a24d 100644 --- a/lib/transmitter/txtime_setter_impl.cc +++ b/lib/transmitter/txtime_setter_impl.cc @@ -116,9 +116,6 @@ void txtime_setter_impl::process_txtime_of_burst(pmt::pmt_t msg_in) { - if (d_fn_ref == UNKNOWN_FN) - return; - pmt::pmt_t blob = pmt::cdr(msg_in); // Extract GSMTAP header from message @@ -126,6 +123,13 @@ uint32_t frame_nr = be32toh(header->frame_number); uint32_t ts_num = header->timeslot; + if (d_fn_ref == UNKNOWN_FN) { + std::cout << "Missing reference TDMA frame number, dropping " + << format("burst (fn=%u, tn=%u)", frame_nr, ts_num) + << std::endl; + return; + } + time_format txtime = fn_time_delta_cpp(d_fn_ref, d_time_ref, frame_nr, d_time_hint, ts_num, d_ts_ref); -- To view, visit https://gerrit.osmocom.org/12395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2a6e3f41b6fe79b92d85ff98bc2cd9afd9bdc568 Gerrit-Change-Number: 12395 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 20 23:56:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 20 Dec 2018 23:56:08 +0000 Subject: Change in gr-gsm[master]: trx/txtime_setter: reduce code nesting in process_txtime_of_burst() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12394 Change subject: trx/txtime_setter: reduce code nesting in process_txtime_of_burst() ...................................................................... trx/txtime_setter: reduce code nesting in process_txtime_of_burst() Change-Id: I5c334e16d6b28a5e32cd62a177ad56bfc8e748ee --- M lib/transmitter/txtime_setter_impl.cc 1 file changed, 39 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/94/12394/1 diff --git a/lib/transmitter/txtime_setter_impl.cc b/lib/transmitter/txtime_setter_impl.cc index 3c07cc6..50092f4 100644 --- a/lib/transmitter/txtime_setter_impl.cc +++ b/lib/transmitter/txtime_setter_impl.cc @@ -116,52 +116,52 @@ void txtime_setter_impl::process_txtime_of_burst(pmt::pmt_t msg_in) { - if (d_fn_ref != UNKNOWN_FN) - { - pmt::pmt_t blob = pmt::cdr(msg_in); + if (d_fn_ref == UNKNOWN_FN) + return; - // Extract GSMTAP header from message - gsmtap_hdr *header = (gsmtap_hdr *) pmt::blob_data(blob); - uint32_t frame_nr = be32toh(header->frame_number); - uint32_t ts_num = header->timeslot; + pmt::pmt_t blob = pmt::cdr(msg_in); - time_format txtime = fn_time_delta_cpp(d_fn_ref, d_time_ref, - frame_nr, d_time_hint, ts_num, d_ts_ref); + // Extract GSMTAP header from message + gsmtap_hdr *header = (gsmtap_hdr *) pmt::blob_data(blob); + uint32_t frame_nr = be32toh(header->frame_number); + uint32_t ts_num = header->timeslot; - time_spec_t txtime_spec = time_spec_t(txtime.first, txtime.second); - txtime_spec -= d_delay_correction; - txtime_spec -= d_timing_advance; + time_format txtime = fn_time_delta_cpp(d_fn_ref, d_time_ref, + frame_nr, d_time_hint, ts_num, d_ts_ref); - time_spec_t current_time_estimate = time_spec_t(d_time_hint.first, d_time_hint.second); + time_spec_t txtime_spec = time_spec_t(txtime.first, txtime.second); + txtime_spec -= d_delay_correction; + txtime_spec -= d_timing_advance; - if (txtime_spec <= current_time_estimate) { // Drop too late bursts - std::cout << "lB" << std::flush; - } else if (txtime_spec > current_time_estimate + MAX_EARLY_TIME_DIFF) { // Drop too early bursts - std::cout << "eB" << std::flush; //TODO: too early condition might happen when changing BTSes. - //Wrong fn_time is applied to new or old bursts in such situation. - //This solution is not perfect as MS might be blocked upto - //MAX_EARLY_TIME_DIFF seconds. - //Better solution would be to indentify fn_time and burst coming - //from given BTS (i.e. based on ARFCN) and dropping bursts for which - //the bts_id doesn't match with bts_id of fn_time. - } else { //process bursts that are in the right time-frame - pmt::pmt_t tags_dict = pmt::dict_add( - pmt::make_dict(), - pmt::intern("tx_time"), - pmt::make_tuple( - pmt::from_uint64(txtime_spec.get_full_secs()), - pmt::from_double(txtime_spec.get_frac_secs())) - ); + time_spec_t current_time_estimate = time_spec_t(d_time_hint.first, d_time_hint.second); - tags_dict = pmt::dict_add(tags_dict, - pmt::intern("fn"), pmt::from_uint64(frame_nr)); - tags_dict = pmt::dict_add(tags_dict, - pmt::intern("ts"), pmt::from_uint64(ts_num)); + if (txtime_spec <= current_time_estimate) { // Drop too late bursts + std::cout << "lB" << std::flush; + } else if (txtime_spec > current_time_estimate + MAX_EARLY_TIME_DIFF) { // Drop too early bursts + std::cout << "eB" << std::flush; //TODO: too early condition might happen when changing BTSes. + //Wrong fn_time is applied to new or old bursts in such situation. + //This solution is not perfect as MS might be blocked upto + //MAX_EARLY_TIME_DIFF seconds. + //Better solution would be to indentify fn_time and burst coming + //from given BTS (i.e. based on ARFCN) and dropping bursts for which + //the bts_id doesn't match with bts_id of fn_time. + } else { //process bursts that are in the right time-frame + pmt::pmt_t tags_dict = pmt::dict_add( + pmt::make_dict(), + pmt::intern("tx_time"), + pmt::make_tuple( + pmt::from_uint64(txtime_spec.get_full_secs()), + pmt::from_double(txtime_spec.get_frac_secs())) + ); - // Send a message to the output - pmt::pmt_t msg_out = pmt::cons(tags_dict, pmt::cdr(msg_in)); - message_port_pub(pmt::mp("bursts_out"), msg_out); - } + tags_dict = pmt::dict_add(tags_dict, + pmt::intern("fn"), pmt::from_uint64(frame_nr)); + tags_dict = pmt::dict_add(tags_dict, + pmt::intern("ts"), pmt::from_uint64(ts_num)); + + // Send a message to the output + pmt::pmt_t msg_out = pmt::cons(tags_dict, pmt::cdr(msg_in)); + message_port_pub(pmt::mp("bursts_out"), msg_out); } } -- To view, visit https://gerrit.osmocom.org/12394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5c334e16d6b28a5e32cd62a177ad56bfc8e748ee Gerrit-Change-Number: 12394 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 00:51:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 00:51:37 +0000 Subject: Change in osmo-msc[master]: cosmetics in msc_mgcp_call_release() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12396 Change subject: cosmetics in msc_mgcp_call_release() ...................................................................... cosmetics in msc_mgcp_call_release() Use local variables instead of writing trans->conn-> all the time. Cosmetic preparation for I1f8746e7babfcd3028a4d2c0ba260c608c686c76 and I0ba216b737909e92080a722db26e3577726c63cb/ Change-Id: I99717b3b72a9d7cbc95455ea25b2018ec1755308 --- M src/libmsc/msc_mgcp.c 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/96/12396/1 diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 71f36b3..6170c10 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -1143,26 +1143,29 @@ int msc_mgcp_call_release(struct gsm_trans *trans) { struct mgcp_ctx *mgcp_ctx; + struct ran_conn *conn = trans->conn; OSMO_ASSERT(trans); - if (!trans->conn) { + if (!conn) { LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) invalid conn, call release failed\n", vlr_subscr_name(trans->vsub)); return -EINVAL; } - if (!trans->conn->rtp.mgcp_ctx) { + mgcp_ctx = conn->rtp.mgcp_ctx; + if (!mgcp_ctx) { LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) invalid mgcp context, call release failed.\n", vlr_subscr_name(trans->vsub)); return -EINVAL; } - if (!trans->conn->rtp.mgcp_ctx->fsm) { + if (!mgcp_ctx->fsm) { LOGP(DMGCP, LOGL_ERROR, "(subscriber:%s) no FSM, call release failed\n", vlr_subscr_name(trans->vsub)); return -EINVAL; } - mgcp_ctx = trans->conn->rtp.mgcp_ctx; + LOGP(DMGCP, LOGL_DEBUG, "(ti %02x %s) Call release: tearing down MGW endpoint\n", + trans->transaction_id, vlr_subscr_name(trans->vsub)); /* Inform the FSM that as soon as it reaches ST_HALT it may free * all context information immediately */ @@ -1176,10 +1179,7 @@ * overwriting the context pointer with NULL. The FSM will now * take care for a graceful shutdown and when done it will free * all related context information */ - trans->conn->rtp.mgcp_ctx = NULL; - - LOGP(DMGCP, LOGL_DEBUG, "(subscriber:%s) call release initiated\n", - vlr_subscr_name(trans->vsub)); + conn->rtp.mgcp_ctx = NULL; return 0; } -- To view, visit https://gerrit.osmocom.org/12396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I99717b3b72a9d7cbc95455ea25b2018ec1755308 Gerrit-Change-Number: 12396 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 00:51:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 00:51:38 +0000 Subject: Change in osmo-msc[master]: release RTP stream only for matching CC transaction Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12397 Change subject: release RTP stream only for matching CC transaction ...................................................................... release RTP stream only for matching CC transaction Do not break the currently ongoing call when rejecting a second incoming caller. There may be multiple (up to seven) simultaneous CC transactions, and there is one mgcp_ctx for the currently active RTP stream. Release the MGCP context only when the active CC transaction is releasing. Before this patch, any CC transaction release would destroy the single MGCP context, possibly breaking the currently ongoing call (another CC trans). This also fixes a possible use-after-free if there were pending MGCP message responses for the MGCP context; they are canceled properly for a released transaction, but since one transaction would free the other transaction's MGCP state, the clean up did not take place and possibly caused an mgcp client response handling to access a freed mgcp_ctx. Related: OS#3735 Change-Id: I1f8746e7babfcd3028a4d2c0ba260c608c686c76 --- M src/libmsc/msc_mgcp.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/97/12397/1 diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 6170c10..23e68e7 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -1164,6 +1164,12 @@ return -EINVAL; } + if (mgcp_ctx->trans != trans) { + LOGP(DMGCP, LOGL_DEBUG, "(ti %02x %s) call release for background CC transaction\n", + trans->transaction_id, vlr_subscr_name(trans->vsub)); + return 0; + } + LOGP(DMGCP, LOGL_DEBUG, "(ti %02x %s) Call release: tearing down MGW endpoint\n", trans->transaction_id, vlr_subscr_name(trans->vsub)); -- To view, visit https://gerrit.osmocom.org/12397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1f8746e7babfcd3028a4d2c0ba260c608c686c76 Gerrit-Change-Number: 12397 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 00:51:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 00:51:35 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12368 to look at the new patch set (#5). Change subject: abort assignment on Assignment Failure ...................................................................... abort assignment on Assignment Failure If Assignment fails in the BSC, trigger an EV_TEARDOWN_ERROR in the mgcp_ctx FSM instance, so that the call gets torn down immediately. Before this, the non-call would idle around without anything happening. Related: OS#3236 Depends: I11b182a03f5ecb6df7cd8f260757d3626c8e945d (libosmocore) Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a --- M include/osmocom/msc/msc_mgcp.h M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 3 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/68/12368/5 -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 00:51:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 00:51:40 +0000 Subject: Change in osmo-msc[master]: move trans->assignment_done to cc.assignment_started Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12399 Change subject: move trans->assignment_done to cc.assignment_started ...................................................................... move trans->assignment_done to cc.assignment_started The flag is set to true when an assignment has been started, and it is only relevant for a CC transaction. So fix naming and place in cc struct. Cosmetic preparation for I1f8746e7babfcd3028a4d2c0ba260c608c686c76 and I0ba216b737909e92080a722db26e3577726c63cb/ Change-Id: I8dacf46141ba0b664e85b0867ade330c97d8495f --- M include/osmocom/msc/transaction.h M src/libmsc/msc_mgcp.c 2 files changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/99/12399/1 diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 0760c07..74eaf60 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -52,9 +52,6 @@ /* bearer capabilities (rate and codec) */ struct gsm_mncc_bearer_cap bearer_cap; - /* status of the assignment, true when done */ - bool assignment_done; - /* if true, TCH_RTP_CREATE is sent after the * assignment is done */ bool tch_rtp_create; @@ -71,6 +68,7 @@ struct osmo_timer_list timer; struct osmo_timer_list timer_guard; struct gsm_mncc msg; /* stores setup/disconnect/release message */ + bool assignment_started; } cc; struct { struct gsm411_smc_inst smc_inst; diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 5a8ee79..8e2e7a9 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -951,7 +951,7 @@ .event_names = msc_mgcp_fsm_evt_names, }; -/* Try to invoke call assignment and set trans->assignment_done flag if invoked. +/* Try to invoke call assignment and set trans->cc.assignment_started flag if invoked. * This is relevant for already ongoing calls -- scenario: * - subscriber is in an active voice call, * - another call is coming in. @@ -960,10 +960,10 @@ int msc_mgcp_try_call_assignment(struct gsm_trans *trans) { struct ran_conn *conn = trans->conn; - if (trans->assignment_done) + if (trans->cc.assignment_started) return 0; LOGPFSMSL(conn->fi, DMGCP, LOGL_INFO, "Starting call assignment\n"); - trans->assignment_done = true; + trans->cc.assignment_started = true; return msc_mgcp_call_assignment(trans); } -- To view, visit https://gerrit.osmocom.org/12399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8dacf46141ba0b664e85b0867ade330c97d8495f Gerrit-Change-Number: 12399 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 00:51:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 00:51:40 +0000 Subject: Change in osmo-msc[master]: fix: incoming call during ongoing call Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12400 Change subject: fix: incoming call during ongoing call ...................................................................... fix: incoming call during ongoing call If a call is already busy and another call is coming in, do not try to immediately assign an lchan (before this patch, it fails because there already is an mgcp_ctx for the conn). Leave the second CC transaction waiting. When a call is hung up, as soon as the old mgcp_ctx is discarded, look for other CC transactions that are waiting. If there is one, trigger assignment, so a new mgcp_ctx is set up for the new call. This fixes the following scenario: - from A, call B. - from C, call B; B rings during ongoing call. - in B, pick up the call, choose to drop the old call. After this patch, and with osmo-bsc patch with change-id I0c00ec2c120e5008281755adcd4944a3ce4d8355 we are now able to talk to the new caller. Related: OS#3735 Change-Id: I0ba216b737909e92080a722db26e3577726c63cb --- M src/libmsc/msc_mgcp.c 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/00/12400/1 diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 8e2e7a9..4c17768 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -962,6 +962,10 @@ struct ran_conn *conn = trans->conn; if (trans->cc.assignment_started) return 0; + if (conn->rtp.mgcp_ctx) { + LOGPFSMSL(conn->fi, DMGCP, LOGL_INFO, "Another call is already ongoing, not assigning yet\n"); + return 0; + } LOGPFSMSL(conn->fi, DMGCP, LOGL_INFO, "Starting call assignment\n"); trans->cc.assignment_started = true; return msc_mgcp_call_assignment(trans); @@ -1152,6 +1156,23 @@ return 0; } +static struct gsm_trans *find_waiting_call(struct ran_conn *conn) +{ + struct gsm_trans *trans; + struct gsm_network *net = conn->network; + + llist_for_each_entry(trans, &net->trans_list, entry) { + if (trans->conn != conn) + continue; + if (trans->protocol != GSM48_PDISC_CC) + continue; + if (trans->cc.assignment_started) + continue; + return trans; + } + return NULL; +} + /* Release ongoing call. * Parameter: * trans: connection context. @@ -1160,6 +1181,7 @@ { struct mgcp_ctx *mgcp_ctx; struct ran_conn *conn = trans->conn; + struct gsm_trans *waiting_trans; OSMO_ASSERT(trans); @@ -1203,5 +1225,14 @@ * all related context information */ conn->rtp.mgcp_ctx = NULL; + /* If there is another call still waiting to be activated, this is the time when the mgcp_ctx is available again + * and the other call can start assigning. */ + waiting_trans = find_waiting_call(conn); + if (waiting_trans) { + LOGP(DMGCP, LOGL_DEBUG, "(ti %02x %s) Call waiting: starting Assignment\n", + waiting_trans->transaction_id, vlr_subscr_name(trans->vsub)); + msc_mgcp_try_call_assignment(waiting_trans); + } + return 0; } -- To view, visit https://gerrit.osmocom.org/12400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0ba216b737909e92080a722db26e3577726c63cb Gerrit-Change-Number: 12400 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 00:51:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 00:51:39 +0000 Subject: Change in osmo-msc[master]: remove code dup: add msc_mgcp_try_call_assignment() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12398 Change subject: remove code dup: add msc_mgcp_try_call_assignment() ...................................................................... remove code dup: add msc_mgcp_try_call_assignment() Various places in the code check a flag whether assignment was started and launch it. To fix incoming-call-during-ongoing-call, I will tweak that logic. To be able to do that only in one place, remove code dup. Cosmetic preparation for I1f8746e7babfcd3028a4d2c0ba260c608c686c76 and I0ba216b737909e92080a722db26e3577726c63cb/ Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba --- M include/osmocom/msc/msc_mgcp.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_mgcp.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_tests.c 5 files changed, 24 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/98/12398/1 diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h index 9d8b01d..f7cc932 100644 --- a/include/osmocom/msc/msc_mgcp.h +++ b/include/osmocom/msc/msc_mgcp.h @@ -57,6 +57,7 @@ mgcp_trans_id_t mgw_pending_trans; }; +int msc_mgcp_try_call_assignment(struct gsm_trans *trans); int msc_mgcp_call_assignment(struct gsm_trans *trans); int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr); int msc_mgcp_call_complete(struct gsm_trans *trans, uint16_t port, char *addr); diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 5567da9..be9a451 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -736,12 +736,7 @@ new_cc_state(trans, GSM_CSTATE_MO_TERM_CALL_CONF); /* Assign call (if not done yet) */ - if (trans->assignment_done == false) { - rc = msc_mgcp_call_assignment(trans); - trans->assignment_done = true; - } - else - rc = 0; + rc = msc_mgcp_try_call_assignment(trans); /* don't continue, if there were problems with * the call assignment. */ @@ -780,14 +775,7 @@ return rc; /* Assign call (if not done yet) */ - if (trans->assignment_done == false) { - rc = msc_mgcp_call_assignment(trans); - trans->assignment_done = true; - } - else - rc = 0; - - return rc; + return msc_mgcp_try_call_assignment(trans); } static int gsm48_cc_rx_alerting(struct gsm_trans *trans, struct msgb *msg) @@ -1706,7 +1694,6 @@ static int tch_rtp_create(struct gsm_network *net, uint32_t callref) { struct gsm_trans *trans; - int rc; /* Find callref */ trans = trans_find_by_callref(net, callref); @@ -1737,14 +1724,7 @@ trans->tch_rtp_create = true; /* Assign call (if not done yet) */ - if (trans->assignment_done == false) { - rc = msc_mgcp_call_assignment(trans); - trans->assignment_done = true; - } - else - rc = 0; - - return rc; + return msc_mgcp_try_call_assignment(trans); } /* Trigger TCH_RTP_CREATE acknowledgement */ diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 23e68e7..5a8ee79 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -951,6 +951,22 @@ .event_names = msc_mgcp_fsm_evt_names, }; +/* Try to invoke call assignment and set trans->assignment_done flag if invoked. + * This is relevant for already ongoing calls -- scenario: + * - subscriber is in an active voice call, + * - another call is coming in. + * For the second call coming in, we must wait to establish RTP and assignment until the first call is CC-Disconnected. + */ +int msc_mgcp_try_call_assignment(struct gsm_trans *trans) +{ + struct ran_conn *conn = trans->conn; + if (trans->assignment_done) + return 0; + LOGPFSMSL(conn->fi, DMGCP, LOGL_INFO, "Starting call assignment\n"); + trans->assignment_done = true; + return msc_mgcp_call_assignment(trans); +} + /* Notify that a new call begins. This will create a connection for the * RAN and the CN on the MGW. * Parameter: diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index bdb8f44..8a5e719 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -32,7 +32,7 @@ -Wl,--wrap=gsm340_gen_scts \ -Wl,--wrap=osmo_get_rand_id \ -Wl,--wrap=msc_mgcp_call_release \ - -Wl,--wrap=msc_mgcp_call_assignment \ + -Wl,--wrap=msc_mgcp_try_call_assignment \ -Wl,--wrap=a_iface_tx_cipher_mode \ -Wl,--wrap=ranap_iu_tx_sec_mode_cmd \ -Wl,--wrap=osmo_sccp_tx_data_msg \ diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 8ae559e..de7600c 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -652,9 +652,9 @@ return 0; } -/* override, requires '-Wl,--wrap=msc_mgcp_call_assignment' */ -int __real_msc_mgcp_call_assignment(struct gsm_trans *trans); -int __wrap_msc_mgcp_call_assignment(struct gsm_trans *trans) +/* override, requires '-Wl,--wrap=msc_mgcp_try_call_assignment' */ +int __real_msc_mgcp_try_call_assignment(struct gsm_trans *trans); +int __wrap_msc_mgcp_try_call_assignment(struct gsm_trans *trans) { log("MS <--Call Assignment-- MSC: subscr=%s callref=0x%x", vlr_subscr_name(trans->vsub), trans->callref); -- To view, visit https://gerrit.osmocom.org/12398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba Gerrit-Change-Number: 12398 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 00:51:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 00:51:48 +0000 Subject: Change in osmo-bsc[master]: fix call-during-call: switch off re-using lchan during assignment Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12401 Change subject: fix call-during-call: switch off re-using lchan during assignment ...................................................................... fix call-during-call: switch off re-using lchan during assignment Disable lchan re-use on repeated Assignment Requests from the MSC, in order to enable switching over to a new call that is coming in during an ongoing call. This disables a rare and untested scenario for the benefit of a very common one: call during call. It adds a feature by disabling code :) The long-term way to support call-during-call, as well as Channel Mode Modify, would be to rather re-use the old lchan and implement FSM states to re-route the audio. But that is a task for another day. A more detailed explanation is given in the '#if 0' section added by this patch. To really get call-during-call working, osmo-msc also needs a fix, see the change-id in 'Related' below. Related: OS#3735, osmo-msc I0ba216b737909e92080a722db26e3577726c63cb Change-Id: I0c00ec2c120e5008281755adcd4944a3ce4d8355 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/01/12401/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 93362f8..8f236d1 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -251,6 +251,9 @@ new_lchan->nr); } +#if 0 +Code using this is currently disabled, search for lchan_type_compat_with_mode below. + static bool lchan_type_compat_with_mode(enum gsm_chan_t type, enum gsm48_chan_mode chan_mode, int full_rate) { @@ -290,6 +293,7 @@ return false; } } +#endif void assignment_fsm_init() { @@ -337,6 +341,38 @@ return; } +#if 0 + ------- + This bit of code would re-use an existing lchan if it already satisfies the + mode and rate requested by the MSC. + + That is a nice idea per se, but the only practical benefit is when we were out + of SDCCH channels and assigned a TCH channel for signalling, and now that TCH + should take on the voice stream. This scenario has not been tested. + + A much more common scenario, though, is that a call is coming in while another + call is ongoing. Then, the user may choose to hang up the current call, and + continue on the new call instead. In that scenario, the MSC will send us + another Assignment Command with a different remote RTP address to route RTP to. + The proper way now would be to bump the lchan_fsm so that it re-uses everything + that is in place, only MDCXes the result to a different remote RTP port. This + is currently not implemented and would require more states in the FSM. With + this code enabled, we try to re-use the existing lchan but do not re-route the + RTP: the old call is hung up and the new call gets no audio. + + However, if we simply drop the old lchan and create a new one, we can trivially + set up a new lchan the same way we always do, and switching over to the new + caller works, without a single line of code added here. + + Hence, disable this lchan re-use until we can re-use an lchan properly. + + Test scenario: + + - from A, call B. + - from C, call B; B rings during ongoing call. + - in B, pick up the call, choose to drop the old call. + ------- + if (conn->lchan && lchan_type_compat_with_mode(conn->lchan->type, req->chan_mode, req->full_rate)) { @@ -359,6 +395,7 @@ "NOT IMPLEMENTED:" " Current lchan would be compatible, we should send Channel Mode Modify\n"); } +#endif conn->assignment.new_lchan = lchan_select_by_chan_mode(bts, req->chan_mode, req->full_rate); -- To view, visit https://gerrit.osmocom.org/12401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0c00ec2c120e5008281755adcd4944a3ce4d8355 Gerrit-Change-Number: 12401 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 01:01:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 01:01:01 +0000 Subject: Change in osmo-msc[master]: fix: incoming call during ongoing call In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12400 to look at the new patch set (#2). Change subject: fix: incoming call during ongoing call ...................................................................... fix: incoming call during ongoing call If a call is already busy and another call is coming in, do not try to immediately assign an lchan (before this patch, it fails because there already is an mgcp_ctx for the conn). Leave the second CC transaction waiting. When a call is hung up, as soon as the old mgcp_ctx is discarded, look for other CC transactions that are waiting. If there is one, trigger assignment, so a new mgcp_ctx is set up for the new call. This fixes the following scenario: - from A, call B. - from C, call B; B rings during ongoing call. - in B, pick up the call, choose to drop the old call. After this patch, and with osmo-bsc patch with change-id I0c00ec2c120e5008281755adcd4944a3ce4d8355 we are now able to talk to the new caller. I currently haven't tested yet what happens if there is *three* peers trying to talk to the same number, running out of lab phones (not really, just not bothering now). Possibly we should be taking over the particular call indicated by the CC TI; instead, the current patch version takes on whichever waiting call it finds first. This is fine if *one* additional call comes in on an ongoing call, and this is already a huge improvement to what we had before. Related: OS#3735 Change-Id: I0ba216b737909e92080a722db26e3577726c63cb --- M src/libmsc/msc_mgcp.c 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/00/12400/2 -- To view, visit https://gerrit.osmocom.org/12400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0ba216b737909e92080a722db26e3577726c63cb Gerrit-Change-Number: 12400 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 01:01:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 01:01:01 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12368 to look at the new patch set (#6). Change subject: abort assignment on Assignment Failure ...................................................................... abort assignment on Assignment Failure If Assignment fails in the BSC, trigger an EV_TEARDOWN_ERROR in the mgcp_ctx FSM instance, so that the call gets torn down immediately. Before this, the non-call would idle around without anything happening. Related: OS#3236 Depends: I11b182a03f5ecb6df7cd8f260757d3626c8e945d (libosmocore) Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a --- M include/osmocom/msc/msc_mgcp.h M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 3 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/68/12368/6 -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 01:46:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 01:46:26 +0000 Subject: Change in osmo-msc[master]: remove code dup: add msc_mgcp_try_call_assignment() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12398 to look at the new patch set (#2). Change subject: remove code dup: add msc_mgcp_try_call_assignment() ...................................................................... remove code dup: add msc_mgcp_try_call_assignment() Various places in the code check a flag whether assignment was started and launch it. To fix incoming-call-during-ongoing-call, I will tweak that logic. To be able to do that only in one place, remove code dup. Cosmetic preparation for I1f8746e7babfcd3028a4d2c0ba260c608c686c76 and I0ba216b737909e92080a722db26e3577726c63cb/ Depends: I11b182a03f5ecb6df7cd8f260757d3626c8e945d (libosmocore: LOGPFSMSL) Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba --- M include/osmocom/msc/msc_mgcp.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_mgcp.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_tests.c 5 files changed, 24 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/98/12398/2 -- To view, visit https://gerrit.osmocom.org/12398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba Gerrit-Change-Number: 12398 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 01:46:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 01:46:26 +0000 Subject: Change in osmo-msc[master]: move trans->assignment_done to cc.assignment_started In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12399 to look at the new patch set (#2). Change subject: move trans->assignment_done to cc.assignment_started ...................................................................... move trans->assignment_done to cc.assignment_started The flag is set to true when an assignment has been started, and it is only relevant for a CC transaction. So fix naming and place in cc struct. Cosmetic preparation for I1f8746e7babfcd3028a4d2c0ba260c608c686c76 and I0ba216b737909e92080a722db26e3577726c63cb/ Change-Id: I8dacf46141ba0b664e85b0867ade330c97d8495f --- M include/osmocom/msc/transaction.h M src/libmsc/msc_mgcp.c 2 files changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/99/12399/2 -- To view, visit https://gerrit.osmocom.org/12399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8dacf46141ba0b664e85b0867ade330c97d8495f Gerrit-Change-Number: 12399 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 01:46:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 01:46:26 +0000 Subject: Change in osmo-msc[master]: fix: incoming call during ongoing call In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12400 to look at the new patch set (#3). Change subject: fix: incoming call during ongoing call ...................................................................... fix: incoming call during ongoing call If a call is already busy and another call is coming in, do not try to immediately assign an lchan (before this patch, it fails because there already is an mgcp_ctx for the conn). Leave the second CC transaction waiting. When a call is hung up, as soon as the old mgcp_ctx is discarded, look for other CC transactions that are waiting. If there is one, trigger assignment, so a new mgcp_ctx is set up for the new call. This fixes the following scenario: - from A, call B. - from C, call B; B rings during ongoing call. - in B, pick up the call, choose to drop the old call. After this patch, and with osmo-bsc patch with change-id I0c00ec2c120e5008281755adcd4944a3ce4d8355 we are now able to talk to the new caller. I currently haven't tested yet what happens if there is *three* peers trying to talk to the same number, running out of lab phones (not really, just not bothering now). Possibly we should be taking over the particular call indicated by the CC TI; instead, the current patch version takes on whichever waiting call it finds first. This is fine if *one* additional call comes in on an ongoing call, and this is already a huge improvement to what we had before. Related: OS#3735 Change-Id: I0ba216b737909e92080a722db26e3577726c63cb --- M src/libmsc/msc_mgcp.c 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/00/12400/3 -- To view, visit https://gerrit.osmocom.org/12400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0ba216b737909e92080a722db26e3577726c63cb Gerrit-Change-Number: 12400 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 01:46:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 01:46:26 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12368 to look at the new patch set (#7). Change subject: abort assignment on Assignment Failure ...................................................................... abort assignment on Assignment Failure If Assignment fails in the BSC, trigger an EV_TEARDOWN_ERROR in the mgcp_ctx FSM instance, so that the call gets torn down immediately. Before this, the non-call would idle around without anything happening. Related: OS#3236 Depends: I11b182a03f5ecb6df7cd8f260757d3626c8e945d (libosmocore) Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a --- M include/osmocom/msc/msc_mgcp.h M src/libmsc/msc_mgcp.c M src/libmsc/osmo_msc.c 3 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/68/12368/7 -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 01:50:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 01:50:34 +0000 Subject: Change in osmo-msc[master]: tweak fsm_msc_mgcp FSM and FI name Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12403 Change subject: tweak fsm_msc_mgcp FSM and FI name ...................................................................... tweak fsm_msc_mgcp FSM and FI name Instead of MGW(MGW_99) use a name of msc-mgcp(MSISDN:2331_GERAN_A:00000017_trans99) 1. The FSM is communication towards an MGW, not the MGW itself. When reading combined logging (gsmtap_log), it is confusing to read 'MGW' in a log coming from the MSC. The API is also called msc_mgcp_*. 2. Calling the FSM instance 'MGW_' again doesn't make sense. 3. Indicate 'trans' before the trans_id (trans_id was already shown, but not indicated what it was). 4. Also indicate the actual subscriber's identification. 5. Also indicate the RAN connection and conn_id. This comes up while trying to understand a call coming in on an already established call: parsing the log with a human brain is near torture without this info, taking extremely long to get grips on. Change-Id: Ie5fc1ffb7eba0209fee4666a075655cd24d27473 --- M src/libmsc/msc_mgcp.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/03/12403/1 diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 46b8b02..259fdfc 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -943,7 +943,7 @@ /* State machine definition */ static struct osmo_fsm fsm_msc_mgcp = { - .name = "MGW", + .name = "msc-mgcp", .states = fsm_msc_mgcp_states, .num_states = ARRAY_SIZE(fsm_msc_mgcp_states), .log_subsys = DMGCP, @@ -979,7 +979,6 @@ int msc_mgcp_call_assignment(struct gsm_trans *trans) { struct mgcp_ctx *mgcp_ctx; - char name[32]; static bool fsm_registered = false; struct ran_conn *conn; struct mgcp_client *mgcp; @@ -1009,9 +1008,6 @@ conn->iu.rab_id = next_iu_rab_id++; #endif - if (snprintf(name, sizeof(name), "MGW_%i", trans->transaction_id) >= sizeof(name)) - return -EINVAL; - /* Register the fsm description (if not already done) */ if (fsm_registered == false) { osmo_fsm_register(&fsm_msc_mgcp); @@ -1028,8 +1024,10 @@ vlr_subscr_name(trans->vsub), ENDPOINT_ID); return -EINVAL; } - mgcp_ctx->fsm = osmo_fsm_inst_alloc(&fsm_msc_mgcp, NULL, NULL, LOGL_DEBUG, name); + mgcp_ctx->fsm = osmo_fsm_inst_alloc(&fsm_msc_mgcp, NULL, NULL, LOGL_DEBUG, NULL); OSMO_ASSERT(mgcp_ctx->fsm); + osmo_fsm_inst_update_id_f(mgcp_ctx->fsm, "%s_%s_trans%d", + vlr_subscr_name(trans->vsub), ran_conn_get_conn_id(conn), trans->transaction_id); mgcp_ctx->fsm->priv = mgcp_ctx; mgcp_ctx->mgcp = mgcp; mgcp_ctx->trans = trans; -- To view, visit https://gerrit.osmocom.org/12403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5fc1ffb7eba0209fee4666a075655cd24d27473 Gerrit-Change-Number: 12403 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 01:50:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 01:50:35 +0000 Subject: Change in osmo-msc[master]: err log: fully log MS supported A5 algos on mismatch Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12404 Change subject: err log: fully log MS supported A5 algos on mismatch ...................................................................... err log: fully log MS supported A5 algos on mismatch Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 --- M src/libmsc/gsm_04_08.c 1 file changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/04/12404/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 9370c56..bd6ea79 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -118,6 +118,41 @@ return classmark2_is_r99(cm->classmark2, cm->classmark2_len); } +static const char *classmark_a5_name(const struct gsm_classmark *cm) +{ + static char buf[128]; + char cm1[42]; + char cm2[42]; + char cm3[42]; + + if (cm->classmark1_set) + snprintf(cm1, sizeof(cm1), " cm1{a5/1=%s}", + cm->classmark1.a5_1 ? "not-supported":"supported" /* inverted logic */); + else + snprintf(cm1, sizeof(cm1), " no-cm1"); + + if (cm->classmark2_len >= 3) + snprintf(cm2, sizeof(cm2), " cm2{0x%x=%s%s}", + cm->classmark2[2], + cm->classmark2[2] & 0x1 ? " A5/2" : "", + cm->classmark2[2] & 0x2 ? " A5/3" : ""); + else + snprintf(cm2, sizeof(cm2), " no-cm2"); + + if (cm->classmark3_len >= 1) + snprintf(cm3, sizeof(cm3), " cm3{0x%x=%s%s%s%s}", + cm->classmark3[0], + cm->classmark3[0] & (1 << 0) ? " A5/4" : "", + cm->classmark3[0] & (1 << 1) ? " A5/5" : "", + cm->classmark3[0] & (1 << 2) ? " A5/6" : "", + cm->classmark3[0] & (1 << 3) ? " A5/7" : ""); + else + snprintf(cm3, sizeof(cm3), " no-cm3"); + + snprintf(buf, sizeof(buf), "%s%s%s", cm1, cm2, cm3); + return buf; +} + /* Determine if the given CLASSMARK (1/2/3) value permits a given A5/n cipher. * Return 1 when the given A5/n is permitted, 0 when not, and negative if the respective MS CLASSMARK is * not known, where the negative number indicates the classmark type: -2 means Classmark 2 is not @@ -1648,8 +1683,9 @@ if (ei.perm_algo_len == 0) { LOGP(DMM, LOGL_ERROR, "%s: cannot start ciphering, no intersection " - "between MSC-configured and MS-supported A5 algorithms\n", - vlr_subscr_name(conn->vsub)); + "between MSC-configured and MS-supported A5 algorithms. MSC: %x MS:%s\n", + vlr_subscr_name(conn->vsub), net->a5_encryption_mask, + classmark_a5_name(&conn->vsub->classmark)); return -ENOTSUP; } -- To view, visit https://gerrit.osmocom.org/12404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 Gerrit-Change-Number: 12404 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 01:50:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 01:50:36 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: tweak logging in verbose mode Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12405 Change subject: msc_vlr_tests: tweak logging in verbose mode ...................................................................... msc_vlr_tests: tweak logging in verbose mode Change-Id: Ia06245f3adc6cf4c483d9c12c387cd5169582353 --- M tests/msc_vlr/msc_vlr_tests.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/05/12405/1 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index de7600c..9de64f6 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -1016,11 +1016,16 @@ OSMO_ASSERT(osmo_stderr_target); log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, _log_lines? 1 : 0); + log_set_print_filename(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); - if (cmdline_opts.verbose) + if (cmdline_opts.verbose) { log_set_category_filter(osmo_stderr_target, DLSMS, 1, LOGL_DEBUG); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME); + log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); + log_set_use_color(osmo_stderr_target, 1); + log_set_print_level(osmo_stderr_target, 1); + } net = test_net(msc_vlr_tests_ctx); -- To view, visit https://gerrit.osmocom.org/12405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia06245f3adc6cf4c483d9c12c387cd5169582353 Gerrit-Change-Number: 12405 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 01:50:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 01:50:33 +0000 Subject: Change in osmo-msc[master]: enrich context for vlr_subscr_name and ran_conn fi name Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12402 Change subject: enrich context for vlr_subscr_name and ran_conn fi name ...................................................................... enrich context for vlr_subscr_name and ran_conn fi name Include all available information in vlr_subscr_name(); instead of either IMSI or MSISDN or TMSI, print all of them when present. Instead of a short log, rather have more valuable context. A context info would now look like: Process_Access_Request_VLR(GERAN-A-3_IMSI-901700000014706_MSISDN-2023_TMSI-0x08bde4ec_PAGING_RESP) It does get quite long, but ensures easy correlation of any BSSAP / IuCS messages with log output, especially if multiple subscribers are busy at the same time. When showing the RAN conn id, instead of GERAN_A-00000017 write GERAN-A-23 - We usually write the conn_id in decimal. - Leading zeros are clutter. - Don't mix - and _ separators. These changes are combined to produce only one burst of humungous amounts of msc_vlr_tests expected output. That is definitely a weak point of these tests: blowing up the git history. OTOH they do show logging changes nicely. Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 --- M include/osmocom/msc/ran_conn.h M src/libmsc/gsm_04_08.c M src/libmsc/ran_conn.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 16 files changed, 11,382 insertions(+), 11,142 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/02/12402/1 -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 02:01:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 02:01:27 +0000 Subject: Change in osmo-bsc[master]: make sure early lchan act failure resets the lchan In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12388 ) Change subject: make sure early lchan act failure resets the lchan ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/#/c/12388/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/12388/1/include/osmocom/bsc/gsm_data.h at 516 PS1, Line 516: struct gsm_lchan *re_use_mgw_endpoint_from_lchan; > While at it, it would be great if you could please document better some of these fields. [?] yes, but in a separate patch. https://gerrit.osmocom.org/#/c/12388/1/src/osmo-bsc/lchan_fsm.c File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/#/c/12388/1/src/osmo-bsc/lchan_fsm.c at 509 PS1, Line 509: struct mgwep_ci *use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); good catch below, this line here should have moved down ...... https://gerrit.osmocom.org/#/c/12388/1/src/osmo-bsc/lchan_fsm.c at 536 PS1, Line 536: /* From lchan_reset(): > Where is lchan_reset() called? please provide that info in this line. [?] reset happens when entering the UNUSED state, which is the whole point of this patch :) but ok -> follow up patch. https://gerrit.osmocom.org/#/c/12388/1/src/osmo-bsc/lchan_fsm.c at 569 PS1, Line 569: use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); > where does this line come from? I don't see it in the previous block (previous commit file state <-) [?] ......moved down here. nice catch! -- To view, visit https://gerrit.osmocom.org/12388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ide665b10fa3f4583059c55346db8da833959e3cc Gerrit-Change-Number: 12388 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 21 Dec 2018 02:01:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 02:02:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 02:02:44 +0000 Subject: Change in osmo-bsc[master]: make sure early lchan act failure resets the lchan In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12388 to look at the new patch set (#2). Change subject: make sure early lchan act failure resets the lchan ...................................................................... make sure early lchan act failure resets the lchan Fix crash after AMR configuration fails. The crash is due to an assertion that finds a non-NULL conn in the lchan, when re-using an lchan that has failed in AMR configuration earlier on. That is because the AMR config still happens in state UNUSED. DCHAN ERROR lchan(0-0-2-TCH_F_TCH_H_PDCH-0)[0x6120000066a0]{UNUSED}: (type=TCH_F) lchan allocation failed in state UNUSED: Can not generate multirate configuration IE ... DCHAN DEBUG lchan(0-0-2-TCH_F_TCH_H_PDCH-0)[0x6120000066a0]{UNUSED}: (type=TCH_F) After failure handling, already in state UNUSED ... ... DCHAN DEBUG lchan(0-0-2-TCH_F_TCH_H_PDCH-0)[0x6120000066a0]{UNUSED}: Received Event LCHAN_EV_ACTIVATE (lchan_fsm.c:324) Assert failed !lchan->conn ../../../../src/osmo-bsc/src/osmo-bsc/lchan_fsm.c:491 The FSM design idea is that when returning to the UNUSED state, all lchan state is cleared. However, when calling lchan_activate(), a failure may happen still in state UNUSED, so that we don't transition *back* to UNUSED properly. So, first transition out of UNUSED before failures can happen. (Other ways to solve this would be to invoke lchan clearing even if already in UNUSED, but semantically, transitioning first makes more sense.) Upon LCHAN_EV_ACTIVATE, just remember the lchan_activate_info and transition to WAIT_TS_READY, so that on lchan_fail(), we can normally transition back to UNUSED and clear the lchan. Move the initial lchan activation code to lchan_fsm_wait_ts_ready_onenter(). Also, there is a bit of duplication of members of the lchan->activate (lchan state) and the lchan_activate_info (passed to lchan_activate()) structs. The fix for this also removes the dup: Add struct lchan_activate_info as child struct at lchan->activate.info, drop the other lchan->activate members that would dup .info.*. Move struct lchan_activate_info declaration to gsm_data.h. Apply the new '.info' member struct throughout the code. Related: OS#3737 Change-Id: Ide665b10fa3f4583059c55346db8da833959e3cc --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c 8 files changed, 105 insertions(+), 107 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/88/12388/2 -- To view, visit https://gerrit.osmocom.org/12388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ide665b10fa3f4583059c55346db8da833959e3cc Gerrit-Change-Number: 12388 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 02:02:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 02:02:44 +0000 Subject: Change in osmo-bsc[master]: comments: describe some lchan details Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12406 Change subject: comments: describe some lchan details ...................................................................... comments: describe some lchan details (requested by pespin) Change-Id: I04ec4ce1fd2b7b110bb496186aae39ecfbbc3628 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/lchan_fsm.c 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/12406/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 2090142..9f7ce8d 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -509,10 +509,13 @@ /* This always is for a specific lchan, so its lchan->type indicates full or half rate. * When a dyn TS was selected, the lchan->type has been set to the desired rate. */ enum gsm48_chan_mode chan_mode; + /* AMR config */ uint16_t s15_s0; bool requires_voice_stream; bool wait_before_switching_rtp; /*< true = requires LCHAN_EV_READY_TO_SWITCH_RTP */ uint16_t msc_assigned_cic; + /* During intra-BSC handover, we keep the MGW endpoint intact and just re-route to the new lchan. This + * activate_info is for the new lchan, the re_use_mgw_endpoint_from_lchan points at the old lchan. */ struct gsm_lchan *re_use_mgw_endpoint_from_lchan; }; diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index fc1bcbf..f344cf9 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -533,7 +533,7 @@ lchan->rqd_ta = old_lchan->rqd_ta; } else { lchan->ms_power = ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); - /* From lchan_reset(): + /* Upon last entering the UNUSED state, from lchan_reset(): * - bs_power is still zero, 0dB reduction, output power = Pn. * - TA is still zero, to be determined by RACH. */ } -- To view, visit https://gerrit.osmocom.org/12406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I04ec4ce1fd2b7b110bb496186aae39ecfbbc3628 Gerrit-Change-Number: 12406 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 02:03:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 02:03:13 +0000 Subject: Change in osmo-bsc[master]: make sure early lchan act failure resets the lchan In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12388 ) Change subject: make sure early lchan act failure resets the lchan ...................................................................... Patch Set 2: comments in https://gerrit.osmocom.org/12406/ -- To view, visit https://gerrit.osmocom.org/12388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ide665b10fa3f4583059c55346db8da833959e3cc Gerrit-Change-Number: 12388 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 21 Dec 2018 02:03:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 02:08:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 02:08:10 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: tweak some log levels INFO -> {DEBUG, ERROR} Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12407 Change subject: mgcp_client: tweak some log levels INFO -> {DEBUG,ERROR} ...................................................................... mgcp_client: tweak some log levels INFO -> {DEBUG,ERROR} Change-Id: Ie4ecb4b82a7a1e476c58d0a6056525733254adbb --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/07/12407/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index c821510..b36f5ed 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -205,7 +205,7 @@ if (pending->response_cb) pending->response_cb(response, pending->priv); else - LOGP(DLMGCP, LOGL_INFO, "MGCP response ignored (NULL cb)\n"); + LOGP(DLMGCP, LOGL_DEBUG, "MGCP response ignored (NULL cb)\n"); talloc_free(pending); } @@ -898,7 +898,7 @@ msgb_free(msg); goto mgcp_tx_error; } else - LOGP(DLMGCP, LOGL_INFO, "Queued %u bytes for MGCP GW\n", + LOGP(DLMGCP, LOGL_DEBUG, "Queued %u bytes for MGCP GW\n", msgb_l2len(msg)); return 0; @@ -922,10 +922,10 @@ struct mgcp_response_pending *pending = mgcp_client_response_pending_get(mgcp, trans_id); if (!pending) { /*! Note: it is not harmful to cancel a transaction twice. */ - LOGP(DLMGCP, LOGL_INFO, "Cannot cancel, no such transaction: %u\n", trans_id); + LOGP(DLMGCP, LOGL_ERROR, "Cannot cancel, no such transaction: %u\n", trans_id); return -ENOENT; } - LOGP(DLMGCP, LOGL_INFO, "Canceled transaction %u\n", trans_id); + LOGP(DLMGCP, LOGL_DEBUG, "Canceled transaction %u\n", trans_id); talloc_free(pending); return 0; /*! We don't really need to clean up the wqueue: In all sane cases, the msgb has already been sent -- To view, visit https://gerrit.osmocom.org/12407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4ecb4b82a7a1e476c58d0a6056525733254adbb Gerrit-Change-Number: 12407 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 02:11:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 02:11:24 +0000 Subject: Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12387 to look at the new patch set (#2). Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section ...................................................................... vty cfg: move 'ipa-name' from 'msc' to 'hlr' section during code review, I completely overlooked this: We've added the 'ipa-name', which identifies the MSC on the GSUP link to the HLR, under the 'msc' section, while all other GSUP/HLR related config is under the 'hlr' section. Before we roll that out in a release, move it over to 'hlr'. Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 22 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/12387/2 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 02:12:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 02:12:06 +0000 Subject: Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12387 to look at the new patch set (#3). Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section ...................................................................... vty cfg: move 'ipa-name' from 'msc' to 'hlr' section during code review, I completely overlooked this: We've added the 'ipa-name', which identifies the MSC on the GSUP link to the HLR, under the 'msc' section, while all other GSUP/HLR related config is under the 'hlr' section. Before we roll that out in a release, move it over to 'hlr'. Related: OS#3355 Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 22 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/12387/3 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 02:18:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 02:18:25 +0000 Subject: Change in libosmo-sccp[master]: fix ipa_asp_fsm down state transition In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12364 ) Change subject: fix ipa_asp_fsm down state transition ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Gerrit-Change-Number: 12364 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 21 Dec 2018 02:18:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 02:19:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 02:19:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12346 ) Change subject: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706 Gerrit-Change-Number: 12346 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 21 Dec 2018 02:19:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 02:24:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 02:24:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add a test for LU with invalid LAI In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12380 ) Change subject: add a test for LU with invalid LAI ...................................................................... Patch Set 2: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12380/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/12380/1/msc/MSC_Tests.ttcn at 2844 PS1, Line 2844: tr_ML3_MT_LU_Rej > I don't know which cause would be appropriate per the spec. [?] I think it's fine to receive a reject and not care about the cause; the causes are under-specified, or we haven't found the sweet spec that explains all the right reject causes yet. Any cause is good enough until we encounter a particular problem with it, I guess. https://gerrit.osmocom.org/#/c/12380/2/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/12380/2/msc/MSC_Tests.ttcn at 2851 PS2, Line 2851: } f_expect_clear() like in that other patch I just +2'ed? -- To view, visit https://gerrit.osmocom.org/12380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I676894358259b9cc0f973769ce552ba58a2a58a1 Gerrit-Change-Number: 12380 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 21 Dec 2018 02:24:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 02:25:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 02:25:27 +0000 Subject: Change in osmo-msc[master]: use vty->type instead of local variable In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12353 ) Change subject: use vty->type instead of local variable ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75 Gerrit-Change-Number: 12353 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 21 Dec 2018 02:25:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 02:52:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 21 Dec 2018 02:52:10 +0000 Subject: Change in osmo-msc[master]: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12349 ) Change subject: improve handling of BSC-chosen algo in CIPHER MODE COMPLETE ...................................................................... Patch Set 3: Code-Review-1 (11 comments) https://gerrit.osmocom.org/#/c/12349/2/include/osmocom/msc/gsm_04_08.h File include/osmocom/msc/gsm_04_08.h: https://gerrit.osmocom.org/#/c/12349/2/include/osmocom/msc/gsm_04_08.h at 80 PS2, Line 80: int gsm48_conn_sendmsg(struct msgb *msg, struct ran_conn *conn, struct gsm_trans *trans); > Yes that works, too. Done in next patch set. Actually in .h files, in general, please rather define opaque structs. Headers grow less dependency spaghetti and side effects if we just define opaque structs. #include ran_conn.h would rather belong in the .c file. It's not really a problem, no need to change it back again. But for next time: @Max, an opaque struct is good, not bad; and @stsp, next time refuse to #include lots of stuff if all you need is a single struct pointer. https://gerrit.osmocom.org/#/c/12349/2/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/12349/2/src/libmsc/a_iface_bssap.c at 410 PS2, Line 410: int supported; > This was copied from existing code in gsm_04_08.c. I'll fix it there, too. it's because there is A5/0 .. A5/7. That's eight. This is a fact throughout the encryption code. BTW, A5/4...7 don't even exist, only as placeholders / defined bits in the specs. https://gerrit.osmocom.org/#/c/12349/3/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/12349/3/src/libmsc/a_iface_bssap.c at 409 PS3, Line 409: for (i = 0; i < ENCRY_INFO_PERM_ALGO_MAXLEN; i++) { This loop wants to iterate the a5_encryption_mask, so it should actually be exactly i < 8. This constant instead defines how many perm_algo[] items are allowed. Those are theoretically two different pairs of shoes, but incidentally they are the same. Consider, even though 8 encryption types exist, the amount of permitted algos passed in that bssmap ie could have been chosen as three, or five, or two... Right. Both are eight. So it comes down to the same thing. At least now you know what things mean. https://gerrit.osmocom.org/#/c/12349/3/src/libmsc/a_iface_bssap.c at 419 PS3, Line 419: ei.perm_algo[j++] = vlr_ciph_to_gsm0808_alg_id(i); this here could instead make sure that j < ENCRY_INFO_PERM_ALGO_MAXLEN https://gerrit.osmocom.org/#/c/12349/3/src/libmsc/a_iface_bssap.c at 426 PS3, Line 426: vlr_ciph = ei.perm_algo[ei.perm_algo_len - 1] - 1; do we have a reverse function for vlr_ciph_to_gsm0808_alg_id()? The -1 might be correct, but it's a magic number here. https://gerrit.osmocom.org/#/c/12349/3/src/libmsc/a_iface_bssap.c at 429 PS3, Line 429: LOGPCONN(conn, LOGL_NOTICE, "BSC didn't specify algorithm in CIHPER MODE COMPLETE; falling back to %s\n", You are parsing the "Ciphering is complete" message. Ciphering is already in place between MS and BTS, it's not like you could fall back or anything. Either you know what cipher is being used, or you don't. But definitely ciphering is being used now. https://gerrit.osmocom.org/#/c/12349/3/src/libmsc/a_iface_bssap.c at 430 PS3, Line 430: get_value_string(vlr_ciph_names, vlr_ciph)); just use vlr_ciph_name(vlr_ciph) https://gerrit.osmocom.org/#/c/12349/3/src/libmsc/a_iface_bssap.c at 440 PS3, Line 440: LOGPCONN(conn, LOGL_ERROR, "Unsupported encryption algorithm in CIHPER MODE COMPLETE: %s\n", "Non-permitted"? https://gerrit.osmocom.org/#/c/12349/3/src/libmsc/a_iface_bssap.c at 456 PS3, Line 456: ran_conn_cipher_mode_compl(conn, msg, vlr_ciph); maybe this function needs to be taught to not pass a cipher algo to the MSC when the BTS didn't send an IE with the chosen cipher. This entire "which cipher is it" is merely informational, also towards the MSC. All this is in the end after all ciphering negotiation, and nothing can be changed about it at this point. https://gerrit.osmocom.org/#/c/12349/3/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12349/3/src/libmsc/gsm_04_08.c at 125 PS3, Line 125: int gsm48_classmark_supports_a5(const struct gsm_classmark *cm, uint8_t a5) gsm48 is a prefix commonly used by old libosmocore API. Would prefer to not use that here as well. Since there is only one kind of classmark, 'classmark_..' is fine even for a non-static function, it is still used only in the msc. https://gerrit.osmocom.org/#/c/12349/3/src/libmsc/gsm_04_08.c at 1613 PS3, Line 1613: for (i = 0; i < ENCRY_INFO_PERM_ALGO_MAXLEN; i++) { again, 8 is accurate here, because of (1 << i), and this is not a gsm0808 array of perm algo bytes. -- To view, visit https://gerrit.osmocom.org/12349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3260bee43cfe135ebfc33c13aee3c4ba43466c81 Gerrit-Change-Number: 12349 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 21 Dec 2018 02:52:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 09:53:47 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 09:53:47 +0000 Subject: Change in libosmocore[master]: GSUP: fix missing osmo_gsup_get_err_msg_type()s Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12408 Change subject: GSUP: fix missing osmo_gsup_get_err_msg_type()s ...................................................................... GSUP: fix missing osmo_gsup_get_err_msg_type()s Add missing mappings of request to error message types in osmo_gsup_get_error_msg_type(): * PROC_SS_REQUEST * MO_FORWARD_SM_REQUEST * MT_FORWARD_SM_REQUEST * READY_FOR_SM_REQUEST Change-Id: I801a0d6ffe09cfc75b77ab602bd25b3dc40f19c0 --- M src/gsm/gsup.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/08/12408/1 diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index c1c9992..3b31d03 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -108,6 +108,14 @@ return OSMO_GSUP_MSGT_DELETE_DATA_ERROR; case OSMO_GSUP_MSGT_LOCATION_CANCEL_REQUEST: return OSMO_GSUP_MSGT_LOCATION_CANCEL_ERROR; + case OSMO_GSUP_MSGT_PROC_SS_REQUEST: + return OSMO_GSUP_MSGT_PROC_SS_ERROR; + case OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST: + return OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR; + case OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST: + return OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR; + case OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST: + return OSMO_GSUP_MSGT_READY_FOR_SM_ERROR; default: return -1; } -- To view, visit https://gerrit.osmocom.org/12408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I801a0d6ffe09cfc75b77ab602bd25b3dc40f19c0 Gerrit-Change-Number: 12408 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 09:53:48 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 09:53:48 +0000 Subject: Change in libosmocore[master]: GSUP: add CHECK-IMEI message Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12409 Change subject: GSUP: add CHECK-IMEI message ...................................................................... GSUP: add CHECK-IMEI message Implement necessary messages for Procedure Check_IMEI_VLR (TS 23.018 Chapter 7.1.2.9). This lets the VLR ask the EIR to check if an IMEI is valid. In the Osmocom stack, we don't have an EIR and this request will be handled by the HLR. We will be able to store the IMEI in the HLR as side-effect (OS#2541). This is roughly based on TS 29.002 8.7.1 MAP_CHECK_IMEI service, but only implements the bare minimum required IEs (imei and imei_result). Related: OS#3733 Change-Id: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 5 files changed, 94 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/12409/1 diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 51871e4..74631ec 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -98,6 +98,9 @@ OSMO_GSUP_SM_RP_CAUSE_IE = 0x44, OSMO_GSUP_SM_RP_MMS_IE = 0x45, OSMO_GSUP_SM_ALERT_RSN_IE = 0x46, + + OSMO_GSUP_IMEI_IE = 0x50, + OSMO_GSUP_IMEI_RESULT_IE = 0x51, }; /*! GSUP message type */ @@ -143,6 +146,10 @@ OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST = 0b00101100, OSMO_GSUP_MSGT_READY_FOR_SM_ERROR = 0b00101101, OSMO_GSUP_MSGT_READY_FOR_SM_RESULT = 0b00101110, + + OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST = 0b00110000, + OSMO_GSUP_MSGT_CHECK_IMEI_ERROR = 0b00110001, + OSMO_GSUP_MSGT_CHECK_IMEI_RESULT = 0b00110010, }; #define OSMO_GSUP_IS_MSGT_REQUEST(msgt) (((msgt) & 0b00000011) == 0b00) @@ -164,6 +171,11 @@ OSMO_GSUP_CN_DOMAIN_CS = 2, }; +enum osmo_gsup_imei_result { + OSMO_GSUP_IMEI_RESULT_ACK = 1, + OSMO_GSUP_IMEI_RESULT_NACK = 2, +}; + /*! TCAP-like session state */ enum osmo_gsup_session_state { /*! Undefined session state */ @@ -257,6 +269,10 @@ const uint8_t *sm_rp_mms; /*! Alert reason (see 3GPP TS 29.002, 7.6.8.8) */ enum osmo_gsup_sms_sm_alert_rsn_t sm_alert_rsn; + + const uint8_t *imei_enc; + size_t imei_enc_len; + enum osmo_gsup_imei_result imei_result; }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 3b31d03..3d2a8e2 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -79,6 +79,10 @@ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_ERROR), OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_RESULT), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_CHECK_IMEI_ERROR), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_CHECK_IMEI_RESULT), + { 0, NULL } }; @@ -116,6 +120,8 @@ return OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR; case OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST: return OSMO_GSUP_MSGT_READY_FOR_SM_ERROR; + case OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: + return OSMO_GSUP_MSGT_CHECK_IMEI_ERROR; default: return -1; } @@ -487,6 +493,15 @@ gsup_msg->sm_alert_rsn = *value; break; + case OSMO_GSUP_IMEI_IE: + gsup_msg->imei_enc = value; + gsup_msg->imei_enc_len = value_len; + break; + + case OSMO_GSUP_IMEI_RESULT_IE: + gsup_msg->imei_result = osmo_decode_big_endian(value, value_len) + 1; + break; + default: LOGP(DLGSUP, LOGL_NOTICE, "GSUP IE type %d unknown\n", iei); @@ -720,6 +735,14 @@ sizeof(u8), &u8); } + if (gsup_msg->imei_enc) + msgb_tlv_put(msg, OSMO_GSUP_IMEI_IE, gsup_msg->imei_enc_len, gsup_msg->imei_enc); + + if ((u8 = gsup_msg->imei_result)) { + u8 -= 1; + msgb_tlv_put(msg, OSMO_GSUP_IMEI_RESULT_IE, sizeof(u8), &u8); + } + return 0; } diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index b3a8c77..7c9ee60 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -289,6 +289,33 @@ 0x02, /* Memory Available (SMMA) */ }; + static const uint8_t send_check_imei_req[] = { + 0x30, /* OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST */ + TEST_IMSI_IE, + + /* imei */ + 0x50, 0x09, + 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, + }; + + static const uint8_t send_check_imei_err[] = { + 0x31, /* OSMO_GSUP_MSGT_CHECK_IMEI_ERROR */ + TEST_IMSI_IE, + + /* cause */ + 0x02, 0x01, + 0x60, /* GMM_CAUSE_INV_MAND_INFO */ + }; + + static const uint8_t send_check_imei_res[] = { + 0x32, /* OSMO_GSUP_MSGT_CHECK_IMEI_RESULT */ + TEST_IMSI_IE, + + /* imei_result */ + 0x51, 0x01, + 0x00, /* OSMO_GSUP_IMEI_RESULT_ACK */ + }; + static const struct test { char *name; const uint8_t *data; @@ -338,6 +365,12 @@ send_mo_mt_forward_sm_err, sizeof(send_mo_mt_forward_sm_err)}, {"ReadyForSM (MSC -> SMSC) Indication", send_ready_for_sm_ind, sizeof(send_ready_for_sm_ind)}, + {"Check IMEI Request", + send_check_imei_req, sizeof(send_check_imei_req)}, + {"Check IMEI Error", + send_check_imei_err, sizeof(send_check_imei_err)}, + {"Check IMEI Result", + send_check_imei_res, sizeof(send_check_imei_res)}, }; printf("Test GSUP message decoding/encoding\n"); @@ -405,7 +438,7 @@ * FIXME: share the maximal IE value somehow * in order to avoid manual updating of this */ - OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SM_ALERT_RSN_IE); + OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_IMEI_RESULT_IE); OSMO_ASSERT(t->data[j+1] <= ie_end - j - 2); ie_end = j; diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index 236c38a..73b35fc 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -64,6 +64,15 @@ generated message: 2c 01 08 21 43 65 87 09 21 43 f5 46 01 02 original message: 2c 01 08 21 43 65 87 09 21 43 f5 46 01 02 IMSI: 123456789012345 + generated message: 30 01 08 21 43 65 87 09 21 43 f5 50 09 42 42 42 42 42 42 42 42 42 + original message: 30 01 08 21 43 65 87 09 21 43 f5 50 09 42 42 42 42 42 42 42 42 42 + IMSI: 123456789012345 + generated message: 31 01 08 21 43 65 87 09 21 43 f5 02 01 60 + original message: 31 01 08 21 43 65 87 09 21 43 f5 02 01 60 + IMSI: 123456789012345 + generated message: 32 01 08 21 43 65 87 09 21 43 f5 51 01 00 + original message: 32 01 08 21 43 65 87 09 21 43 f5 51 01 00 + IMSI: 123456789012345 message 0: tested 11 truncations, 11 parse failures message 1: tested 14 truncations, 13 parse failures message 2: tested 83 truncations, 81 parse failures @@ -86,6 +95,9 @@ message 19: tested 20 truncations, 18 parse failures message 20: tested 26 truncations, 22 parse failures message 21: tested 14 truncations, 13 parse failures + message 22: tested 22 truncations, 21 parse failures + message 23: tested 14 truncations, 13 parse failures + message 24: tested 14 truncations, 13 parse failures DLGSUP Stopping DLGSUP logging message 0: tested 2816 modifications, 510 parse failures message 1: tested 3584 modifications, 770 parse failures @@ -109,3 +121,6 @@ message 19: tested 5120 modifications, 1031 parse failures message 20: tested 6656 modifications, 1546 parse failures message 21: tested 3584 modifications, 771 parse failures + message 22: tested 5632 modifications, 771 parse failures + message 23: tested 3584 modifications, 770 parse failures + message 24: tested 3584 modifications, 771 parse failures diff --git a/tests/gsup/gsup_test.ok b/tests/gsup/gsup_test.ok index 36e35c8..70f723c 100644 --- a/tests/gsup/gsup_test.ok +++ b/tests/gsup/gsup_test.ok @@ -43,4 +43,10 @@ MO-/MT-ForwardSM Error OK Testing ReadyForSM (MSC -> SMSC) Indication ReadyForSM (MSC -> SMSC) Indication OK + Testing Check IMEI Request + Check IMEI Request OK + Testing Check IMEI Error + Check IMEI Error OK + Testing Check IMEI Result + Check IMEI Result OK Done. -- To view, visit https://gerrit.osmocom.org/12409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 Gerrit-Change-Number: 12409 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 09:53:48 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 09:53:48 +0000 Subject: Change in libosmocore[master]: GSUP: add end marker to enum osmo_gsup_iei Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12410 Change subject: GSUP: add end marker to enum osmo_gsup_iei ...................................................................... GSUP: add end marker to enum osmo_gsup_iei Simplify gsup_test.c by defining an end marker in gsup.h. No need to manually update the last element every time anymore. Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17 --- M include/osmocom/gsm/gsup.h M tests/gsup/gsup_test.c 2 files changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/12410/1 diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 74631ec..14abcae 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -101,6 +101,8 @@ OSMO_GSUP_IMEI_IE = 0x50, OSMO_GSUP_IMEI_RESULT_IE = 0x51, + + OSMO_GSUP_IEI_END_MARKER }; /*! GSUP message type */ diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index 7c9ee60..7012399 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -434,11 +434,7 @@ osmo_hexdump(t->data + j, ie_end - j)); OSMO_ASSERT(j <= ie_end - 2); - /** - * FIXME: share the maximal IE value somehow - * in order to avoid manual updating of this - */ - OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_IMEI_RESULT_IE); + OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_IEI_END_MARKER - 1); OSMO_ASSERT(t->data[j+1] <= ie_end - j - 2); ie_end = j; -- To view, visit https://gerrit.osmocom.org/12410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17 Gerrit-Change-Number: 12410 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 10:04:15 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 10:04:15 +0000 Subject: Change in osmo-hlr[master]: Reply to CHECK-IMEI GSUP messages Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12411 Change subject: Reply to CHECK-IMEI GSUP messages ...................................................................... Reply to CHECK-IMEI GSUP messages Decode the IMEI from incoming CHECK-IMEI messages, print the IMEI to the log and always send ACK back to the VLR/MSC. In the future, we will not only log the IMEI, but store it in the HLR (OS#2541). This is not the original intention of CHECK-IMEI from the 3GPP spec, but an useful side effect. Depends: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 (libosmocore) Related: OS#3733 Change-Id: Ib240474b0c3c603ba840cf26babb38a44dfc9364 --- M src/hlr.c 1 file changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/12411/1 diff --git a/src/hlr.c b/src/hlr.c index 4873a66..7a37518 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -399,6 +399,38 @@ return osmo_gsup_conn_send(conn, msg_out); } +static int rx_check_imei_req(struct osmo_gsup_conn *conn, const struct osmo_gsup_message *gsup) +{ + struct osmo_gsup_message gsup_reply = {0}; + struct msgb *msg_out; + char imei[GSM23003_IMEI_NUM_DIGITS+1] = {0}; + + /* Encoded IMEI length check */ + if (!gsup->imei_enc || gsup->imei_enc_len < 1 || gsup->imei_enc[0] >= sizeof(imei)) { + LOGP(DMAIN, LOGL_ERROR, "%s: wrong encoded IMEI length\n", gsup->imsi); + gsup_send_err_reply(conn, gsup->imsi, gsup->message_type, GMM_CAUSE_INV_MAND_INFO); + return -1; + } + + /* Decode IMEI */ + if (gsm48_decode_bcd_number(imei, sizeof(imei), gsup->imei_enc, 0) < 0) { + LOGP(DMAIN, LOGL_ERROR, "%s: failed to decode IMEI\n", gsup->imsi); + gsup_send_err_reply(conn, gsup->imsi, gsup->message_type, GMM_CAUSE_INV_MAND_INFO); + return -1; + } + + /* Only print the IMEI for now, it's planned to store it here (OS#2541) */ + LOGP(DMAIN, LOGL_INFO, "%s: has IMEI: %s\n", gsup->imsi, imei); + + /* Accept all IMEIs */ + gsup_reply.imei_result = OSMO_GSUP_IMEI_RESULT_ACK; + gsup_reply.message_type = OSMO_GSUP_MSGT_CHECK_IMEI_RESULT; + msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP Check_IMEI response"); + memcpy(gsup_reply.imsi, gsup->imsi, sizeof(gsup_reply.imsi)); + osmo_gsup_encode(msg_out, &gsup_reply); + return osmo_gsup_conn_send(conn, msg_out); +} + static int read_cb(struct osmo_gsup_conn *conn, struct msgb *msg) { static struct osmo_gsup_message gsup; @@ -459,6 +491,9 @@ lu_op_rx_gsup(luop, &gsup); } break; + case OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: + rx_check_imei_req(conn, &gsup); + break; default: LOGP(DMAIN, LOGL_DEBUG, "Unhandled GSUP message type %s\n", osmo_gsup_message_type_name(gsup.message_type)); -- To view, visit https://gerrit.osmocom.org/12411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib240474b0c3c603ba840cf26babb38a44dfc9364 Gerrit-Change-Number: 12411 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 10:13:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 10:13:57 +0000 Subject: Change in osmo-hlr[master]: Reply to CHECK-IMEI GSUP messages In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12411 ) Change subject: Reply to CHECK-IMEI GSUP messages ...................................................................... Patch Set 1: Jenkins is failing, because the depending libosmocore change is not in master yet. -- To view, visit https://gerrit.osmocom.org/12411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib240474b0c3c603ba840cf26babb38a44dfc9364 Gerrit-Change-Number: 12411 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Dec 2018 10:13:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 10:21:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 10:21:26 +0000 Subject: Change in libosmocore[master]: GSUP: add end marker to enum osmo_gsup_iei In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12410 to look at the new patch set (#2). Change subject: GSUP: add end marker to enum osmo_gsup_iei ...................................................................... GSUP: add end marker to enum osmo_gsup_iei Simplify gsup_test.c by defining an end marker in gsup.h. No need to manually update the last element every time anymore. Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17 --- M include/osmocom/gsm/gsup.h M tests/gsup/gsup_test.c 2 files changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/12410/2 -- To view, visit https://gerrit.osmocom.org/12410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17 Gerrit-Change-Number: 12410 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 10:21:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 10:21:26 +0000 Subject: Change in libosmocore[master]: GSUP: add CHECK-IMEI message In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12409 to look at the new patch set (#2). Change subject: GSUP: add CHECK-IMEI message ...................................................................... GSUP: add CHECK-IMEI message Implement necessary messages for Procedure Check_IMEI_VLR (TS 23.018 Chapter 7.1.2.9). This lets the VLR ask the EIR to check if an IMEI is valid. In the Osmocom stack, we don't have an EIR and this request will be handled by the HLR. We will be able to store the IMEI in the HLR as side-effect (OS#2541). This is roughly based on TS 29.002 8.7.1 MAP_CHECK_IMEI service, but only implements the bare minimum required IEs (imei and imei_result). Related: OS#3733 Change-Id: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 5 files changed, 93 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/12409/2 -- To view, visit https://gerrit.osmocom.org/12409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 Gerrit-Change-Number: 12409 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 11:34:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Dec 2018 11:34:26 +0000 Subject: Change in libosmocore[master]: GSUP: fix missing osmo_gsup_get_err_msg_type()s In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12408 ) Change subject: GSUP: fix missing osmo_gsup_get_err_msg_type()s ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Looks good, but please see my comments. I didn't update this function intentionally. Let's decide, de we really need to duplicate? https://gerrit.osmocom.org/#/c/12408/1/src/gsm/gsup.c File src/gsm/gsup.c: https://gerrit.osmocom.org/#/c/12408/1/src/gsm/gsup.c at 96 PS1, Line 96: osmo_gsup_get_err_msg_type Hmm, do we really need this function? There is a macro: OSMO_GSUP_TO_MSGT_ERROR(msgt) which does exactly the same. -- To view, visit https://gerrit.osmocom.org/12408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I801a0d6ffe09cfc75b77ab602bd25b3dc40f19c0 Gerrit-Change-Number: 12408 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 21 Dec 2018 11:34:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 11:41:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Dec 2018 11:41:59 +0000 Subject: Change in libosmocore[master]: GSUP: add end marker to enum osmo_gsup_iei In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12410 ) Change subject: GSUP: add end marker to enum osmo_gsup_iei ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12410/2/include/osmocom/gsm/gsup.h File include/osmocom/gsm/gsup.h: https://gerrit.osmocom.org/#/c/12410/2/include/osmocom/gsm/gsup.h at 102 PS2, Line 102: OSMO_GSUP_IEI_END_MARKER We usually prefix the end marker by '_' ;) And BTW, we have some gaps in IEI values (e.g. 0x35 ... 0x40). Any warranties that this item would be 0x47, and not e.g. 0x36? Of course, 'gsup' test would fail, but we need to be sure. https://gerrit.osmocom.org/#/c/12410/2/tests/gsup/gsup_test.c File tests/gsup/gsup_test.c: https://gerrit.osmocom.org/#/c/12410/2/tests/gsup/gsup_test.c at 404 PS2, Line 404: <= OSMO_GSUP_IEI_END_MARKER - 1 Cosmetic: you could avoid this arithmetic: OSMO_ASSERT(... < OSMO_GSUP_IEI_END_MARKER); -- To view, visit https://gerrit.osmocom.org/12410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17 Gerrit-Change-Number: 12410 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 21 Dec 2018 11:41:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 11:44:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 11:44:57 +0000 Subject: Change in libosmocore[master]: GSUP: fix missing osmo_gsup_get_err_msg_type()s In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12408 ) Change subject: GSUP: fix missing osmo_gsup_get_err_msg_type()s ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12408/1/src/gsm/gsup.c File src/gsm/gsup.c: https://gerrit.osmocom.org/#/c/12408/1/src/gsm/gsup.c at 96 PS1, Line 96: osmo_gsup_get_err_msg_type > Hmm, do we really need this function? There is a macro: [?] I would also prefer the macro, so the function does not need to be adjusted every time. Maybe we can remove the function altogether and use the macro everywhere instead? Harald added the function here, at which time the macro was already present: https://gerrit.osmocom.org/#/c/libosmocore/+/9549/ Maybe he can comment on why that was done. -- To view, visit https://gerrit.osmocom.org/12408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I801a0d6ffe09cfc75b77ab602bd25b3dc40f19c0 Gerrit-Change-Number: 12408 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Dec 2018 11:44:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 11:52:32 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Dec 2018 11:52:32 +0000 Subject: Change in libosmocore[master]: GSUP: add CHECK-IMEI message In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12409 ) Change subject: GSUP: add CHECK-IMEI message ...................................................................... Patch Set 2: (1 comment) Please also update osmo-gsm-manuals. https://gerrit.osmocom.org/#/c/12409/2/include/osmocom/gsm/gsup.h File include/osmocom/gsm/gsup.h: https://gerrit.osmocom.org/#/c/12409/2/include/osmocom/gsm/gsup.h at 277 PS2, Line 277: osmo_gsup_imei_result You are basically introducing three types: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST, OSMO_GSUP_MSGT_CHECK_IMEI_ERROR (NACK), OSMO_GSUP_MSGT_CHECK_IMEI_RESULT (ACK), so I don't think we need this IE. Probably, I am not getting the meaning of ACK/NACK? -- To view, visit https://gerrit.osmocom.org/12409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 Gerrit-Change-Number: 12409 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 21 Dec 2018 11:52:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 11:56:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Dec 2018 11:56:23 +0000 Subject: Change in libosmocore[master]: GSUP: fix missing osmo_gsup_get_err_msg_type()s In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12408 ) Change subject: GSUP: fix missing osmo_gsup_get_err_msg_type()s ...................................................................... Patch Set 1: I don't think we can merely remove this function, because this is a library API. We can either a) call the macro from it, or b) remove it and add an alias: #define osmo_gsup_get_err_msg_type(t) \ OSMO_GSUP_TO_MSGT_ERROR(t) Let's wait for Harald's response. -- To view, visit https://gerrit.osmocom.org/12408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I801a0d6ffe09cfc75b77ab602bd25b3dc40f19c0 Gerrit-Change-Number: 12408 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Dec 2018 11:56:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:01:35 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Dec 2018 12:01:35 +0000 Subject: Change in osmo-msc[master]: use vty->type instead of local variable In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12353 ) Change subject: use vty->type instead of local variable ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75 Gerrit-Change-Number: 12353 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 21 Dec 2018 12:01:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:13:55 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 12:13:55 +0000 Subject: Change in libosmocore[master]: GSUP: add end marker to enum osmo_gsup_iei In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12410 to look at the new patch set (#3). Change subject: GSUP: add end marker to enum osmo_gsup_iei ...................................................................... GSUP: add end marker to enum osmo_gsup_iei Simplify gsup_test.c by defining an end marker in gsup.h. No need to manually update the last element every time anymore. The C standard guarantees, that the end marker will have the last value plus one: "Each subsequent enumerator with no = defines its enumeration constant as the value of the constant expression obtained by adding 1 to the value of the previous enumeration constant." (From C99: 6.7.2.2 Enumeration specifiers) Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17 --- M include/osmocom/gsm/gsup.h M tests/gsup/gsup_test.c 2 files changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/12410/3 -- To view, visit https://gerrit.osmocom.org/12410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17 Gerrit-Change-Number: 12410 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:13:55 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 12:13:55 +0000 Subject: Change in libosmocore[master]: GSUP: add CHECK-IMEI message In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12409 to look at the new patch set (#3). Change subject: GSUP: add CHECK-IMEI message ...................................................................... GSUP: add CHECK-IMEI message Implement necessary messages for Procedure Check_IMEI_VLR (TS 23.018 Chapter 7.1.2.9). This lets the VLR ask the EIR to check if an IMEI is valid. In the Osmocom stack, we don't have an EIR and this request will be handled by the HLR. We will be able to store the IMEI in the HLR as side-effect (OS#2541). This is roughly based on TS 29.002 8.7.1 MAP_CHECK_IMEI service, but only implements the bare minimum required IEs (imei and imei_result). Related: OS#3733 Change-Id: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 5 files changed, 93 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/12409/3 -- To view, visit https://gerrit.osmocom.org/12409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 Gerrit-Change-Number: 12409 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:14:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 12:14:38 +0000 Subject: Change in libosmocore[master]: GSUP: add end marker to enum osmo_gsup_iei In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12410 ) Change subject: GSUP: add end marker to enum osmo_gsup_iei ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12410/2/include/osmocom/gsm/gsup.h File include/osmocom/gsm/gsup.h: https://gerrit.osmocom.org/#/c/12410/2/include/osmocom/gsm/gsup.h at 102 PS2, Line 102: OSMO_GSUP_IEI_END_MARKER > We usually prefix the end marker by '_' ;) Thanks, fixed. > Any warranties that this item would be 0x47, and not e.g. 0x36? Yes, the C standard says: "If the first enumerator has no =, the value of its enumeration constant is 0. Each subsequent enumerator with no = defines its enumeration constant as the value of the constant expression obtained by adding 1 to the value of the previous enumeration constant." See this draft of C99 for example, in 6.7.2.2 Enumeration specifiers: http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf (Turns out non-drafts are not published for free.) https://gerrit.osmocom.org/#/c/12410/2/tests/gsup/gsup_test.c File tests/gsup/gsup_test.c: https://gerrit.osmocom.org/#/c/12410/2/tests/gsup/gsup_test.c at 404 PS2, Line 404: <= OSMO_GSUP_IEI_END_MARKER - 1 > Cosmetic: you could avoid this arithmetic: [?] Right, that's better :) -- To view, visit https://gerrit.osmocom.org/12410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17 Gerrit-Change-Number: 12410 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Dec 2018 12:14:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:15:40 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Dec 2018 12:15:40 +0000 Subject: Change in libosmocore[master]: GSUP: add end marker to enum osmo_gsup_iei In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12410 ) Change subject: GSUP: add end marker to enum osmo_gsup_iei ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17 Gerrit-Change-Number: 12410 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Dec 2018 12:15:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:25:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 12:25:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12346 ) Change subject: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706 Gerrit-Change-Number: 12346 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 21 Dec 2018 12:25:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:25:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 12:25:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12346 ) Change subject: wait for subscriber conn in TC_cipher_complete_with_invalid_cipher ...................................................................... wait for subscriber conn in TC_cipher_complete_with_invalid_cipher Ensure that tests running after TC_cipher_complete_with_invalid_cipher won't see a left-over subscriber connection at the MSC. Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706 Related: OS#2872 --- M msc/MSC_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 1b37329..d121b63 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2815,6 +2815,7 @@ mtc.stop; } } + f_expect_clear(); } testcase TC_cipher_complete_with_invalid_cipher() runs on MTC_CT { -- To view, visit https://gerrit.osmocom.org/12346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If26ee688f77cdb80557e9695b8e3920fa2ce6706 Gerrit-Change-Number: 12346 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:30:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 12:30:18 +0000 Subject: Change in libosmocore[master]: GSUP: add CHECK-IMEI message In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12409 ) Change subject: GSUP: add CHECK-IMEI message ...................................................................... Patch Set 2: (1 comment) > Please also update osmo-gsm-manuals. Yes, I have it as checklist item in the issue: https://osmocom.org/issues/3733 https://gerrit.osmocom.org/#/c/12409/2/include/osmocom/gsm/gsup.h File include/osmocom/gsm/gsup.h: https://gerrit.osmocom.org/#/c/12409/2/include/osmocom/gsm/gsup.h at 277 PS2, Line 277: osmo_gsup_imei_result > You are basically introducing three types: [?] The response to CHECK_IMEI could be, as intended by the standard: * ACK: this IMEI is okay, allow it to be used * NACK: this IMEI is not allowed to be used (e.g. because it is on a stolen device blacklist) We don't check against a blacklist or whitelist in the Osmocom stack, and this is not planned IIRC. Right now, always ACK is sent back. But this could come in the future, so having the option to say ACK or NACK here is closer to the spec. ERROR is sent back when the IMEI can not be decoded. See also the related HLR changes using this message: https://gerrit.osmocom.org/#/c/osmo-hlr/+/12411/1/src/hlr.c -- To view, visit https://gerrit.osmocom.org/12409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 Gerrit-Change-Number: 12409 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Dec 2018 12:30:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:38:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 12:38:46 +0000 Subject: Change in osmo-msc[master]: use vty->type instead of local variable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12353 ) Change subject: use vty->type instead of local variable ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75 Gerrit-Change-Number: 12353 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 21 Dec 2018 12:38:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:38:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 12:38:47 +0000 Subject: Change in osmo-msc[master]: use vty->type instead of local variable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12353 ) Change subject: use vty->type instead of local variable ...................................................................... use vty->type instead of local variable We can check if we're parsing the config file by checking whether vty->type equals VTY_FILE. This avoids the use of an extra local variable to track the parsing state. Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75 Fixes: 1051c4208834c22d344dd92d25addfd8e5d95993 Related: OS#3355 --- M include/osmocom/msc/vty.h M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c 3 files changed, 1 insertion(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/vty.h b/include/osmocom/msc/vty.h index 60a36d7..6a55df7 100644 --- a/include/osmocom/msc/vty.h +++ b/include/osmocom/msc/vty.h @@ -31,6 +31,4 @@ struct gsm_network *gsmnet_from_vty(struct vty *vty); -extern bool msc_parsing_config_file; - #endif diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index c5d2832..7745e5d 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -466,7 +466,7 @@ "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. " "The default is 'MSC-00-00-00-00-00-00'.\n") { - if (!msc_parsing_config_file) { + if (vty->type != VTY_FILE) { vty_out(vty, "The IPA name cannot be changed at run-time; " "It can only be set in the configuraton file.%s", VTY_NEWLINE); return CMD_WARNING; diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 4dce2b8..6eecf46 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -515,8 +515,6 @@ extern void *tall_call_ctx; extern void *tall_trans_ctx; -bool msc_parsing_config_file = false; - int main(int argc, char **argv) { int rc; @@ -569,9 +567,7 @@ return -1; #endif - msc_parsing_config_file = true; rc = vty_read_config_file(msc_cmdline_config.config_file, NULL); - msc_parsing_config_file = false; if (rc < 0) { LOGP(DMSC, LOGL_FATAL, "Failed to parse the config file: '%s'\n", msc_cmdline_config.config_file); -- To view, visit https://gerrit.osmocom.org/12353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75 Gerrit-Change-Number: 12353 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:39:52 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 21 Dec 2018 12:39:52 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: account wait and http times separately Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12412 Change subject: ctrl2cgi: account wait and http times separately ...................................................................... ctrl2cgi: account wait and http times separately Save and propagate separate timestamp for HTTP request duration to distinguish between time spent waiting on connection limit availability from actual http request time. Change-Id: I14d1db5206864ac9ab7c64f96f67139113ab3fcf Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/12/12412/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 28a7c3b..3226c1d 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.0.8" # bump this on every non-trivial change +__version__ = "0.0.9" # bump this on every non-trivial change import argparse, os, logging, logging.handlers, datetime import hashlib @@ -39,13 +39,22 @@ # we don't support older versions of TwistedIPA module assert V(twisted_ipa_version) > V('0.4') +def log_duration(log, bid, ts, ts_http): + """ + Log human-readable duration from timestamps + """ + base = datetime.datetime.now() + delta_t = datetime.timedelta(seconds = (base - ts).total_seconds()) + delta_h = datetime.timedelta(seconds = (base - ts_http).total_seconds()) + delta_w = delta_t - delta_h + log.debug('Request for BSC %s took %s total (%s wait, %s http)' % (bid, delta_t, delta_w, delta_h)) -def handle_reply(ts, bid, f, log, resp): +def handle_reply(ts, ts_http, bid, f, log, resp): """ Reply handler: process raw CGI server response, function f to run for each command """ decoded = json.loads(resp.decode('utf-8')) - log.debug('request for BSC %s took %d seconds' % (bid, (datetime.datetime.now() - ts).total_seconds())) + log_duration(log, bid, ts, ts_http) comm_proc(decoded.get('commands'), bid, f, log) def gen_hash(params, skey): @@ -63,7 +72,7 @@ def make_async_req(ts, dst, par, f_write, f_log, tout): d = post(dst, par, timeout=tout) - d.addCallback(collect, partial(handle_reply, ts, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once + d.addCallback(collect, partial(handle_reply, ts, datetime.datetime.now(), par['bsc_id'], f_write, f_log)) d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s (timeout %d)" % (repr(e), par['bsc_id'], dst, tout))) # handle HTTP errors return d -- To view, visit https://gerrit.osmocom.org/12412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I14d1db5206864ac9ab7c64f96f67139113ab3fcf Gerrit-Change-Number: 12412 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:39:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 12:39:54 +0000 Subject: Change in libosmocore[master]: GSUP: add CHECK-IMEI message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12409 ) Change subject: GSUP: add CHECK-IMEI message ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 Gerrit-Change-Number: 12409 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Dec 2018 12:39:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:41:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 12:41:11 +0000 Subject: Change in libosmocore[master]: GSUP: add end marker to enum osmo_gsup_iei In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12410 ) Change subject: GSUP: add end marker to enum osmo_gsup_iei ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17 Gerrit-Change-Number: 12410 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Dec 2018 12:41:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:45:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 12:45:03 +0000 Subject: Change in libosmocore[master]: GSUP: fix missing osmo_gsup_get_err_msg_type()s In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12408 ) Change subject: GSUP: fix missing osmo_gsup_get_err_msg_type()s ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12408/1/src/gsm/gsup.c File src/gsm/gsup.c: https://gerrit.osmocom.org/#/c/12408/1/src/gsm/gsup.c at 96 PS1, Line 96: osmo_gsup_get_err_msg_type > I would also prefer the macro, so the function does not need to be adjusted every time. [?] while the existing GSUP message definitions "by coincidence" implicitly follow the rule that the error message is the request | 0x000001, I don't think this is indicated explicitly as a rule anywhere in the GSUP spec. I'm actually surprised that the macro exists. So if you want to make the rule explicit, make sure it's stated in the spec, there's a big fat comment on top of the enum/define for OSMO_GSUP_MSG_T and then make this function use the macro and mark it as deprecated. That should be a separate commit/patch from this one. -- To view, visit https://gerrit.osmocom.org/12408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I801a0d6ffe09cfc75b77ab602bd25b3dc40f19c0 Gerrit-Change-Number: 12408 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Dec 2018 12:45:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:45:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 12:45:04 +0000 Subject: Change in libosmocore[master]: GSUP: fix missing osmo_gsup_get_err_msg_type()s In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12408 ) Change subject: GSUP: fix missing osmo_gsup_get_err_msg_type()s ...................................................................... GSUP: fix missing osmo_gsup_get_err_msg_type()s Add missing mappings of request to error message types in osmo_gsup_get_error_msg_type(): * PROC_SS_REQUEST * MO_FORWARD_SM_REQUEST * MT_FORWARD_SM_REQUEST * READY_FOR_SM_REQUEST Change-Id: I801a0d6ffe09cfc75b77ab602bd25b3dc40f19c0 --- M src/gsm/gsup.c 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index c1c9992..3b31d03 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -108,6 +108,14 @@ return OSMO_GSUP_MSGT_DELETE_DATA_ERROR; case OSMO_GSUP_MSGT_LOCATION_CANCEL_REQUEST: return OSMO_GSUP_MSGT_LOCATION_CANCEL_ERROR; + case OSMO_GSUP_MSGT_PROC_SS_REQUEST: + return OSMO_GSUP_MSGT_PROC_SS_ERROR; + case OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST: + return OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR; + case OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST: + return OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR; + case OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST: + return OSMO_GSUP_MSGT_READY_FOR_SM_ERROR; default: return -1; } -- To view, visit https://gerrit.osmocom.org/12408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I801a0d6ffe09cfc75b77ab602bd25b3dc40f19c0 Gerrit-Change-Number: 12408 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:45:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 12:45:17 +0000 Subject: Change in libosmocore[master]: GSUP: add end marker to enum osmo_gsup_iei In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12410 ) Change subject: GSUP: add end marker to enum osmo_gsup_iei ...................................................................... GSUP: add end marker to enum osmo_gsup_iei Simplify gsup_test.c by defining an end marker in gsup.h. No need to manually update the last element every time anymore. The C standard guarantees, that the end marker will have the last value plus one: "Each subsequent enumerator with no = defines its enumeration constant as the value of the constant expression obtained by adding 1 to the value of the previous enumeration constant." (From C99: 6.7.2.2 Enumeration specifiers) Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17 --- M include/osmocom/gsm/gsup.h M tests/gsup/gsup_test.c 2 files changed, 3 insertions(+), 5 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, approved Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 51871e4..37e474c 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -98,6 +98,8 @@ OSMO_GSUP_SM_RP_CAUSE_IE = 0x44, OSMO_GSUP_SM_RP_MMS_IE = 0x45, OSMO_GSUP_SM_ALERT_RSN_IE = 0x46, + + _OSMO_GSUP_IEI_END_MARKER }; /*! GSUP message type */ diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index b3a8c77..079a703 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -401,11 +401,7 @@ osmo_hexdump(t->data + j, ie_end - j)); OSMO_ASSERT(j <= ie_end - 2); - /** - * FIXME: share the maximal IE value somehow - * in order to avoid manual updating of this - */ - OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SM_ALERT_RSN_IE); + OSMO_ASSERT(t->data[j+0] < _OSMO_GSUP_IEI_END_MARKER); OSMO_ASSERT(t->data[j+1] <= ie_end - j - 2); ie_end = j; -- To view, visit https://gerrit.osmocom.org/12410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17 Gerrit-Change-Number: 12410 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:45:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 12:45:18 +0000 Subject: Change in libosmocore[master]: GSUP: add CHECK-IMEI message In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12409 ) Change subject: GSUP: add CHECK-IMEI message ...................................................................... GSUP: add CHECK-IMEI message Implement necessary messages for Procedure Check_IMEI_VLR (TS 23.018 Chapter 7.1.2.9). This lets the VLR ask the EIR to check if an IMEI is valid. In the Osmocom stack, we don't have an EIR and this request will be handled by the HLR. We will be able to store the IMEI in the HLR as side-effect (OS#2541). This is roughly based on TS 29.002 8.7.1 MAP_CHECK_IMEI service, but only implements the bare minimum required IEs (imei and imei_result). Related: OS#3733 Change-Id: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 5 files changed, 93 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 37e474c..6adb0bf 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -99,6 +99,9 @@ OSMO_GSUP_SM_RP_MMS_IE = 0x45, OSMO_GSUP_SM_ALERT_RSN_IE = 0x46, + OSMO_GSUP_IMEI_IE = 0x50, + OSMO_GSUP_IMEI_RESULT_IE = 0x51, + _OSMO_GSUP_IEI_END_MARKER }; @@ -145,6 +148,10 @@ OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST = 0b00101100, OSMO_GSUP_MSGT_READY_FOR_SM_ERROR = 0b00101101, OSMO_GSUP_MSGT_READY_FOR_SM_RESULT = 0b00101110, + + OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST = 0b00110000, + OSMO_GSUP_MSGT_CHECK_IMEI_ERROR = 0b00110001, + OSMO_GSUP_MSGT_CHECK_IMEI_RESULT = 0b00110010, }; #define OSMO_GSUP_IS_MSGT_REQUEST(msgt) (((msgt) & 0b00000011) == 0b00) @@ -166,6 +173,11 @@ OSMO_GSUP_CN_DOMAIN_CS = 2, }; +enum osmo_gsup_imei_result { + OSMO_GSUP_IMEI_RESULT_ACK = 1, + OSMO_GSUP_IMEI_RESULT_NACK = 2, +}; + /*! TCAP-like session state */ enum osmo_gsup_session_state { /*! Undefined session state */ @@ -259,6 +271,10 @@ const uint8_t *sm_rp_mms; /*! Alert reason (see 3GPP TS 29.002, 7.6.8.8) */ enum osmo_gsup_sms_sm_alert_rsn_t sm_alert_rsn; + + const uint8_t *imei_enc; + size_t imei_enc_len; + enum osmo_gsup_imei_result imei_result; }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 3b31d03..3d2a8e2 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -79,6 +79,10 @@ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_ERROR), OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_RESULT), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_CHECK_IMEI_ERROR), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_CHECK_IMEI_RESULT), + { 0, NULL } }; @@ -116,6 +120,8 @@ return OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR; case OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST: return OSMO_GSUP_MSGT_READY_FOR_SM_ERROR; + case OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: + return OSMO_GSUP_MSGT_CHECK_IMEI_ERROR; default: return -1; } @@ -487,6 +493,15 @@ gsup_msg->sm_alert_rsn = *value; break; + case OSMO_GSUP_IMEI_IE: + gsup_msg->imei_enc = value; + gsup_msg->imei_enc_len = value_len; + break; + + case OSMO_GSUP_IMEI_RESULT_IE: + gsup_msg->imei_result = osmo_decode_big_endian(value, value_len) + 1; + break; + default: LOGP(DLGSUP, LOGL_NOTICE, "GSUP IE type %d unknown\n", iei); @@ -720,6 +735,14 @@ sizeof(u8), &u8); } + if (gsup_msg->imei_enc) + msgb_tlv_put(msg, OSMO_GSUP_IMEI_IE, gsup_msg->imei_enc_len, gsup_msg->imei_enc); + + if ((u8 = gsup_msg->imei_result)) { + u8 -= 1; + msgb_tlv_put(msg, OSMO_GSUP_IMEI_RESULT_IE, sizeof(u8), &u8); + } + return 0; } diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index 079a703..f194573 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -289,6 +289,33 @@ 0x02, /* Memory Available (SMMA) */ }; + static const uint8_t send_check_imei_req[] = { + 0x30, /* OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST */ + TEST_IMSI_IE, + + /* imei */ + 0x50, 0x09, + 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, + }; + + static const uint8_t send_check_imei_err[] = { + 0x31, /* OSMO_GSUP_MSGT_CHECK_IMEI_ERROR */ + TEST_IMSI_IE, + + /* cause */ + 0x02, 0x01, + 0x60, /* GMM_CAUSE_INV_MAND_INFO */ + }; + + static const uint8_t send_check_imei_res[] = { + 0x32, /* OSMO_GSUP_MSGT_CHECK_IMEI_RESULT */ + TEST_IMSI_IE, + + /* imei_result */ + 0x51, 0x01, + 0x00, /* OSMO_GSUP_IMEI_RESULT_ACK */ + }; + static const struct test { char *name; const uint8_t *data; @@ -338,6 +365,12 @@ send_mo_mt_forward_sm_err, sizeof(send_mo_mt_forward_sm_err)}, {"ReadyForSM (MSC -> SMSC) Indication", send_ready_for_sm_ind, sizeof(send_ready_for_sm_ind)}, + {"Check IMEI Request", + send_check_imei_req, sizeof(send_check_imei_req)}, + {"Check IMEI Error", + send_check_imei_err, sizeof(send_check_imei_err)}, + {"Check IMEI Result", + send_check_imei_res, sizeof(send_check_imei_res)}, }; printf("Test GSUP message decoding/encoding\n"); diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index 236c38a..73b35fc 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -64,6 +64,15 @@ generated message: 2c 01 08 21 43 65 87 09 21 43 f5 46 01 02 original message: 2c 01 08 21 43 65 87 09 21 43 f5 46 01 02 IMSI: 123456789012345 + generated message: 30 01 08 21 43 65 87 09 21 43 f5 50 09 42 42 42 42 42 42 42 42 42 + original message: 30 01 08 21 43 65 87 09 21 43 f5 50 09 42 42 42 42 42 42 42 42 42 + IMSI: 123456789012345 + generated message: 31 01 08 21 43 65 87 09 21 43 f5 02 01 60 + original message: 31 01 08 21 43 65 87 09 21 43 f5 02 01 60 + IMSI: 123456789012345 + generated message: 32 01 08 21 43 65 87 09 21 43 f5 51 01 00 + original message: 32 01 08 21 43 65 87 09 21 43 f5 51 01 00 + IMSI: 123456789012345 message 0: tested 11 truncations, 11 parse failures message 1: tested 14 truncations, 13 parse failures message 2: tested 83 truncations, 81 parse failures @@ -86,6 +95,9 @@ message 19: tested 20 truncations, 18 parse failures message 20: tested 26 truncations, 22 parse failures message 21: tested 14 truncations, 13 parse failures + message 22: tested 22 truncations, 21 parse failures + message 23: tested 14 truncations, 13 parse failures + message 24: tested 14 truncations, 13 parse failures DLGSUP Stopping DLGSUP logging message 0: tested 2816 modifications, 510 parse failures message 1: tested 3584 modifications, 770 parse failures @@ -109,3 +121,6 @@ message 19: tested 5120 modifications, 1031 parse failures message 20: tested 6656 modifications, 1546 parse failures message 21: tested 3584 modifications, 771 parse failures + message 22: tested 5632 modifications, 771 parse failures + message 23: tested 3584 modifications, 770 parse failures + message 24: tested 3584 modifications, 771 parse failures diff --git a/tests/gsup/gsup_test.ok b/tests/gsup/gsup_test.ok index 36e35c8..70f723c 100644 --- a/tests/gsup/gsup_test.ok +++ b/tests/gsup/gsup_test.ok @@ -43,4 +43,10 @@ MO-/MT-ForwardSM Error OK Testing ReadyForSM (MSC -> SMSC) Indication ReadyForSM (MSC -> SMSC) Indication OK + Testing Check IMEI Request + Check IMEI Request OK + Testing Check IMEI Error + Check IMEI Error OK + Testing Check IMEI Result + Check IMEI Result OK Done. -- To view, visit https://gerrit.osmocom.org/12409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 Gerrit-Change-Number: 12409 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Dec 21 12:55:33 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 21 Dec 2018 12:55:33 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_sysmo, su?= =?UTF-8?Q?perfemto=5Fv5.1,0,default,osmocom-master-debian9_#1583?= Message-ID: <624510803.130.1545396933808.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 102.14 KB...] Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmo-release.mk ' /usr/bin/install -c osmo-release.sh ' /usr/bin/install -c -m 644 libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc ' make install-data-hook make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-hook'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmocore + export PKG_CONFIG_PATH=: + export LD_LIBRARY_PATH= + osmo-build-dep.sh libosmo-abis =============================== libosmo-abis =============================== + mkdir -p + cd + osmo-deps.sh libosmo-abis + project=libosmo-abis + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmo-abis + cd libosmo-abis + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master HEAD is now at 961776a... log IPA tags correctly + git rev-parse HEAD 961776a2f97cb6d2877939f1cd1a21545ce8c57d + cd libosmo-abis + mkdir -p + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, '.'. libtoolize: copying file './ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'. libtoolize: copying file 'm4/libtool.m4' libtoolize: copying file 'm4/ltoptions.m4' libtoolize: copying file 'm4/ltsugar.m4' libtoolize: copying file 'm4/ltversion.m4' libtoolize: copying file 'm4/lt~obsolete.m4' configure.ac:20: installing './compile' configure.ac:22: installing './config.guess' configure.ac:22: installing './config.sub' configure.ac:8: installing './install-sh' configure.ac:8: installing './missing' src/Makefile.am: installing './depcomp' + ./configure --prefix= --with-systemdsystemunitdir= configure: WARNING: unrecognized options: --with-systemdsystemunitdir checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking if gcc supports -fvisibility=hidden... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for ORTP... yes checking dahdi/user.h usability... no checking dahdi/user.h presence... no checking for dahdi/user.h... no configure: WARNING: DAHDI input driver will not be built CFLAGS="-g -O2 -Wall" CPPFLAGS=" -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmoabis.pc config.status: creating libosmotrau.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating tests/Makefile config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.5.1.21-9617 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/abis/ipa.h osmocom/abis/trau_frame.h osmocom/abis/ipa_proxy.h osmocom/abis/ipaccess.h osmocom/abis/abis.h osmocom/abis/subchan_demux.h osmocom/abis/e1_input.h osmocom/abis/lapd.h osmocom/abis/lapd_pcap.h osmocom/abis/unixsocket_proto.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/trau/osmo_ortp.h ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' CC init.lo CC e1_input.lo CC subchan_demux.lo CC ipa_proxy.lo CC trau_frame.lo CC e1_input_vty.lo CC input/dahdi.lo CC input/ipa.lo /bin/bash: line 2: 29291 Segmentation fault /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I.. -Wall -Wall -I -I -I -g -O2 -Wall -MT trau_frame.lo -MD -MP -MF $depbase.Tpo -c -o trau_frame.lo trau_frame.c Makefile:527: recipe for target 'trau_frame.lo' failed make[2]: *** [trau_frame.lo] Error 139 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:470: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:769: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Dec 21 12:55:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 12:55:57 +0000 Subject: Change in osmo-hlr[master]: Reply to CHECK-IMEI GSUP messages In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12411 to look at the new patch set (#2). Change subject: Reply to CHECK-IMEI GSUP messages ...................................................................... Reply to CHECK-IMEI GSUP messages Decode the IMEI from incoming CHECK-IMEI messages, print the IMEI to the log and always send ACK back to the VLR/MSC. In the future, we will not only log the IMEI, but store it in the HLR (OS#2541). This is not the original intention of CHECK-IMEI from the 3GPP spec, but an useful side effect. Depends: I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 (libosmocore) Related: OS#3733 Change-Id: Ib240474b0c3c603ba840cf26babb38a44dfc9364 --- M src/hlr.c 1 file changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/12411/2 -- To view, visit https://gerrit.osmocom.org/12411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib240474b0c3c603ba840cf26babb38a44dfc9364 Gerrit-Change-Number: 12411 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 13:05:19 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 21 Dec 2018 13:05:19 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: account wait and http times separately In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/12412 ) Change subject: ctrl2cgi: account wait and http times separately ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I14d1db5206864ac9ab7c64f96f67139113ab3fcf Gerrit-Change-Number: 12412 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Dec 2018 13:05:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Dec 21 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 21 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#346?= Message-ID: <884155665.132.1545405007548.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.76 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Dec 21 15:10:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 15:10:34 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: explain msg format columns Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12413 Change subject: chapters/gsup.adoc: explain msg format columns ...................................................................... chapters/gsup.adoc: explain msg format columns Explain the M, O, C and V, TLV letters in the presence and format columns. Change-Id: Idf8614d4d0f462174426fd3afdb34bedfb859951 --- M common/chapters/gsup.adoc 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/13/12413/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index c48209d..7773d09 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -219,6 +219,10 @@ receiver shall be able to received them in any order. Unknown IE shall be ignored. +Besides a numeric range, the 'presence' column may have 'M' (Mandatory), 'O' +(Optional) or 'C' (Conditional). The 'format' column holds either 'V' (Value) +or 'TLV' (Tag Length Value). + ==== Send Authentication Info Request Direction: SGSN / VLR => HLR -- To view, visit https://gerrit.osmocom.org/12413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idf8614d4d0f462174426fd3afdb34bedfb859951 Gerrit-Change-Number: 12413 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 15:10:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 15:10:34 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document CHECK-IMEI Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12414 Change subject: chapters/gsup.adoc: document CHECK-IMEI ...................................................................... chapters/gsup.adoc: document CHECK-IMEI Related Change-Id: (core) I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 Related: OS#3733 Change-Id: I51dd09cda3c595f1d252546285ced9f06c748617 --- M common/chapters/gsup.adoc 1 file changed, 79 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/14/12414/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 7773d09..2ffd2a2 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -200,6 +200,25 @@ } ---- +==== Check IMEI + +The VLR asks the EIR to check if a new ME's IMEI is acceptable or not. The EIR +may implement a blacklist or whitelist and reject the IMEI based on that. +Against the original purpose of the Check IMEI Procedure, this could also be +used to save the IMEI in the HLR DB. + +.Check IMEI (Normal Case) +["mscgen"] +---- +msc { + hscale="1.5"; + VLR [label="VLR"], EIR [label="EIR (via HLR)"]; + + VLR => EIR [label="CHECK IMEI REQUEST (IMEI)"]; + EIR => VLR [label="CHECK IMEI RESULT (ACK)"]; +} +---- + === Message Format ==== General @@ -667,6 +686,42 @@ MO SMMA (Memory Available) indication. The corresponding MAP service is MAP-READY-FOR-SM, see 3GPP TS 29.002, section 12.4. +==== CHECK-IMEI Request + +Direction: VLR => EIR (via HLR) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|50|IMEI|<>|M|TLV|9 +|=== + +==== CHECK-IMEI Error + +Direction: EIR (via HLR) => VLR + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|02|Cause|<>|M|TLV|3 +|=== + +==== CHECK-IMEI Result + +Direction: EIR (via HLR) => VLR + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|51|IMEI Check Result|<>|M|TLV|3 +|=== + === Information Elements [[gsup-ie-msgtype]] @@ -706,6 +761,9 @@ |0x2c|READY-FOR-SM Request |0x2d|READY-FOR-SM Error |0x2e|READY-FOR-SM Result +|0x30|CHECK-IMEI Request +|0x31|CHECK-IMEI Error +|0x32|CHECK-IMEI Result |=== [[gsup-ie-ipaddr]] @@ -939,6 +997,8 @@ |0x44|SM-RP-Cause (RP Cause value)|<> |0x45|SM-RP-MMS (More Messages to Send)|<> |0x46|SM Alert Reason|<> +|0x50|IMEI|<> +|0x51|IMEI Check Result|<> |=== [[gsup-ie-empty]] @@ -1242,3 +1302,22 @@ |0x01|MS present |0x02|Memory Available |=== + +[[gsup-ie-imei]] +==== IMEI + +The IMEI encoded as Called Party BCD Number in 3GPP TS 04.08. + +[[gsup-ie-imei-result]] +==== IMEI Check Result + +Result of the Check IMEI request. A NACK could be sent in theory, if the ME is +not permitted on the network (e.g. because it is on a blacklist). + +.IMEI Check Result +[options="header",cols="10%,90%"] +|=== +|Type|Description +|0x01|ACK +|0x02|NACK +|=== -- To view, visit https://gerrit.osmocom.org/12414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I51dd09cda3c595f1d252546285ced9f06c748617 Gerrit-Change-Number: 12414 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 15:11:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 15:11:57 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document CHECK-IMEI In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12414 ) Change subject: chapters/gsup.adoc: document CHECK-IMEI ...................................................................... chapters/gsup.adoc: document CHECK-IMEI Related Change-Id: (core) I085819df0ea7f3bfeb0cabebb5fd1942a23c6155 Related: OS#3733 Change-Id: I51dd09cda3c595f1d252546285ced9f06c748617 --- M common/chapters/gsup.adoc 1 file changed, 79 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/14/12414/2 -- To view, visit https://gerrit.osmocom.org/12414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I51dd09cda3c595f1d252546285ced9f06c748617 Gerrit-Change-Number: 12414 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 15:32:07 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 15:32:07 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: account wait and http times separately In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12412 ) Change subject: ctrl2cgi: account wait and http times separately ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I14d1db5206864ac9ab7c64f96f67139113ab3fcf Gerrit-Change-Number: 12412 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 21 Dec 2018 15:32:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 15:51:57 2018 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Fri, 21 Dec 2018 15:51:57 +0000 Subject: Change in osmo-trx[master]: convolve: Remove support for step, offset parameters Message-ID: tnt has uploaded this change for review. ( https://gerrit.osmocom.org/12415 Change subject: convolve: Remove support for step, offset parameters ...................................................................... convolve: Remove support for step, offset parameters - Those are not used any where - Those are not supported by the sse/neon accelerated versions - And I see very little use cases for those. Change-Id: Ic850269a0ed5d98c0ea68980afd31016ed555b48 Signed-off-by: Sylvain Munaut --- M Transceiver52M/Channelizer.cpp M Transceiver52M/Resampler.cpp M Transceiver52M/Synthesis.cpp M Transceiver52M/arch/arm/convolve.c M Transceiver52M/arch/common/convolve.h M Transceiver52M/arch/common/convolve_base.c M Transceiver52M/arch/x86/convolve.c M Transceiver52M/arch/x86/convolve_sse_3.c M Transceiver52M/arch/x86/convolve_sse_3.h M Transceiver52M/sigProcLib.cpp M tests/Transceiver52M/convolve_test.c 11 files changed, 124 insertions(+), 166 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/15/12415/1 diff --git a/Transceiver52M/Channelizer.cpp b/Transceiver52M/Channelizer.cpp index 2d817b0..a18dd03 100644 --- a/Transceiver52M/Channelizer.cpp +++ b/Transceiver52M/Channelizer.cpp @@ -88,7 +88,7 @@ convolve_real(hInputs[i], blockLen, subFilters[i], hLen, hOutputs[i], blockLen, - 0, blockLen, 1, 0); + 0, blockLen); } cxvec_fft(fftHandle); diff --git a/Transceiver52M/Resampler.cpp b/Transceiver52M/Resampler.cpp index 6b9621c..ecd8865 100644 --- a/Transceiver52M/Resampler.cpp +++ b/Transceiver52M/Resampler.cpp @@ -143,7 +143,7 @@ convolve_real(in, in_len, reinterpret_cast(partitions[path]), filt_len, &out[2 * i], out_len - i, - n, 1, 1, 0); + n, 1); } return out_len; diff --git a/Transceiver52M/Synthesis.cpp b/Transceiver52M/Synthesis.cpp index 262c638..6b62156 100644 --- a/Transceiver52M/Synthesis.cpp +++ b/Transceiver52M/Synthesis.cpp @@ -102,7 +102,7 @@ convolve_real(hInputs[i], blockLen, subFilters[i], hLen, hOutputs[i], blockLen, - 0, blockLen, 1, 0); + 0, blockLen); } /* Interleave into output vector */ diff --git a/Transceiver52M/arch/arm/convolve.c b/Transceiver52M/arch/arm/convolve.c index 912d0c2..5b5bce5 100644 --- a/Transceiver52M/arch/arm/convolve.c +++ b/Transceiver52M/arch/arm/convolve.c @@ -29,17 +29,15 @@ int _base_convolve_real(float *x, int x_len, float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset); + int start, int len); int _base_convolve_complex(float *x, int x_len, float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset); + int start, int len); int bounds_check(int x_len, int h_len, int y_len, - int start, int len, int step); + int start, int len); #ifdef HAVE_NEON /* Calls into NEON assembler */ @@ -69,35 +67,32 @@ int convolve_real(float *x, int x_len, float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset) + int start, int len) { void (*conv_func)(float *, float *, float *, int) = NULL; - if (bounds_check(x_len, h_len, y_len, start, len, step) < 0) + if (bounds_check(x_len, h_len, y_len, start, len) < 0) return -1; memset(y, 0, len * 2 * sizeof(float)); #ifdef HAVE_NEON - if (step <= 4) { - switch (h_len) { - case 4: - conv_func = neon_conv_real4; - break; - case 8: - conv_func = neon_conv_real8; - break; - case 12: - conv_func = neon_conv_real12; - break; - case 16: - conv_func = neon_conv_real16; - break; - case 20: - conv_func = neon_conv_real20; - break; - } + switch (h_len) { + case 4: + conv_func = neon_conv_real4; + break; + case 8: + conv_func = neon_conv_real8; + break; + case 12: + conv_func = neon_conv_real12; + break; + case 16: + conv_func = neon_conv_real16; + break; + case 20: + conv_func = neon_conv_real20; + break; } #endif if (conv_func) { @@ -107,7 +102,7 @@ _base_convolve_real(x, x_len, h, h_len, y, y_len, - start, len, step, offset); + start, len); } return len; @@ -118,18 +113,17 @@ int convolve_complex(float *x, int x_len, float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset) + int start, int len) { void (*conv_func)(float *, float *, float *, int, int) = NULL; - if (bounds_check(x_len, h_len, y_len, start, len, step) < 0) + if (bounds_check(x_len, h_len, y_len, start, len) < 0) return -1; memset(y, 0, len * 2 * sizeof(float)); #ifdef HAVE_NEON - if (step <= 4 && !(h_len % 4)) + if (!(h_len % 4)) conv_func = neon_conv_cmplx_4n; #endif if (conv_func) { @@ -139,7 +133,7 @@ _base_convolve_complex(x, x_len, h, h_len, y, y_len, - start, len, step, offset); + start, len); } return len; diff --git a/Transceiver52M/arch/common/convolve.h b/Transceiver52M/arch/common/convolve.h index 095b04c..e30f7ec 100644 --- a/Transceiver52M/arch/common/convolve.h +++ b/Transceiver52M/arch/common/convolve.h @@ -6,26 +6,22 @@ int convolve_real(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset); + int start, int len); int convolve_complex(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset); + int start, int len); int base_convolve_real(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset); + int start, int len); int base_convolve_complex(const float *x, int x_len, const float *h, int h_len, float *y, int y_len, - int start, int len, - int step, int offset); + int start, int len); void convolve_init(void); diff --git a/Transceiver52M/arch/common/convolve_base.c b/Transceiver52M/arch/common/convolve_base.c index 2eb7124..9bb8d3d 100644 --- a/Transceiver52M/arch/common/convolve_base.c +++ b/Transceiver52M/arch/common/convolve_base.c @@ -41,17 +41,17 @@ /* Base vector complex-complex multiply and accumulate */ static void mac_real_vec_n(const float *x, const float *h, float *y, - int len, int step, int offset) + int len) { - for (int i = offset; i < len; i += step) + for (int i=0; ibegin(), _x->size(), (float *) h->begin(), h->size(), (float *) y->begin(), y->size(), - start, len, step, offset); + start, len); } else if (!h->isReal() && h->isAligned()) { rc = convolve_complex((float *) _x->begin(), _x->size(), (float *) h->begin(), h->size(), (float *) y->begin(), y->size(), - start, len, step, offset); + start, len); } else if (h->isReal() && !h->isAligned()) { rc = base_convolve_real((float *) _x->begin(), _x->size(), (float *) h->begin(), h->size(), (float *) y->begin(), y->size(), - start, len, step, offset); + start, len); } else if (!h->isReal() && !h->isAligned()) { rc = base_convolve_complex((float *) _x->begin(), _x->size(), (float *) h->begin(), h->size(), (float *) y->begin(), y->size(), - start, len, step, offset); + start, len); } else { rc = -1; } @@ -1482,7 +1481,7 @@ /* Correlate */ if (!convolve(corr_in, sync->sequence, &corr, - CUSTOM, start, len, 1, 0)) { + CUSTOM, start, len)) { delete dec; return -1; } diff --git a/tests/Transceiver52M/convolve_test.c b/tests/Transceiver52M/convolve_test.c index 54bc7a1..8ca4b72 100644 --- a/tests/Transceiver52M/convolve_test.c +++ b/tests/Transceiver52M/convolve_test.c @@ -62,21 +62,17 @@ int y_len; int start; int len; - int step; - int offset; x_len=34; y_len=26; start=8; len=26; - step=1; - offset=1; reset_testvec(0); dump_floats(x,x_len,"x"); printf("\n"); dump_floats(h,h_len,"h"); printf("\n"); - convolve_complex(x, x_len, h, h_len, y, y_len, start, len, step, offset); + convolve_complex(x, x_len, h, h_len, y, y_len, start, len); dump_floats(y,y_len,"y"); printf("\n"); } @@ -88,21 +84,17 @@ int y_len; int start; int len; - int step; - int offset; x_len=34; y_len=26; start=8; len=26; - step=1; - offset=1; reset_testvec(0); - dump_floats(x,x_len,"x"); + dump_floats(x-30,2*x_len+30,"x"); printf("\n"); - dump_floats(h,h_len,"h"); + dump_floats(h,2*h_len,"h"); printf("\n"); - convolve_real(x, x_len, h, h_len, y, y_len, start, len, step, offset); + convolve_real(x, x_len, h, h_len, y, y_len, start, len); dump_floats(y,y_len,"y"); printf("\n"); } -- To view, visit https://gerrit.osmocom.org/12415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic850269a0ed5d98c0ea68980afd31016ed555b48 Gerrit-Change-Number: 12415 Gerrit-PatchSet: 1 Gerrit-Owner: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 15:51:57 2018 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Fri, 21 Dec 2018 15:51:57 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test Message-ID: tnt has uploaded this change for review. ( https://gerrit.osmocom.org/12416 Change subject: tests: Rework the convolve_test ...................................................................... tests: Rework the convolve_test Besides just general cleanup, the major changes are : - Always run the reference / base implementation and print those results. Theses should be consistent across platform and check the base implementation works - Run the optimized version and compare results with small error tolerance against the reference results. Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Signed-off-by: Sylvain Munaut --- M tests/Transceiver52M/convolve_test.c M tests/Transceiver52M/convolve_test.ok 2 files changed, 943 insertions(+), 144 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/16/12416/1 diff --git a/tests/Transceiver52M/convolve_test.c b/tests/Transceiver52M/convolve_test.c index 8ca4b72..4843bd1 100644 --- a/tests/Transceiver52M/convolve_test.c +++ b/tests/Transceiver52M/convolve_test.c @@ -1,142 +1,265 @@ #include #include #include +#include + #include "convolve.h" -#define TESTVEC_LEN 1000 -#define DO_INIT 1 +struct test_vec +{ + float *x; + float *h; + float *y_ref; + float *y_iut; -float x_vect[TESTVEC_LEN]; -float y_vect[TESTVEC_LEN]; -float h_vect[TESTVEC_LEN]; - -float *x; -float *h; -float *y; + int x_len; /* Theses are in # of _floats_ ! */ + int h_len; /* Theses are in # of _floats_ ! */ + int y_len; /* Theses are in # of _floats_ ! */ +}; /* Generate some random values for testing */ -void gen_floats(float *vect, int len) +static void +gen_floats(float *vect, int len) { int i; for (i = 0; i < len; i++) { - vect[i] = (float)rand()/(float)(RAND_MAX); + vect[i] = (float)rand()/(float)(RAND_MAX) - 0.5f; } } -/* Reset testvectors */ -static void reset_testvec(int seed) -{ - srand(seed); - memset(x_vect,0,sizeof(x_vect)); - memset(y_vect,0,sizeof(y_vect)); - memset(h_vect,0,sizeof(h_vect)); - - x=x_vect + TESTVEC_LEN/2; - y=y_vect + TESTVEC_LEN/2; - h=h_vect + TESTVEC_LEN/2; - - gen_floats(x_vect,TESTVEC_LEN); - gen_floats(h_vect,TESTVEC_LEN); -} - /* Show float vector data cut and paste friendly */ -static void dump_floats(float *vect, int len, char *name) +static void +dump_floats(float *vect, int len, char *name) { int i; - printf("float %s[] = {", name); + printf("float %s[] = {\n\t", name); for(i = 0; i < len; i++) { - - printf("%f",vect[i]); - - if(ix, 0, tv->x_len * sizeof(float)); + memset(tv->h, 0, tv->h_len * sizeof(float)); + memset(tv->y_ref, 0, tv->y_len * sizeof(float)); + memset(tv->y_iut, 0, tv->y_len * sizeof(float)); + + gen_floats(tv->x, tv->x_len); + gen_floats(tv->h, tv->h_len); +} + +/* Allocate test vectors */ +static struct test_vec * +test_vec_alloc(int x_len, int h_len) +{ + struct test_vec *tv; + + tv = calloc(1, sizeof(struct test_vec)); + if (!tv) + return NULL; + + tv->x_len = x_len; + tv->h_len = h_len; + tv->y_len = x_len; /* Results can never be longer than x */ + + tv->x = convolve_h_alloc(x_len); + tv->h = convolve_h_alloc(h_len); + tv->y_ref = convolve_h_alloc(tv->y_len); + tv->y_iut = convolve_h_alloc(tv->y_len); + + test_vec_reset(tv, 0); + + return tv; +} + +/* Release test vectors */ +static void +test_vec_release(struct test_vec *tv) +{ + if (!tv) + return; + + free(tv->x); + free(tv->h); + free(tv->y_ref); + free(tv->y_iut); + + free(tv); +} + /* Test complex convolution */ -static void test_convolve_complex(int h_len) +static void +test_convolve_complex(struct test_vec *tv, int h_len) { int x_len; - int y_len; - int start; - int len; + int start, len; + int rv; - x_len=34; - y_len=26; - start=8; - len=26; - reset_testvec(0); - dump_floats(x,x_len,"x"); - printf("\n"); - dump_floats(h,h_len,"h"); - printf("\n"); - convolve_complex(x, x_len, h, h_len, y, y_len, start, len); - dump_floats(y,y_len,"y"); - printf("\n"); + test_vec_reset(tv, 0); + + /* Compute params that fit within our test vectors */ + x_len = tv->x_len / 2; /* float vs complex */ + start = h_len - 1; + len = x_len - start; + + /* Run both 'base/ref' implementation and the potentially optimized one */ + base_convolve_complex( + tv->x, x_len, + tv->h, h_len, + tv->y_ref, tv->y_len, + start, len + ); + + convolve_complex( + tv->x, x_len, + tv->h, h_len, + tv->y_iut, tv->y_len, + start, len + ); + + /* Print the 'ref' results. Those should be consistent across platforms */ + dump_floats(tv->y_ref, 2 * len, "y_ref"); + + /* Compare to 'iut' ones with small tolerance for precision */ + rv = compare_floats(tv->y_ref, tv->y_iut, len * 2, 1e-5f, 1e-5f); + printf("IUT: %s\n", rv ? "!!! FAIL !!!" : "PASS"); + + if (rv) + dump_floats(tv->y_iut, 2 * len, "y_iut"); } /* Test real convolution */ -static void test_convolve_real(int h_len) +static void +test_convolve_real(struct test_vec *tv, int h_len) { int x_len; - int y_len; - int start; - int len; + int start, len; + int rv; - x_len=34; - y_len=26; - start=8; - len=26; - reset_testvec(0); - dump_floats(x-30,2*x_len+30,"x"); - printf("\n"); - dump_floats(h,2*h_len,"h"); - printf("\n"); - convolve_real(x, x_len, h, h_len, y, y_len, start, len); - dump_floats(y,y_len,"y"); - printf("\n"); + test_vec_reset(tv, 0); + + /* Compute params that fit within our test vectors */ + x_len = tv->x_len / 2; /* float vs complex */ + start = h_len - 1; + len = x_len - start; + + /* Run both 'base/ref' implementation and the potentially optimized one */ + base_convolve_real( + tv->x, x_len, + tv->h, h_len, + tv->y_ref, tv->y_len, + start, len + ); + + convolve_real( + tv->x, x_len, + tv->h, h_len, + tv->y_iut, tv->y_len, + start, len + ); + + /* Print the 'ref' results. Those should be consistent across platforms */ + dump_floats(tv->y_ref, 2 * len, "y_ref"); + + /* Compare to 'iut' ones with small tolerance for precision */ + rv = compare_floats(tv->y_ref, tv->y_iut, len * 2, 1e-5f, 1e-5f); + printf("IUT: %s\n", rv ? "!!! FAIL !!!" : "PASS"); + + if (rv) + dump_floats(tv->y_iut, 2 * len, "y_iut"); } int main(void) { -#if DO_INIT == 1 + struct test_vec *tv; + int i; + convolve_init(); -#endif - printf("==== TEST COMPLEX BASE IMPLEMENTATION ====\n"); - test_convolve_complex(17); + /* Alloc test vectors */ + /* All *2 is to account for the facts all vectors are actually + * complex and need two floats */ + tv = test_vec_alloc(100*2, 25*2); - printf("==== TEST COMPLEX SSE3 IMPLEMENTATION: (h_len%%4=0) ====\n"); - test_convolve_complex(20); + /* Dump all input data to make sure we work off the same input data */ + printf("==== TEST INPUT DATA ====\n"); + dump_floats(tv->x, tv->x_len, "x"); + dump_floats(tv->h, tv->h_len, "h"); + printf("\n"); + printf("\n"); - printf("==== TEST COMPLEX SSE3 IMPLEMENTATION: (h_len%%8=0) ====\n"); - test_convolve_complex(16); + /* Test complex */ + printf("==== TEST COMPLEX ====\n"); + + for (i=4; i<=24; i+=4) + { + printf(" -- h_len = %d --\n", i); + test_convolve_complex(tv, i); + printf("\n"); + } + + printf(" -- h_len = %d --\n", 25); + test_convolve_complex(tv, 25); printf("\n"); printf("\n"); - printf("==== TEST REAL BASE IMPLEMENTATION ====\n"); - test_convolve_real(17); + /* Test real */ + printf("==== TEST REAL ====\n"); - printf("==== TEST REAL SSE3 IMPLEMENTATION (hlen=4) ====\n"); - test_convolve_real(4); + for (i=4; i<=24; i+=4) + { + printf(" -- h_len = %d --\n", i); + test_convolve_real(tv, i); + printf("\n"); + } - printf("==== TEST REAL SSE3 IMPLEMENTATION (hlen=8) ====\n"); - test_convolve_real(8); + printf(" -- h_len = %d --\n", 25); + test_convolve_real(tv, 25); - printf("==== TEST REAL SSE3 IMPLEMENTATION (hlen=12) ====\n"); - test_convolve_real(12); + printf("\n"); + printf("\n"); - printf("==== TEST REAL SSE3 IMPLEMENTATION (hlen=16) ====\n"); - test_convolve_real(16); - - printf("==== TEST REAL SSE3 IMPLEMENTATION (hlen=20) ====\n"); - test_convolve_real(20); - - printf("==== TEST REAL SSE3 IMPLEMENTATION (h_len%%4=0) ====\n"); - test_convolve_real(24); + /* All done ! */ + test_vec_release(tv); return 0; } diff --git a/tests/Transceiver52M/convolve_test.ok b/tests/Transceiver52M/convolve_test.ok index 5766252..aa51412 100644 --- a/tests/Transceiver52M/convolve_test.ok +++ b/tests/Transceiver52M/convolve_test.ok @@ -1,72 +1,748 @@ -==== TEST COMPLEX BASE IMPLEMENTATION ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995,0.446645} - -float y[] = {0.389293,10.824917,-0.676577,10.619646,0.283489,11.279525,0.384482,11.586230,0.711259,11.540458,-0.391531,11.281723,0.019900,12.278080,-0.070459,11.104558,0.087938,11.825965,-1.003252,11.698885,0.358887,11.911197,-0.678904,11.933812,0.245140,11.886644} - -==== TEST COMPLEX SSE3 IMPLEMENTATION: (h_len%4=0) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995,0.446645,0.327805,0.785346,0.676628} - -float y[] = {-0.641594,12.367426,-0.970113,12.963129,-0.466783,13.747334,0.637486,13.341836,-0.168561,14.091346,0.306652,15.018833,0.233741,14.726789,-0.011241,15.034849,0.000155,13.639509,0.558827,15.495646,-0.406179,14.103148,-0.000244,15.591370,-0.492319,14.785577} - -==== TEST COMPLEX SSE3 IMPLEMENTATION: (h_len%8=0) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995} - -float y[] = {-0.278295,10.097409,0.919633,11.502825,0.340383,10.979163,0.891132,11.679869,0.425363,11.186544,1.099703,12.121126,0.188196,11.180099,0.228905,12.436676,0.149904,11.522589,0.543155,11.703615,0.033465,12.425473,0.561782,12.373415,-0.218184,12.154579} +==== TEST INPUT DATA ==== +float x[] = { + 3.4018773e-01, -1.0561708e-01, 2.8309923e-01, 2.9844004e-01, + 4.1164738e-01, -3.0244863e-01, -1.6477725e-01, 2.6822960e-01, + -2.2222528e-01, 5.3969979e-02, -2.2602946e-02, 1.2887090e-01, + -1.3521552e-01, 1.3400912e-02, 4.5222974e-01, 4.1619509e-01, + 1.3571173e-01, 2.1729696e-01, -3.5839742e-01, 1.0696888e-01, + -4.8369944e-01, -2.5711322e-01, -3.6276841e-01, 3.0417675e-01, + -3.4332091e-01, -9.9055618e-02, -3.7020957e-01, -3.9119118e-01, + 4.9892449e-01, -2.8174311e-01, 1.2932420e-02, 3.3911222e-01, + 1.1263984e-01, -2.0396838e-01, 1.3755226e-01, 2.4287164e-02, + -6.4170063e-03, 4.7277504e-01, -2.0748320e-01, 2.7135772e-01, + 2.6744962e-02, 2.6991385e-01, -9.9771380e-02, 3.9152944e-01, + -2.1668527e-01, -1.4754164e-01, 3.0772454e-01, 4.1902649e-01, + -4.3024471e-01, 4.4932705e-01, 2.5995374e-02, -4.1394415e-01, + -3.0778617e-01, 1.6322690e-01, 3.9023262e-01, -1.5110707e-01, + -4.3582869e-01, -4.7997695e-01, -4.2298257e-02, -4.3690416e-01, + -2.6172006e-01, 4.7063410e-01, 4.0220809e-01, 3.5091978e-01, + -2.3333424e-01, 3.9760351e-02, -1.2479302e-01, 2.6024872e-01, + 1.2535393e-02, 1.6772377e-01, 3.1606436e-02, -4.6071965e-01, + -6.2362403e-02, 4.3183506e-01, 4.3080980e-01, 2.2095233e-01, + -2.1570659e-01, 2.3853433e-01, 1.3997883e-01, -1.4595133e-01, + 1.8786138e-01, -3.3402583e-01, -5.9895486e-02, 3.8007522e-01, + 3.2920110e-01, -1.6966286e-01, -2.7103183e-01, 3.9337242e-01, + -1.4963982e-01, 1.8666989e-01, 4.5646822e-01, 8.8640153e-02, + 1.5730405e-01, 3.5867631e-01, -6.0440093e-02, 4.2396981e-01, + -1.0156333e-01, 3.1476688e-01, 1.8421853e-01, 4.1097206e-01, + -1.7509341e-02, -2.8417504e-01, 4.5025235e-01, 4.2012823e-01, + -3.5233998e-01, 3.8106215e-01, 1.4108062e-01, -6.8046570e-02, + 1.1959648e-01, -2.1894059e-01, 2.8600210e-01, -1.9254214e-01, + -5.2966416e-02, -2.7389336e-01, -3.1246689e-01, -2.2376531e-01, + 5.6443751e-02, -8.3498716e-02, -3.3039290e-01, 4.0680391e-01, + -3.9682883e-01, -3.7392467e-01, -4.5559406e-03, 2.6047522e-01, + 4.8475164e-01, 4.3500400e-01, 1.8444502e-01, -1.1681166e-01, + 2.4977088e-01, -1.3133645e-01, -2.0583963e-01, -2.6773846e-01, + 8.4488511e-02, -2.5558728e-01, -3.4761021e-01, 2.3214853e-01, + -3.7452510e-01, 2.9347038e-01, -3.3589807e-01, 2.4507141e-01, + -4.2547020e-01, 4.5010406e-01, -4.4747072e-01, 2.1563351e-02, + -3.2378936e-01, -2.5993764e-01, 2.9779804e-01, 2.3265439e-01, + 1.5656364e-01, 4.6740514e-01, 1.3945836e-01, 2.5973487e-01, + -4.0651953e-01, -3.6509758e-01, 2.0210087e-02, -4.2176786e-01, + -4.3009359e-01, -2.9534492e-01, -3.8579524e-02, 3.1967729e-01, + 7.3318601e-02, 2.5558084e-01, -4.4806117e-01, -3.4219289e-01, + 4.9999356e-01, -2.9567140e-01, 3.8995564e-01, -3.7453151e-01, + 4.9779898e-01, -4.4594243e-01, 3.7053984e-01, -4.2767119e-01, + -4.9583840e-01, 4.2306912e-01, 9.3892157e-02, -3.1962773e-01, + -3.3686849e-01, -1.0830978e-01, 4.1302669e-01, 3.1969517e-01, + -1.4090464e-01, 5.2485049e-02, 7.9429984e-02, -4.7424167e-02, + 1.8738741e-01, -4.0035993e-01, 3.0807972e-02, 2.5729382e-01, + -1.9570485e-01, 4.9222845e-01, 7.6971114e-02, 3.7761378e-01, + 2.4780929e-01, 1.2890995e-01, -4.6457911e-01, 2.4780285e-01, + 3.3323854e-01, 4.2537653e-01, 3.7327135e-01, 3.3103752e-01 +} +float h[] = { + 4.7943413e-01, 2.4381119e-01, 4.0336633e-01, 4.8359573e-01, + 1.6688031e-01, -2.7414858e-03, -3.3603200e-01, 3.3001184e-01, + 3.8894874e-01, -4.2300531e-01, 1.4970696e-01, -2.5195587e-01, + 1.2947971e-01, -2.7086303e-01, 2.0061994e-01, -1.8313286e-01, + -1.7122295e-01, -2.6857203e-01, -4.2583904e-01, 1.3307220e-01, + -2.7634358e-01, 1.5113211e-01, 1.0685980e-02, 4.7146571e-01, + -2.1995798e-01, 4.6106875e-02, 2.1926856e-01, -3.8671944e-01, + -2.8516561e-02, 9.2539907e-02, 4.4431812e-01, -4.9082428e-02, + -1.6364887e-01, 3.4768444e-01, -6.5486699e-02, -4.9676853e-01, + -1.5505704e-01, 9.8481297e-02, 3.3324331e-01, -2.6610827e-01, + 1.7547596e-01, -1.7049730e-02, -1.8064171e-02, -1.9504431e-01, + 2.1208727e-01, -3.1744421e-01, 1.2182283e-01, -4.5913571e-01, + -8.6016268e-02, 1.9598377e-01 +} +==== TEST COMPLEX ==== + -- h_len = 4 -- +float y_ref[] = { + 1.9343475e-01, 9.3477979e-02, 4.0537333e-01, 2.4291979e-01, + 3.0472055e-03, -5.7278976e-02, -2.2253948e-01, -2.4831513e-02, + -5.0298059e-01, 2.4738863e-02, -1.4398363e-01, 3.6272820e-02, + 2.1425188e-02, 2.4170342e-01, 2.5287169e-01, 4.0868199e-01, + -2.4411464e-01, -2.5641626e-01, -1.8032607e-01, -4.0198106e-01, + -2.6670712e-01, -3.0024880e-01, -4.7619563e-01, 4.6459973e-02, + -1.3436908e-01, -6.2609112e-01, 2.8793404e-01, 1.2088522e-02, + 1.1311802e-01, 1.3249211e-01, -6.3249446e-02, -1.9376054e-02, + 1.2786689e-01, -7.4752592e-02, -3.0313748e-01, 1.9675869e-01, + -4.2374337e-01, 1.1469635e-01, -1.7944857e-01, 2.4500139e-01, + -5.6082594e-01, 1.8232608e-01, -1.1055143e-01, -2.2480465e-01, + -8.9124054e-02, 4.1810924e-01, -2.9270607e-01, 2.3528263e-02, + -2.3733716e-01, 1.6376571e-01, 2.7985922e-01, -2.8395247e-01, + 1.2747175e-01, 1.8492913e-01, 2.0462361e-01, -6.9898784e-01, + -1.9105226e-01, -4.3899474e-01, -1.1355378e-01, -1.8941317e-01, + -3.3047011e-01, 3.7652293e-01, -8.5748151e-02, 1.6105306e-01, + -1.5378098e-01, 2.0000164e-01, -3.1687921e-01, -7.4600063e-02, + -2.6237980e-02, 5.3075723e-02, -4.0242106e-02, -1.8479857e-01, + -1.0247727e-01, 6.2493140e-01, 2.0375948e-02, 3.5236996e-01, + -1.0939813e-01, -1.3314986e-01, 2.7642086e-01, 1.4951222e-01, + -2.0726323e-02, -2.4084167e-01, 3.7983395e-02, 2.1266100e-01, + -3.0746281e-01, 1.7893985e-01, -4.7129101e-01, 7.0373103e-02, + -6.8367735e-02, 2.0652397e-01, 8.5595772e-03, 3.0616778e-01, + -4.5505679e-01, 3.2760209e-01, -1.9399881e-01, 4.2417210e-01, + -5.4352093e-01, 3.4104413e-01, 1.8741676e-01, -5.6594178e-02, + -4.3370463e-02, 3.8067535e-01, -1.5754598e-01, 3.9581478e-01, + -1.8522340e-01, 2.5978774e-01, 3.9373603e-01, 1.2938097e-02, + 4.8844910e-01, -8.8651918e-02, 2.5098252e-01, -1.4847451e-01, + 9.5206015e-03, -6.4541638e-01, 1.7062227e-01, -1.2636250e-01, + -4.3425602e-01, -1.7230041e-01, -5.4331875e-01, -1.7097193e-01, + -1.6823083e-01, -1.7737076e-03, -9.0653047e-02, 6.4022112e-01, + 4.5608354e-01, 3.6825955e-01, 3.0204356e-01, 1.2642944e-01, + 2.5181353e-01, -4.4521901e-01, 9.5902674e-02, -4.2330515e-01, + -1.7935884e-01, -3.1960091e-01, -5.7719946e-01, -2.8603512e-01, + -4.3163729e-01, -9.2835695e-02, -4.9010974e-01, -3.2805949e-03, + -7.3624301e-01, -1.1802941e-01, -3.8121629e-01, -4.2757961e-01, + -1.8941823e-01, 7.0607528e-02, 2.0424317e-01, 4.7988847e-01, + -4.4694379e-02, 5.2305567e-01, 2.6032710e-01, -2.9846272e-01, + -5.8884420e-02, -6.0276937e-01, -3.2680467e-02, -5.3263980e-01, + -2.7922690e-02, -1.2659723e-01, -3.3661029e-01, 4.9088931e-01, + 3.2778956e-02, -1.0467410e-02, 2.5721970e-01, 9.9789083e-02, + 7.4869239e-01, 2.0786656e-01, 7.8238732e-01, -4.0181538e-01, + 6.9601524e-01, 1.2460417e-01, 4.1056134e-02, -3.1220391e-01, + -4.4923437e-01, 1.0146232e-02, 1.3927090e-01, -3.4886351e-01, + -1.5751208e-01, 2.4592637e-01, 1.2013673e-01, 3.9524502e-01, + -9.0466201e-02, -1.3352618e-01, 2.2801059e-01, -2.6137942e-01, + -1.0633877e-01, -4.6385981e-02, -4.7687450e-01, 3.3604053e-01, + -2.4935976e-01, 1.6206253e-01, -3.4675413e-01, 3.8130435e-01, + -3.9775372e-01, 7.9527527e-02 +} +IUT: PASS -==== TEST REAL BASE IMPLEMENTATION ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} + -- h_len = 8 -- +float y_ref[] = { + 3.1198353e-01, 2.7249879e-01, 6.7253590e-01, 2.8881702e-01, + 1.5280618e-01, 3.1966239e-02, 4.2916775e-02, 9.2015103e-02, + -5.3432661e-01, 3.8334787e-01, -4.2692611e-01, 4.9350762e-01, + -4.7033417e-01, 5.5272996e-01, 5.8690500e-02, 6.5384853e-01, + -5.2055192e-01, -2.2096071e-01, -4.0731701e-01, -5.8656257e-01, + -1.1307193e-01, -6.5060866e-01, -2.5256541e-01, 1.7588115e-01, + -1.4830187e-02, -6.2870300e-01, 5.7129776e-01, 1.7633122e-01, + 4.7617540e-01, 5.3651673e-01, 6.5487638e-02, 2.9540601e-01, + 4.0660924e-01, 1.6996843e-01, -9.6623927e-02, 5.6359464e-01, + -4.2338252e-01, 2.2107749e-01, 2.5678758e-02, 4.8195598e-01, + -5.8352947e-01, 4.7328997e-01, -4.4623044e-01, -4.3656242e-01, + -3.9437938e-01, 4.6684524e-01, -4.8115996e-01, -6.5126479e-02, + -4.8775205e-01, 2.3525867e-01, 2.6559117e-01, -3.1239271e-01, + 3.7656814e-01, 5.7330167e-01, 5.7215315e-01, -5.6904000e-01, + -2.4907845e-01, -3.3432126e-01, -6.1997123e-02, 1.6389854e-02, + -1.3020961e-01, 3.9775756e-01, -5.2837055e-02, 4.8124433e-02, + 1.6283178e-01, 3.5327283e-01, -7.2935686e-02, -2.3906565e-01, + -3.3615954e-02, 1.7306522e-01, 2.6595213e-02, -4.2700648e-01, + -6.9573633e-02, 5.0495386e-01, 2.4001123e-01, 6.0639191e-01, + 1.4440927e-01, -2.1232469e-01, 5.4238892e-01, 4.1379702e-01, + 2.7374083e-01, -1.0671920e-01, 5.1122200e-01, 2.2112623e-01, + 1.8754447e-01, 4.4758397e-01, -1.7173983e-01, 2.8306428e-01, + 2.4443226e-01, 3.5680223e-01, 3.5102800e-01, 4.2337304e-01, + -3.3537811e-01, 2.7921921e-01, 1.8583983e-01, 4.3009305e-01, + -5.3709638e-01, 4.4081950e-01, 1.0034083e-01, -3.5329488e-01, + -2.7987373e-01, 1.3525811e-01, -3.0972615e-01, 2.0086128e-01, + -4.3193302e-01, 3.3690983e-01, 8.4279850e-02, 1.7117807e-01, + 4.2224085e-01, 1.1130261e-01, 3.8781387e-01, 2.2697037e-01, + -4.1848086e-02, -7.1504021e-01, 4.7950408e-01, -2.1731076e-01, + -1.5708333e-01, -3.7279499e-01, -6.4571846e-01, -4.2268100e-01, + -3.1042582e-01, -9.2476785e-02, -3.3923823e-01, 8.1528240e-01, + 3.9577165e-01, 6.0557044e-01, 3.0287346e-01, 7.9299420e-01, + 2.2274709e-01, 2.0846851e-01, -4.6026833e-02, 1.1982823e-01, + -2.2598577e-01, 1.9759813e-01, -6.3750428e-01, -3.1139046e-02, + -3.4190997e-01, -5.2494712e-02, -1.9467109e-01, -1.1175934e-02, + -6.1602581e-01, -2.4191037e-02, -6.2194943e-01, -3.7835273e-01, + -6.9009584e-01, 1.8178366e-01, 3.7999839e-02, 4.6113190e-01, + -3.3597833e-01, 6.7432904e-01, 3.5137755e-01, -2.1184278e-01, + -8.1254162e-02, -7.9297805e-01, -3.8410002e-01, -9.8119044e-01, + -5.4825153e-02, -9.5365292e-01, -4.7106034e-01, 8.0184937e-03, + -3.8255863e-03, -4.4410813e-01, 9.0961985e-02, -6.1882250e-02, + 7.3677480e-01, 5.7637358e-01, 7.2739714e-01, -5.3133565e-01, + 6.6477937e-01, 1.8967161e-01, 2.9077831e-01, -4.6150434e-01, + -5.1277536e-01, 6.4325705e-03, 2.0184588e-01, -3.4849805e-01, + 8.0386028e-03, 2.2010116e-01, 5.2124852e-01, 6.1381078e-01, + 1.6747525e-01, 2.6221049e-01, 6.3898122e-01, -7.9696737e-03, + 3.3133650e-01, 1.5950076e-02 +} +IUT: PASS -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995,0.446645} + -- h_len = 12 -- +float y_ref[] = { + 5.1073134e-01, -6.4233445e-02, 1.1001339e+00, 1.1007318e-01, + 5.7089889e-01, -1.7514147e-01, 6.4569569e-01, 4.1822547e-01, + -5.4747516e-01, 7.7281708e-01, -6.0102689e-01, 8.0545586e-01, + -6.9234514e-01, 4.6278694e-01, -1.3791974e-01, 7.1026200e-01, + -8.5625696e-01, -4.3486625e-01, -5.9517044e-01, -9.2069548e-01, + -1.6659707e-01, -9.8640192e-01, -1.5582368e-01, -1.5324977e-01, + -6.8623766e-02, -7.0452332e-01, 4.4063550e-01, -9.7249970e-02, + 5.3327537e-01, 3.0112669e-01, 2.2389071e-01, -1.3262859e-01, + 7.8076601e-01, 4.7906137e-01, 3.3731923e-02, 4.0715045e-01, + -7.4400723e-02, 4.3422836e-01, 2.0777807e-02, 5.4539984e-01, + -7.2161388e-01, 8.7671280e-01, -6.9292784e-01, -7.3140836e-01, + -5.0670183e-01, 2.5833350e-01, -4.4549638e-01, -3.6429164e-01, + -2.2987276e-01, 1.2921053e-01, 1.8583019e-01, -2.8588608e-01, + 3.1971890e-01, 8.1832850e-01, 1.4488581e-01, -7.8593260e-01, + -2.4141420e-01, -4.6235585e-01, 1.2655887e-01, -1.2093870e-01, + -2.5066316e-01, 5.9214741e-01, -1.0893403e-01, 2.4207115e-01, + -2.3780495e-01, 1.6324958e-01, -1.5237269e-01, -3.9022326e-01, + -9.6253231e-02, 5.2076980e-02, -8.9428246e-02, -3.9848536e-01, + -4.9820563e-01, 4.3686843e-01, -1.2591672e-01, 1.6599865e-01, + -2.8170899e-02, -5.1566052e-01, 6.8874002e-01, 1.1286099e-01, + 9.7053885e-02, 8.8207424e-03, 2.6398507e-01, 9.8689049e-03, + -6.0056053e-02, 2.8918642e-01, 3.9130948e-02, -2.4782214e-02, + 4.4995353e-01, 6.4529550e-01, 3.6543220e-01, 5.7481551e-01, + -3.5263625e-01, 3.2261267e-01, 3.0429733e-01, 5.3616601e-01, + -6.3705307e-01, 4.3583199e-01, 2.8269362e-01, -5.4143071e-01, + -1.8208441e-01, -3.8809724e-02, -1.6317154e-01, 4.8688924e-01, + -6.3979185e-01, 4.3474686e-01, -7.8023329e-02, 1.8357828e-01, + 4.6792713e-01, -4.4948310e-02, 4.5472518e-01, 3.6658123e-01, + -9.4489828e-02, -7.5101864e-01, 3.5948592e-01, -2.8623044e-01, + -1.8304718e-01, -7.9028600e-01, -5.6438643e-01, -8.5815549e-01, + -2.2451524e-02, -5.9062058e-01, 1.4486849e-01, 3.8622388e-01, + 7.9944402e-01, 7.3982805e-01, 2.2160605e-01, 1.0366077e+00, + -1.8426970e-01, 2.4351463e-01, -7.3407546e-02, -4.2445374e-01, + 1.4537066e-01, 2.7947389e-02, -1.7712221e-01, -9.8013066e-02, + -3.1047958e-01, 3.0333564e-01, -2.4632016e-01, 6.7275390e-02, + -5.5016017e-01, -2.7382451e-01, -2.7444303e-01, -2.6239043e-01, + -3.1040829e-01, 5.4154611e-01, 1.3651639e-02, 1.2248676e+00, + -4.8179182e-01, 1.1706464e+00, -2.1114275e-01, -5.1367894e-02, + -1.6235633e-01, -7.6988780e-01, -3.3773273e-01, -1.3110837e+00, + 1.0939775e-01, -5.6715608e-01, -6.0381925e-01, -5.2970968e-02, + -1.3944679e-01, -4.1512328e-01, 3.3509767e-01, -1.5947121e-01, + 6.3523126e-01, 7.9222643e-01, 3.9298099e-01, -5.0257689e-01, + 2.8029183e-01, -2.2847716e-02, 2.3597348e-01, -7.2399336e-01, + -6.3985258e-01, -3.9040399e-01, 6.1344981e-02, -4.3278030e-01, + -1.4337064e-01, 7.6462559e-02 +} +IUT: PASS -float y[] = {5.354852,5.387001,4.829278,5.046340,5.849788,5.775999,5.653334,5.372714,5.999860,5.593828,5.628739,5.178002,6.010774,6.186034,6.337766,5.538046,5.616131,6.289612,5.486091,5.835261,6.277413,5.894117,5.563587,6.082063,5.828556,6.160175} + -- h_len = 16 -- +float y_ref[] = { + 3.9259350e-01, 2.0336020e-01, 1.2083304e+00, -1.8030062e-01, + 6.8609583e-01, -5.3055910e-04, 5.8721924e-01, 4.7836140e-01, + -6.4573079e-01, 8.9168346e-01, -4.4504160e-01, 1.0042783e+00, + -7.0414054e-01, 6.7187703e-01, -1.3145420e-01, 6.1453128e-01, + -5.6792223e-01, -2.1333663e-01, -9.1251004e-01, -7.2268122e-01, + 7.9308510e-02, -1.2288902e+00, -2.5458413e-01, 1.3551895e-01, + 1.0557353e-02, -1.0434419e+00, 2.3528877e-01, -1.6334504e-03, + 6.3718635e-01, -1.5170360e-01, -1.8770680e-01, 2.1240243e-01, + 8.8036948e-01, 5.8363783e-01, 4.2129651e-02, 7.6204038e-01, + 1.4566663e-01, 3.3907735e-01, -1.2638038e-01, 6.4064759e-01, + -6.2329191e-01, 7.5265288e-01, -5.7464683e-01, -5.5148101e-01, + -5.2435344e-01, 1.6771759e-01, -3.9474785e-01, 7.4480176e-03, + -1.7047867e-02, -1.8528795e-01, 2.0242094e-01, -3.1942075e-01, + 3.4801385e-01, 8.6850441e-01, 1.3732195e-01, -1.0011898e+00, + -2.2828943e-01, -5.0333396e-02, 4.2781591e-02, -3.1782448e-01, + -2.8394341e-02, 8.3352113e-01, 3.8200065e-02, 4.3320811e-01, + -1.2285206e-01, 1.5387420e-01, -1.5085199e-01, -2.4370183e-01, + 7.9104662e-02, 2.5195837e-01, -6.1237380e-02, -5.0630927e-01, + -4.3581635e-02, 5.5287701e-01, -4.8868680e-01, 2.4484858e-01, + 2.8410962e-01, -6.1659271e-01, 6.8510634e-01, 1.7286855e-01, + 2.9607964e-01, -2.4299805e-01, 1.5033059e-01, -1.5005481e-01, + -2.1097726e-01, 1.0886001e-01, -8.1835359e-02, -7.1222454e-02, + 1.9846845e-01, 9.7944200e-01, 2.0166935e-01, 3.8065171e-01, + -2.1964781e-01, 6.5044796e-01, 3.3935797e-01, 6.6456228e-01, + -4.1065484e-01, 5.3015858e-01, 6.5628278e-01, -7.4122947e-01, + -4.1306469e-01, -2.9108244e-01, -1.3873807e-01, 2.6657555e-01, + -9.5916164e-01, 6.3136345e-01, -2.6429197e-01, 2.5425220e-01, + 3.2098943e-01, 2.8284523e-01, 3.7179819e-01, 6.9147599e-01, + -2.3179966e-01, -6.6986769e-01, 3.5698265e-01, -2.3401824e-01, + -2.2967517e-02, -6.6492826e-01, -5.7599217e-01, -5.9439480e-01, + 2.4301717e-01, -5.0280505e-01, 5.7166010e-02, 2.5395346e-01, + 9.0813631e-01, 4.3165860e-01, -2.1851237e-01, 9.6684217e-01, + -1.9854844e-01, 3.1733474e-01, -2.5028959e-01, -1.3191071e-01, + 1.2713718e-01, 2.7541250e-02, 1.8362647e-01, -3.3003873e-01, + -4.0098429e-01, 2.1789065e-01, 8.6135000e-02, -3.1211060e-01, + -5.3512049e-01, -5.6808853e-01, -5.7678592e-01, -1.9351965e-01, + -4.8246443e-01, 2.2094266e-01, -1.2133773e-01, 1.6067516e+00, + -2.7641732e-01, 1.0420220e+00, -4.3420127e-01, 1.8913136e-01, + 1.6305616e-01, -8.9072859e-01, -3.8818783e-01, -1.4747425e+00, + 1.9507036e-01, -4.8474717e-01, -8.2032663e-01, 2.4695456e-02, + -4.3185152e-02, -1.4206313e-01, 5.4319465e-01, 1.0437109e-02, + 6.0523671e-01, 8.8012832e-01, 6.2208772e-01, -5.2706617e-01, + 3.4703535e-01, 3.4169286e-01 +} +IUT: PASS -==== TEST REAL SSE3 IMPLEMENTATION (hlen=4) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} + -- h_len = 20 -- +float y_ref[] = { + 4.0563765e-01, 2.7768248e-01, 1.4988428e+00, -1.4390233e-01, + 7.1137142e-01, 1.2297645e-01, 5.2460098e-01, 2.6881298e-01, + -2.8073692e-01, 9.4002217e-01, -7.3673451e-01, 1.2523794e+00, + -5.0840402e-01, 1.8347138e-01, -9.8511763e-02, 1.0402999e+00, + -7.3959279e-01, -6.3208389e-01, -9.9019027e-01, -4.8580292e-01, + -4.3206736e-02, -1.6494110e+00, -3.8819546e-01, 8.3392441e-01, + 2.5613919e-01, -1.1556400e+00, 4.8095024e-01, 2.1489243e-01, + 7.2430336e-01, -4.5171279e-01, -2.9797465e-01, 4.0803951e-01, + 9.1165602e-01, 3.5424012e-01, 1.8917093e-01, 8.9390326e-01, + 2.3863241e-02, 2.1634607e-01, 1.5027168e-01, 8.7479091e-01, + -6.6391504e-01, 2.8770256e-01, -6.2296259e-01, -4.7120559e-01, + -5.6871128e-01, 2.0659479e-01, -5.0873393e-01, -2.0042220e-01, + 2.4109995e-01, 2.0149592e-01, -2.2671439e-02, -5.4053026e-01, + 7.4681568e-01, 9.8399460e-01, 2.1579692e-01, -9.8881048e-01, + -2.2159560e-01, -2.4822801e-01, 1.2267539e-01, -2.1502660e-01, + 1.9123185e-01, 8.6089939e-01, -8.6792998e-02, 2.3703022e-01, + 2.6896733e-01, 1.1151828e-02, -5.9111112e-01, -1.9654661e-02, + 4.0600595e-01, -1.1281250e-01, -1.0220084e-01, -3.4878132e-01, + -1.1436477e-01, 2.0784064e-01, -7.2063136e-01, 2.4080434e-01, + 9.7794682e-02, -6.2281477e-01, 6.3973004e-01, 3.0914345e-01, + 3.0690259e-01, 1.9527674e-01, 1.3511479e-02, -3.5927096e-01, + 1.9869280e-01, 3.8655108e-01, -7.6620430e-02, -5.5920191e-02, + 4.3548766e-01, 7.8014821e-01, 3.2739228e-01, -6.8113729e-03, + -6.8596470e-01, 6.7433977e-01, 2.8661230e-01, 5.4591709e-01, + -5.6738234e-01, 9.7609603e-01, 6.3488019e-01, -6.6698337e-01, + -2.1748835e-01, 2.6263937e-02, 1.3686508e-02, 4.6669549e-01, + -9.7789866e-01, 6.1850429e-01, -1.5288228e-01, 2.3137388e-01, + 5.1109362e-01, 2.8883606e-01, 4.3707043e-01, 8.1758893e-01, + 5.2922159e-02, -9.1069019e-01, 1.6946894e-01, -3.1696463e-01, + -9.7715080e-02, -9.0262455e-01, -1.0273845e+00, -2.7913937e-01, + 3.9362526e-01, -4.4658157e-01, 1.4889301e-01, 5.7529253e-01, + 9.6562743e-01, 3.0147529e-01, -1.0069013e-02, 6.2530518e-01, + -4.5818228e-01, 4.1249818e-01, -2.1397476e-01, -6.4531231e-01, + -8.7075405e-02, -4.2375207e-02, -7.2089776e-02, 2.4483189e-02, + -5.8266813e-01, 6.1949864e-02, 2.9266685e-01, 2.1767689e-01, + -4.8038912e-01, -8.5518450e-01, -6.4128172e-01, 1.1196103e-01, + -2.2738291e-01, -1.6352636e-01, -3.1652111e-01, 1.5964899e+00, + -2.1126030e-01, 1.1061658e+00, -6.0621572e-01, 3.3688825e-01, + 5.0539368e-01, -7.8245437e-01, -1.5758494e-01, -1.5151085e+00, + 9.8507836e-02, -4.8568571e-01, -6.4452505e-01, -1.7298427e-01, + 1.4388496e-01, 1.1540639e-01 +} +IUT: PASS -float h[] = {0.726144,0.746635,0.470674,0.211604} + -- h_len = 24 -- +float y_ref[] = { + 6.3018608e-01, 2.8423050e-01, 1.8153185e+00, 2.1489501e-01, + 6.1149991e-01, 2.0270358e-01, 5.9271133e-01, 4.7805154e-01, + -4.6508217e-01, 9.6335644e-01, -9.4050735e-01, 1.2220898e+00, + -1.0467027e+00, 1.4672846e-01, -8.1817716e-02, 1.1990718e+00, + -6.0469484e-01, -6.5175623e-01, -7.2200888e-01, -4.6047974e-01, + 4.7492534e-02, -1.4756467e+00, -1.6498202e-01, 1.0429246e+00, + 1.1710593e-01, -1.1640908e+00, 5.4710066e-01, 2.3070689e-01, + 9.1671783e-01, -4.7983694e-01, 2.9820830e-02, 3.6921877e-01, + 9.2340273e-01, 3.8007712e-01, 1.7183515e-01, 7.6075757e-01, + 6.0101196e-02, 1.8053912e-01, 1.7395832e-01, 7.4399179e-01, + -3.9787713e-01, 2.6257843e-01, -5.3116250e-01, -2.0372190e-01, + -3.0838940e-01, 1.0527763e-01, -2.0168084e-01, -2.5559211e-01, + 5.6158608e-01, 2.5170538e-01, 3.7997139e-01, -3.7583706e-01, + 1.1538334e+00, 1.1128649e+00, 3.1257099e-01, -8.9715719e-01, + -3.3971965e-03, -4.4487441e-01, 4.6779409e-01, 1.6864493e-02, + 2.8930783e-01, 8.3552551e-01, 2.4338216e-03, 2.2411425e-01, + 1.0011864e-01, -1.8143091e-01, -7.4504924e-01, -1.9404535e-01, + 1.4155512e-01, -1.3064578e-01, -2.7652603e-01, -3.5652000e-01, + -3.4334987e-02, 3.9129543e-01, -9.5754206e-01, 5.2517068e-01, + 1.0776453e-01, -5.0084651e-01, 8.6342621e-01, 3.5743105e-01, + 4.9151617e-01, -2.7927294e-02, 6.5405264e-02, -6.2989593e-01, + 1.2833342e-01, 3.7550265e-01, -3.1207931e-01, -1.8727586e-01, + 4.2959970e-01, 9.0468168e-01, 3.2441798e-01, 3.0514628e-01, + -5.3860873e-01, 1.0568659e+00, 4.5496196e-01, 1.0691149e+00, + -5.6619692e-01, 1.5336677e+00, 4.2874324e-01, -2.7978027e-01, + -2.8027374e-01, 1.3865612e-01, 2.6137283e-01, 4.8582289e-01, + -6.8132639e-01, 5.3316730e-01, -1.1344668e-01, 3.8112825e-01, + 2.0137414e-01, 3.2724720e-01, 8.4503561e-02, 1.0122974e+00, + -1.5016308e-01, -8.3359891e-01, 3.3556390e-01, -2.2457816e-01, + -2.3018801e-01, -7.5040269e-01, -1.2586766e+00, -4.3722793e-01, + 2.3992740e-01, -7.5550735e-01, -1.8255928e-01, -5.5400416e-02, + 7.8102481e-01, -3.0305600e-01, 3.2669067e-02, 5.3476524e-01, + -5.7471651e-01, 4.2629388e-01, -2.3708928e-01, -5.9372860e-01, + -1.3963582e-01, -3.8945466e-02, 1.1991196e-01, 4.2234767e-02, + -6.1405408e-01, -2.4031635e-02, 2.2417614e-01, 1.2318638e-01, + -4.8036790e-01, -9.8540503e-01, -4.1925645e-01, 2.6757696e-01, + 1.4580157e-01, -7.0448965e-02, 1.8385217e-02, 1.6279721e+00, + -1.4290724e-02, 1.3662102e+00, -3.4957036e-01, 4.5002824e-01, + 1.0109739e+00, -8.2454365e-01 +} +IUT: PASS -float y[] = {1.154625,1.856899,1.754012,1.866038,1.759821,1.614741,1.946849,1.905307,2.034228,1.369325,1.929276,1.644739,1.911431,1.455565,1.751712,1.711433,1.206255,1.551974,1.351406,1.252433,1.410497,1.527218,1.666560,1.330974,1.544475,1.701906} + -- h_len = 25 -- +float y_ref[] = { + 5.7913333e-01, 1.6126008e-01, 1.8942088e+00, 2.5559562e-01, + 6.0598469e-01, 1.2834232e-01, 5.8875954e-01, 5.6752849e-01, + -3.3352613e-01, 9.1922688e-01, -8.5124290e-01, 1.2513809e+00, + -1.1164272e+00, 5.4953381e-02, -1.8518874e-01, 1.2477132e+00, + -5.9241670e-01, -7.0090598e-01, -7.6227915e-01, -5.0732279e-01, + 1.3543148e-02, -1.4876170e+00, -7.7407114e-02, 1.0887483e+00, + 3.7837453e-02, -1.2134576e+00, 4.6674094e-01, 2.9613313e-01, + 8.8852322e-01, -5.4262978e-01, 4.6384465e-02, 4.0920654e-01, + 9.7270721e-01, 4.4562656e-01, 1.0249857e-01, 7.1632636e-01, + 6.5035716e-02, 2.5965095e-01, 1.2017685e-01, 6.5703750e-01, + -4.2158994e-01, 2.1719480e-01, -5.8779824e-01, -1.2188602e-01, + -3.9221483e-01, 1.0525467e-01, -2.7957320e-01, -3.0390570e-01, + 5.0863296e-01, 2.0472553e-01, 2.8358173e-01, -3.7508351e-01, + 1.2110332e+00, 1.1338770e+00, 1.9150364e-01, -8.4505290e-01, + -4.7772221e-02, -5.4670489e-01, 4.6899489e-01, 5.0367117e-02, + 3.2192940e-01, 8.7779695e-01, 1.5568122e-02, 2.9672778e-01, + 1.5835327e-01, -1.6825218e-01, -6.7431760e-01, -2.3603633e-01, + 1.5306443e-01, -1.1240147e-01, -3.2783383e-01, -4.5626339e-01, + 7.3081911e-02, 3.4568703e-01, -1.0081991e+00, 5.0187266e-01, + -1.9185714e-02, -4.4326046e-01, 8.7045413e-01, 4.0362698e-01, + 4.9577162e-01, 3.2320812e-02, 1.3558322e-01, -6.4720726e-01, + 1.7115699e-01, 4.1404569e-01, -3.2767653e-01, -2.7537036e-01, + 4.0429953e-01, 8.0603760e-01, 3.0528066e-01, 2.1823558e-01, + -5.9022444e-01, 9.3476439e-01, 4.8922566e-01, 9.7956312e-01, + -4.8740220e-01, 1.4925691e+00, 3.5753128e-01, -2.4142875e-01, + -3.8534456e-01, 1.2913561e-01, 1.9847333e-01, 4.9081305e-01, + -5.7480592e-01, 4.8490041e-01, -3.2525428e-02, 4.2136800e-01, + 2.9625201e-01, 2.6836032e-01, 2.5170468e-02, 9.7723901e-01, + -2.0655937e-01, -8.4121376e-01, 4.4116870e-01, -2.8295672e-01, + -2.1524879e-01, -6.2697953e-01, -1.2188171e+00, -3.2858714e-01, + 2.8450605e-01, -6.1958849e-01, -1.3061513e-01, 5.4006055e-02, + 7.4076033e-01, -4.3662310e-01, 8.7234661e-02, 5.8065975e-01, + -5.2451336e-01, 3.6958954e-01, -3.3527136e-01, -5.4028106e-01, + -1.3780195e-01, -7.1075052e-02, 1.2237406e-01, 6.1881006e-02, + -5.5170840e-01, 4.7130723e-02, 1.7110074e-01, 1.0709279e-01, + -5.6000286e-01, -1.0660996e+00, -4.9988338e-01, 2.5018114e-01, + 9.9221684e-02, -3.2970719e-02, 9.7812414e-03, 1.5156071e+00, + -1.2632155e-01, 1.3949302e+00, -4.4655573e-01, 4.9470875e-01 +} +IUT: PASS -==== TEST REAL SSE3 IMPLEMENTATION (hlen=8) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771} +==== TEST REAL ==== + -- h_len = 4 -- +float y_ref[] = { + 4.0135658e-01, -7.0862226e-02, 3.4894887e-01, 4.7711339e-02, + 1.0140251e-01, -7.1107626e-02, -1.2697329e-01, 1.6737098e-01, + -2.9018813e-01, -5.9761293e-02, -3.5513252e-02, 6.3626617e-02, + 2.6066792e-01, 1.7462157e-01, 3.7428492e-01, 3.9143768e-01, + -3.8318738e-02, 2.2069588e-03, -3.1210813e-01, 3.1620685e-02, + -3.1112182e-01, 1.1434813e-01, -5.4184294e-01, 1.3526961e-01, + -2.3501489e-01, -3.6625391e-01, -1.1934193e-02, -1.7606504e-01, + 2.1699335e-01, -4.0490393e-02, 7.6746441e-02, -7.4506484e-02, + 1.7813747e-01, -1.0028081e-01, 1.9746821e-02, 1.5693018e-01, + -4.8778683e-02, 2.4959795e-01, -3.2523207e-02, 3.5388958e-01, + -1.6698776e-01, 1.2190759e-01, 6.0691811e-02, 4.7138259e-02, + -6.0295239e-02, 3.1236699e-01, 8.1751533e-02, 2.5821042e-01, + -3.7828243e-01, 1.2646775e-01, 9.9887021e-02, 3.4521073e-03, + -4.8674144e-02, 8.4020123e-02, 9.2179805e-02, -4.9711126e-01, + -4.0484354e-01, -4.4573051e-01, 1.9680090e-02, 2.5572028e-02, + 3.9755218e-02, 2.8637058e-01, 7.3675327e-02, 1.7135073e-01, + -1.7073457e-01, 3.0684435e-01, -2.8543424e-02, -2.9569201e-02, + -1.3641408e-01, -1.0760858e-01, 1.3437629e-01, -8.9979589e-02, + 6.0840961e-02, 3.8501221e-01, 7.9768427e-02, 2.9003578e-01, + 4.5228135e-03, -1.2797011e-01, 2.2270113e-02, -8.4269598e-02, + 2.1191987e-01, -1.6733298e-01, 1.0912660e-01, 1.1670379e-01, + -1.2985474e-01, 7.8696609e-02, -1.6698521e-01, 1.5815806e-01, + 1.5894224e-01, 4.2638958e-02, 3.0633986e-01, 1.5215552e-01, + -2.7814813e-02, 2.5740543e-01, -3.3318136e-02, 4.9430701e-01, + -1.2860653e-01, 1.2808253e-01, 2.7479374e-01, 2.4469435e-02, + 6.7015857e-02, 1.1967997e-01, 5.7099588e-02, 4.1734684e-01, + -1.8816420e-01, 1.8340994e-01, 1.8140659e-01, -6.1031669e-02, + 2.6886207e-01, -1.5314770e-01, 4.4642828e-02, -2.1207440e-01, + -3.0990593e-02, -3.7220663e-01, -4.8828661e-02, 5.2576914e-02, + -1.7090029e-01, -2.5869820e-02, -4.8212141e-01, -5.8500014e-02, + -1.7317493e-01, 3.7640739e-02, 1.4019746e-01, 3.2498634e-01, + 4.1765594e-01, 2.2948909e-01, 1.2643699e-01, -6.7774974e-02, + 1.6762753e-01, -2.9162568e-01, 3.2363981e-03, -2.9133266e-01, + -4.9335934e-02, -6.2273767e-02, -2.3081020e-01, 1.1932422e-01, + -2.3568818e-01, 3.0742079e-01, -2.9853183e-01, 3.8999829e-01, + -5.3858328e-01, 1.0293538e-01, -3.4805223e-01, -2.1274953e-01, + -5.5849046e-02, -4.0056542e-02, 3.6580348e-01, 4.6610707e-01, + 5.6683410e-02, 4.0965819e-01, 5.0782688e-02, 6.1182901e-03, + -2.4555746e-01, -5.0187629e-01, -1.9487143e-01, -3.5387760e-01, + -5.8964893e-02, 1.4498779e-01, -2.3170851e-01, 2.9860672e-01, + -1.9317985e-01, 6.1017931e-02, -1.1533570e-01, -1.9597384e-01, + 3.5556856e-01, -2.2353619e-01, 6.1620677e-01, -5.7297599e-01, + 2.7382869e-01, -2.0830113e-01, 1.0651228e-01, -5.1332355e-02, + -3.9485583e-01, -5.1595878e-02, 2.5408182e-02, -1.6121480e-01, + -4.5110412e-02, 1.0172162e-01, 9.1470033e-02, 3.0106306e-01, + -1.4596304e-02, -1.4723733e-01, 1.8457155e-01, -3.0669570e-01, + 4.3742776e-02, -1.3290963e-01, -1.3459724e-01, 3.4160227e-01, + 1.3468790e-01, 3.2655066e-01, -5.2647412e-02, 1.3145214e-01, + -1.3840751e-01, 1.2150692e-01 +} +IUT: PASS -float y[] = {2.966950,2.964003,3.035802,3.567513,2.983864,3.487861,3.089418,3.836586,2.979637,3.173361,3.524760,3.308944,3.511707,2.951268,3.500564,3.466951,3.174077,2.778949,3.124344,2.816606,3.196814,2.774090,3.272130,2.980138,2.646414,3.090803} + -- h_len = 8 -- +float y_ref[] = { + 3.8475716e-01, 5.4654378e-02, 4.0569583e-01, 1.9732465e-01, + 6.2182777e-02, 4.6007581e-02, -7.4207053e-02, 3.2404867e-01, + -4.2646566e-01, 6.8503045e-02, -3.6317283e-01, 8.6252578e-02, + -1.0049982e-01, 2.8848641e-02, 2.3394865e-01, 3.8774294e-01, + -1.6008082e-01, -6.3331984e-02, -3.5713595e-01, -1.5972351e-01, + -7.2949402e-02, 3.3994686e-02, -5.0342709e-01, 3.3462417e-01, + -2.1306737e-01, -3.2629669e-01, 1.9106627e-02, -6.5554529e-03, + 1.6688257e-01, 2.9751599e-01, -5.6339733e-02, 9.2541061e-02, + 2.0728275e-01, 1.2827794e-01, -9.7970009e-02, 4.3152642e-01, + -1.3748240e-01, 2.3007628e-01, -3.5626933e-02, 5.6328601e-01, + -2.9200286e-01, 2.2552194e-01, -1.2183771e-02, -2.0528683e-01, + -1.8650457e-01, 2.0343314e-01, 1.1030240e-01, 1.6542999e-01, + -5.0732625e-01, 5.7128072e-03, 4.9520131e-02, -4.2610306e-02, + -1.4550450e-01, 3.7696707e-01, 2.0004307e-01, -2.8732342e-01, + -5.0631702e-01, -4.6201745e-01, -3.5400115e-02, 1.7888573e-01, + 1.2771693e-01, 3.8287488e-01, 8.9138612e-02, 1.3326670e-01, + -1.3034222e-01, 5.0948876e-01, 1.6253988e-01, 6.1701983e-03, + -1.8704908e-01, -3.6797896e-03, 2.7523407e-01, -1.8157889e-01, + 1.1319310e-01, 3.6894363e-01, 4.0642001e-02, 5.0084931e-01, + 1.6419113e-01, -9.3116745e-02, -1.4887799e-02, 1.8011260e-01, + 2.3029631e-01, 5.0040189e-02, 2.8201744e-01, 3.2292062e-01, + -5.3912316e-02, 4.0487966e-01, -1.8535823e-01, 3.6638471e-01, + 2.3508060e-01, 2.7408370e-01, 3.6298230e-01, 4.0030634e-01, + 1.5463566e-02, 2.4546035e-01, 1.3131972e-01, 6.6202849e-01, + -1.7166492e-01, 1.9913296e-01, 3.7397668e-01, -1.1465289e-01, + 8.6804092e-02, -7.4657001e-02, 1.3127592e-01, 2.5572953e-01, + -3.1451899e-01, 1.1418183e-01, -5.4067936e-02, -1.8290916e-01, + 1.8905841e-01, -1.2088218e-01, -4.6610184e-02, 1.1169069e-02, + -8.6249888e-02, -4.4575977e-01, 9.5960915e-02, 1.7753810e-01, + 3.6300682e-02, 5.5117831e-02, -3.8269129e-01, -2.0953836e-01, + -1.6564047e-01, -4.0044457e-02, -4.7360756e-02, 2.7152115e-01, + 2.8259674e-01, 2.5199765e-01, -1.9368437e-01, 1.8848507e-01, + -1.7319113e-01, -7.8186467e-02, -3.1400359e-01, -1.7798539e-01, + -2.6399142e-01, 1.2904029e-01, -3.8335827e-01, 2.1269161e-01, + -2.6879328e-01, 3.5377583e-01, -2.2276390e-01, 5.1084721e-01, + -5.0539166e-01, 1.9172835e-01, -4.3833745e-01, -2.8024608e-01, + -2.7436692e-01, -2.1930990e-01, 3.1899008e-01, 3.5051215e-01, + -1.9677331e-01, 3.0708387e-01, 8.9047387e-02, 6.5093994e-02, + -1.4114627e-01, -5.6711900e-01, -1.4393200e-01, -6.6919637e-01, + 3.3267856e-01, -1.6962306e-01, -5.7009470e-02, 1.1567383e-01, + 1.0546455e-02, -1.8580100e-01, -1.0087056e-01, -3.6209401e-01, + 2.1601290e-01, -5.6721181e-02, 6.2750477e-01, -6.6158593e-01, + 2.0232803e-01, -2.0528597e-01, 2.9394233e-01, -5.5906028e-03, + -4.0732571e-01, -3.8501829e-02, 4.9082294e-02, -1.0753187e-01, + 2.2487987e-02, 1.2401126e-01, 1.3383606e-01, 5.4958242e-01, + -1.4030990e-01, 1.6715114e-01, 2.5830886e-01, -2.3100130e-02, + 1.8861046e-01, 7.5817898e-02 +} +IUT: PASS -==== TEST REAL SSE3 IMPLEMENTATION (hlen=12) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} + -- h_len = 12 -- +float y_ref[] = { + 6.4393055e-01, 4.6198644e-02, 7.6961976e-01, 2.0338218e-01, + 3.9040267e-01, -1.6305951e-02, 2.4174322e-01, 4.1924089e-01, + -3.4776792e-01, 3.3352980e-01, -5.1461613e-01, 1.7731960e-01, + -2.2109170e-01, -1.0692810e-02, 1.4568762e-01, 4.1487730e-01, + -2.3838633e-01, -1.6649896e-01, -3.2033300e-01, -4.3731174e-01, + 8.0468273e-03, -2.3291506e-01, -4.5403457e-01, 6.3448392e-02, + -1.1199225e-01, -4.9399075e-01, 3.8827535e-02, -1.2175907e-01, + 1.9211610e-01, 1.5748601e-02, 6.3713104e-02, -5.4411836e-02, + 3.5910544e-01, 1.8089499e-01, -8.3849184e-02, 4.6952319e-01, + -1.3097216e-01, 3.9444518e-01, 9.2041276e-02, 9.1931677e-01, + -1.2274407e-01, 3.6744910e-01, -7.1317488e-03, -4.2744270e-01, + -2.4982110e-01, -3.4792073e-02, 1.7541768e-01, 1.8287193e-02, + -4.1735864e-01, -1.6319177e-01, 5.6148872e-02, -2.6662689e-02, + -1.3927303e-01, 4.2746758e-01, 9.9831104e-02, -4.5083967e-01, + -6.1798984e-01, -6.9752467e-01, -5.3983122e-02, 7.6239705e-02, + 5.2488066e-02, 5.0055146e-01, 5.2418858e-03, 1.9365381e-01, + -2.3087139e-01, 4.5591956e-01, 1.0590754e-01, -9.3369529e-02, + -8.1770115e-02, -1.9278076e-01, 2.6090226e-01, -3.4908691e-01, + -9.9682942e-02, 2.0464768e-01, -8.8885106e-02, 2.1913598e-01, + 1.9302976e-01, -4.1766539e-01, -1.2384148e-02, -1.4312698e-01, + 1.7888883e-01, -9.5843635e-02, 1.2974171e-01, 2.6153788e-01, + -1.4377487e-01, 1.6859873e-01, -1.5012036e-01, 1.4864261e-01, + 2.0533815e-01, 2.9625934e-01, 2.0829637e-01, 5.5547190e-01, + -1.1550704e-01, 4.3823749e-01, 1.9185613e-01, 8.7257445e-01, + -4.8663691e-02, 3.6873922e-01, 4.9050367e-01, -1.5719551e-01, + 3.2744622e-01, -1.2747797e-01, 3.6327103e-01, 2.7797487e-01, + -3.7661973e-01, -5.4173008e-02, -3.0801520e-01, -3.8187349e-01, + -4.3708272e-02, -1.1218896e-01, -1.2676828e-01, 1.5835470e-01, + -6.8424262e-02, -2.3614784e-01, 1.8728454e-01, 2.7120337e-01, + 2.6976854e-01, -7.8457497e-02, -7.5408332e-02, -4.3717277e-01, + 1.5431963e-01, -3.1880721e-01, 3.1153014e-01, 2.9150844e-02, + 6.3865691e-01, 2.4006522e-01, -5.9806503e-02, 2.3618667e-01, + -2.8634012e-01, -2.5914139e-01, -4.7454682e-01, -4.9253801e-01, + -2.3763049e-01, 3.4789924e-02, -2.4430576e-01, 4.3708864e-01, + -8.9352712e-02, 6.8092680e-01, -3.1629015e-02, 6.2322330e-01, + -4.4037020e-01, 3.1882312e-02, -3.3379188e-01, -3.5241520e-01, + -2.3012178e-01, -3.9647453e-02, 8.0349393e-02, 6.3374585e-01, + -5.8204597e-01, 6.3586301e-01, -2.9739904e-01, 4.4182721e-01, + -2.4614613e-01, -4.2897230e-01, -2.5775841e-02, -6.8895894e-01, + 4.7509959e-01, -7.2605282e-02, -4.5277193e-02, 1.2873912e-01, + -6.7869939e-02, -3.1840524e-01, -1.3153505e-01, -4.3035623e-01, + 1.5486053e-01, 6.7873567e-02, 5.2350283e-01, -5.4881847e-01, + 2.1202806e-01, -3.7828991e-01, 3.5338366e-01, -3.6222893e-01, + -4.8003882e-01, -3.1656075e-01, 6.2320638e-02, -2.9101607e-01, + 8.9793704e-02, -1.1759783e-01 +} +IUT: PASS -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811} + -- h_len = 16 -- +float y_ref[] = { + 6.2978989e-01, 1.4091884e-01, 1.0101279e+00, 1.2735325e-01, + 3.4140077e-01, 1.3663004e-01, 2.5682330e-01, 5.0929654e-01, + -4.3438864e-01, 4.9080691e-01, -5.2847892e-01, 3.8783157e-01, + -3.1026769e-01, 1.1108337e-01, 1.0375749e-01, 3.3765313e-01, + -1.2323911e-01, 5.0369859e-02, -5.4584050e-01, -3.6808807e-01, + 1.4700210e-01, -3.0531892e-01, -7.5355643e-01, 1.5413240e-01, + 1.7050791e-01, -7.5538301e-01, -2.3915285e-01, -2.0387162e-01, + 3.3901632e-01, -2.3372462e-01, -2.3276597e-01, 9.5151775e-02, + 6.3186646e-01, 3.3316955e-01, -2.4707654e-01, 6.7647821e-01, + -3.4007065e-02, 4.8237050e-01, -3.8462095e-02, 9.1794872e-01, + -8.5097685e-02, 2.0627885e-01, -5.5439603e-03, -2.4289967e-01, + -5.2453101e-02, -8.6846918e-02, 4.6663910e-02, 3.1399831e-01, + -2.4083215e-01, -2.8138041e-01, -6.4303502e-03, -1.6721155e-01, + -9.3103498e-02, 5.2139711e-01, 2.5821176e-01, -5.7820058e-01, + -8.0225664e-01, -3.6109373e-01, -2.7383961e-02, 2.7160581e-02, + 1.2773320e-01, 6.5818560e-01, 8.8922329e-02, 3.0489790e-01, + -1.2920819e-01, 6.1244529e-01, -3.4073405e-03, 9.3546256e-02, + -4.4875145e-02, -5.0849766e-03, 2.3889390e-01, -5.1130760e-01, + 1.6360463e-01, 4.2029971e-01, -3.0263537e-01, 2.2376096e-01, + 3.6833948e-01, -3.0413884e-01, -1.3956207e-01, -2.4732138e-01, + 4.1098878e-01, -2.7388829e-01, 9.3243912e-02, 1.1229334e-01, + -2.4469408e-01, 8.2925551e-02, -1.9065322e-01, 1.0021861e-01, + 6.5237284e-05, 4.9057111e-01, 1.2250574e-01, 4.0864003e-01, + -1.9107516e-01, 6.7219990e-01, 3.9303046e-01, 8.8695705e-01, + 1.0575182e-01, 4.4379455e-01, 7.0351452e-01, -1.7413050e-01, + 1.6268335e-01, -3.6398947e-01, 4.2087737e-01, 1.6894349e-01, + -6.3355178e-01, 2.6445135e-02, -4.0070909e-01, -2.5525039e-01, + -2.7707762e-01, 9.5453277e-02, -3.1189567e-01, 3.6464140e-01, + -2.4638277e-01, -2.5021696e-01, 3.6770612e-02, 1.9988173e-01, + 4.0678823e-01, -6.1948225e-02, 1.3091478e-02, -2.9786986e-01, + 3.4833667e-01, -1.0854194e-01, 9.5755681e-02, -8.9162305e-02, + 6.5537059e-01, 1.7219633e-02, -3.7129313e-01, -2.0198233e-02, + -1.9736825e-01, -1.2085505e-01, -5.3962123e-01, -3.6008352e-01, + -3.5265970e-01, 1.0517791e-02, 1.5189931e-02, 3.0119994e-01, + -4.4719204e-02, 3.9169803e-01, 3.8661939e-01, 4.4619995e-01, + -3.1440073e-01, -1.6251071e-01, -5.4129058e-01, -1.6764219e-01, + -2.0251128e-01, -1.8941458e-01, -2.6222983e-01, 7.8157192e-01, + -2.5927317e-01, 6.1785626e-01, -4.6630061e-01, 5.0258636e-01, + -4.2175163e-02, -3.5761774e-01, -6.6525750e-02, -9.2430484e-01, + 5.3185409e-01, 3.1188786e-02, -1.0949404e-01, 2.6275298e-01, + -6.2551588e-02, -2.0182461e-02, -7.3312223e-02, -3.3251107e-01, + 1.2971312e-03, 1.4883006e-01, 7.2222137e-01, -4.2167574e-01, + 2.1200123e-01, -2.1735358e-01 +} +IUT: PASS -float y[] = {3.906606,3.831477,4.613783,4.371631,4.441847,4.311853,4.446086,5.089131,4.708794,4.314635,4.866886,4.812932,4.678810,4.796319,4.687846,5.426141,4.119072,4.687284,4.516533,4.303559,4.733458,4.146965,5.133350,4.832816,4.598291,4.252030} + -- h_len = 20 -- +float y_ref[] = { + 5.3420120e-01, 1.8982859e-01, 1.0291221e+00, 1.4028928e-01, + 3.1864315e-01, 1.3011315e-01, 2.3228759e-01, 3.3733675e-01, + -2.9608598e-01, 5.8351099e-01, -6.8905240e-01, 4.1818243e-01, + -2.1958399e-01, -9.9827707e-02, -2.5024422e-02, 3.5823420e-01, + 1.2323441e-01, -7.1719073e-02, -7.3568404e-01, -4.4755465e-01, + 2.2529861e-01, -3.9330691e-01, -8.6953437e-01, 4.3487376e-01, + 4.1921544e-01, -6.0425735e-01, -3.5521388e-01, -2.0435575e-01, + 3.5010090e-01, -2.5316292e-01, -2.5977921e-01, 5.0659802e-02, + 6.8681252e-01, 1.3008146e-01, -2.5315785e-01, 8.3824909e-01, + 1.1510594e-01, 4.9176550e-01, -1.7823341e-01, 1.0102953e+00, + -2.3010623e-02, 3.5516348e-02, -2.1020740e-02, -3.8336021e-01, + -7.5408712e-02, 6.2125668e-02, 1.3044539e-01, 2.4428497e-01, + -4.0901759e-01, -9.4211206e-02, -2.6027888e-02, -2.1708845e-01, + 4.6089791e-02, 5.2399588e-01, 2.9400715e-01, -5.4901767e-01, + -8.5219324e-01, -3.1177694e-01, -1.3685943e-01, 2.8320648e-02, + 1.8308631e-01, 6.5987110e-01, 7.1065076e-02, 5.6479126e-02, + 2.8107211e-02, 7.1808910e-01, -2.1963760e-01, 1.0674340e-01, + 3.0151665e-02, -6.7855299e-02, 2.0626336e-01, -6.6742498e-01, + 2.8878981e-01, 3.3218032e-01, -3.9555237e-01, 1.8781629e-01, + 2.3412362e-01, -2.8779972e-01, -1.1563770e-01, -1.9100471e-01, + 3.2126588e-01, -6.5900549e-02, 5.9671655e-02, -3.3305369e-02, + -1.7228185e-01, 2.1473107e-01, 5.1648900e-02, 1.6270636e-01, + 5.1605098e-02, 4.2832869e-01, 1.4614150e-01, 3.1187207e-01, + -3.8980633e-01, 5.3980416e-01, 4.0656170e-01, 8.7101591e-01, + -5.0582461e-02, 5.9981346e-01, 6.6075850e-01, -5.1777057e-02, + 1.1775772e-01, -3.0120179e-01, 4.1258806e-01, 2.2372836e-01, + -6.3340878e-01, -1.0023584e-01, -3.5639426e-01, -4.1479793e-01, + -2.8701484e-02, 1.3821782e-01, -2.1146557e-01, 4.9781999e-01, + -1.9069955e-01, -2.0883378e-01, -1.7931046e-01, -3.0740768e-02, + 4.4180271e-01, -2.3938809e-01, -1.2956862e-01, -3.4948981e-01, + 4.6737233e-01, 1.3115168e-01, 1.5102869e-01, 3.4803081e-02, + 5.6759942e-01, -1.0904521e-01, -1.3368645e-01, -1.3472131e-01, + -1.2760213e-01, -2.1923567e-01, -3.9361662e-01, -3.7525508e-01, + -4.1372731e-01, 1.0058865e-02, -3.0391473e-01, 5.9899330e-01, + -4.2276721e-02, 3.2056916e-01, 2.3163396e-01, 5.0194943e-01, + -4.9533814e-02, -8.7483667e-02, -6.4559376e-01, -1.4032331e-01, + -1.2611310e-01, -2.1656755e-01, -2.7046436e-01, 5.9975326e-01, + -2.6020509e-01, 7.6019281e-01, -5.6156492e-01, 6.6070211e-01, + -1.8862886e-02, -2.5943482e-01, 1.1894502e-02, -1.0142385e+00, + 3.6559796e-01, -1.1502273e-02, 4.4767298e-02, 2.9584533e-01, + 3.7647784e-05, -1.3147809e-02 +} +IUT: PASS -==== TEST REAL SSE3 IMPLEMENTATION (hlen=16) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} + -- h_len = 24 -- +float y_ref[] = { + 5.3222823e-01, 2.4987461e-01, 1.0283798e+00, 3.5526699e-01, + 1.8697870e-01, 1.4152247e-01, 2.6207578e-01, 3.3484158e-01, + -3.8979149e-01, 6.8604469e-01, -6.4926147e-01, 2.5207657e-01, + -3.7822890e-01, -2.2347759e-01, 1.0470502e-02, 3.0506110e-01, + 4.1011676e-02, -5.4856278e-03, -6.8150079e-01, -4.5345306e-01, + 1.0741763e-01, -2.7692410e-01, -8.1968147e-01, 5.7136154e-01, + 3.8703418e-01, -6.2253571e-01, -3.7823236e-01, -2.0682354e-01, + 3.9098579e-01, -9.6905150e-02, -1.8801522e-01, 3.7933946e-02, + 6.3939112e-01, 2.3467670e-01, -1.2109100e-01, 8.0106556e-01, + 1.0727239e-01, 5.1171827e-01, -1.2966292e-01, 1.0506585e+00, + 4.7837995e-02, -1.8024493e-02, -1.1318965e-01, -2.0743141e-01, + 1.1125680e-02, 7.5636670e-02, 2.0156327e-01, 3.7243477e-01, + -4.1752231e-01, 6.4663544e-02, 2.6038434e-02, -7.9749018e-02, + 7.5686403e-02, 6.9610006e-01, 3.2217339e-01, -4.2776427e-01, + -8.2220536e-01, -2.7305549e-01, -5.1647477e-02, 2.4109566e-01, + 1.1434041e-01, 6.7494470e-01, 2.0092924e-01, 8.2214177e-02, + 2.3937991e-02, 7.1629500e-01, -1.4283688e-01, 2.4555638e-02, + -3.3275224e-03, -1.8814500e-01, 1.9801255e-01, -7.5389367e-01, + 2.5686151e-01, 3.2000977e-01, -5.6981736e-01, 1.9078457e-01, + 1.6527905e-01, -3.5737312e-01, -1.0835774e-01, -4.6288706e-03, + 3.7699357e-01, -5.8192119e-02, 1.1966180e-01, -3.6230266e-02, + -6.2654182e-02, 2.3270245e-01, 4.6139322e-02, 5.6660924e-02, + 7.4724287e-02, 3.8419297e-01, -1.0854036e-02, 3.5449454e-01, + -4.8905340e-01, 5.8285779e-01, 2.2925827e-01, 1.0132606e+00, + -2.5498384e-01, 7.4497163e-01, 4.7515452e-01, -4.3996703e-02, + 1.8788118e-02, -2.4939571e-01, 4.2214888e-01, 3.3849144e-01, + -6.4541113e-01, -1.9279037e-02, -3.2691205e-01, -3.7180674e-01, + -8.7503098e-02, 8.6730786e-02, -2.2775947e-01, 4.2456102e-01, + -3.5831624e-01, -2.8897566e-01, -1.6724513e-01, -4.8065744e-04, + 3.2799438e-01, -2.8447020e-01, -1.7178029e-01, -4.0660527e-01, + 6.4187962e-01, 7.3846772e-02, 2.0672068e-01, -1.5366182e-01, + 7.9900908e-01, -3.0084166e-01, -5.6068588e-02, -2.3155114e-01, + -1.4066668e-01, -2.3897269e-01, -3.4076381e-01, -5.3892708e-01, + -5.2356058e-01, 1.0604618e-01, -2.1092136e-01, 6.1905998e-01, + -1.2905772e-01, 3.0114239e-01, 3.4632972e-01, 4.9826914e-01, + -3.2198433e-02, -1.3098410e-01, -6.5234804e-01, -2.6879534e-02, + -1.2591730e-01, -1.4107151e-01, -2.1500964e-01, 7.3180163e-01, + -2.9997614e-01, 8.9727402e-01, -6.1047006e-01, 8.2901204e-01, + 1.4916256e-01, -1.1074571e-01 +} +IUT: PASS -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995} + -- h_len = 25 -- +float y_ref[] = { + 5.6923628e-01, 2.1122517e-01, 1.0261438e+00, 3.9087293e-01, + 2.1345332e-01, 1.2748230e-01, 2.2850943e-01, 3.4783924e-01, + -3.5230315e-01, 7.2733051e-01, -6.4562315e-01, 2.8965744e-01, + -3.5571671e-01, -2.6395977e-01, -2.4125937e-02, 2.7487630e-01, + 6.1082214e-02, -8.9056650e-03, -6.7076659e-01, -4.7583869e-01, + 1.0633938e-01, -2.9135108e-01, -8.2240015e-01, 6.1099094e-01, + 3.9239836e-01, -6.5968055e-01, -4.1528901e-01, -2.2582904e-01, + 4.0954006e-01, -1.1742298e-01, -2.0005567e-01, 5.0488133e-02, + 6.2323201e-01, 2.6340836e-01, -1.1593901e-01, 7.6837289e-01, + 7.8955740e-02, 5.2631205e-01, -1.0634977e-01, 1.0168220e+00, + 6.0709454e-02, -3.4081139e-02, -1.5245335e-01, -2.1505590e-01, + -2.4050269e-03, 4.4784673e-02, 2.0676211e-01, 3.3596647e-01, + -4.0878621e-01, 3.7588470e-02, 1.0192644e-02, -1.1509930e-01, + 7.7192493e-02, 7.2054374e-01, 2.8344434e-01, -4.6390212e-01, + -7.9189837e-01, -3.0583304e-01, -6.3782707e-02, 2.4694878e-01, + 1.0405317e-01, 6.9377714e-01, 1.7632841e-01, 9.8775931e-02, + 2.8493963e-02, 7.3985428e-01, -1.1595964e-01, 4.3803096e-02, + -8.1826039e-03, -1.8096274e-01, 2.2643171e-01, -7.8888541e-01, + 2.9099524e-01, 3.5217339e-01, -5.6942546e-01, 1.6837947e-01, + 1.2358252e-01, -3.9479053e-01, -1.2422302e-01, 5.4188324e-03, + 3.5550922e-01, -4.6895050e-02, 1.3736735e-01, -1.3200402e-02, + -6.9921568e-02, 2.5468710e-01, 7.6039456e-02, 3.6692373e-02, + 1.0693954e-01, 3.5894975e-01, 1.8038662e-02, 3.3341441e-01, + -4.5245603e-01, 5.4414153e-01, 2.6774803e-01, 1.0114058e+00, + -2.2713269e-01, 7.6733053e-01, 4.4953904e-01, -6.4008765e-02, + 5.3210976e-03, -2.8960016e-01, 4.1015321e-01, 3.1615001e-01, + -6.1044383e-01, 1.2125295e-02, -3.2865044e-01, -3.3552784e-01, + -5.0508052e-02, 1.1213525e-01, -2.2444099e-01, 3.9706358e-01, + -3.6462283e-01, -3.1095976e-01, -1.2870458e-01, 2.8953498e-02, + 2.8498679e-01, -2.5903764e-01, -2.0532282e-01, -3.7438947e-01, + 5.9906083e-01, 1.1220507e-01, 1.7484823e-01, -1.1687514e-01, + 8.4165925e-01, -3.3723247e-01, -6.4144842e-02, -2.0405796e-01, + -1.1169051e-01, -2.2965629e-01, -3.7629083e-01, -5.6642604e-01, + -5.1144052e-01, 1.0153162e-01, -2.1775363e-01, 6.2313920e-01, + -1.4517608e-01, 3.3557987e-01, 3.4367973e-01, 4.7613770e-01, + -1.5364632e-02, -1.7332375e-01, -6.5896881e-01, -5.9360463e-02, + -1.4723293e-01, -1.5215987e-01, -1.7504829e-01, 7.1048653e-01, + -3.2864007e-01, 8.6068469e-01, -6.4257747e-01, 8.0053741e-01 +} +IUT: PASS -float y[] = {4.845784,5.086479,6.160082,6.147918,5.549072,5.538811,6.264142,6.083664,5.942431,5.214122,6.458036,6.120992,6.385656,5.751343,6.099504,6.738166,5.942206,5.756058,6.343914,6.239408,6.090616,6.325348,6.214744,6.674619,5.691174,6.413076} - -==== TEST REAL SSE3 IMPLEMENTATION (hlen=20) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995,0.446645,0.327805,0.785346,0.676628} - -float y[] = {6.148925,6.262301,5.792440,6.652380,6.759685,6.515733,6.943458,6.334218,6.539823,6.542612,7.766725,7.472028,7.258010,6.947061,7.347066,7.503224,7.134092,6.244353,7.690946,7.584768,7.779833,6.845586,7.351567,8.099596,7.393943,7.176465} - -==== TEST REAL SSE3 IMPLEMENTATION (h_len%4=0) ==== -float x[] = {0.828957,0.675654,0.904170,0.191112,0.394521,0.706067,0.868924,0.547397,0.738959,0.932485,0.233119,0.926576,0.551443,0.933420,0.494407,0.552568,0.939129,0.799646,0.814139,0.594497,0.657201,0.995300,0.935852,0.324541,0.874309,0.589157,0.637771,0.759324,0.775421,0.794910,0.262785,0.604379,0.470564,0.166955} - -float h[] = {0.726144,0.746635,0.470674,0.211604,0.963092,0.264553,0.265818,0.725771,0.590649,0.313560,0.547613,0.946811,0.793753,0.690502,0.276120,0.792995,0.446645,0.327805,0.785346,0.676628,0.906507,0.279178,0.015699,0.609179} - -float y[] = {7.032490,7.904466,6.745667,7.146502,6.958916,7.972230,7.314566,6.972099,7.773273,7.740826,7.380684,7.907260,8.446323,7.862378,8.022881,7.726059,7.748359,7.602177,8.926439,8.905205,8.569546,7.948394,8.588051,8.850824,8.592319,7.636216} -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 1 Gerrit-Owner: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 15:51:58 2018 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Fri, 21 Dec 2018 15:51:58 +0000 Subject: Change in osmo-trx[master]: arm/convolve: Fix the vfp4 real convolution for h_len=12 Message-ID: tnt has uploaded this change for review. ( https://gerrit.osmocom.org/12417 Change subject: arm/convolve: Fix the vfp4 real convolution for h_len=12 ...................................................................... arm/convolve: Fix the vfp4 real convolution for h_len=12 Change-Id: Ic73f0746edd3f1f22bb1d79d4c64aa740691dd48 Signed-off-by: Sylvain Munaut --- M Transceiver52M/arch/arm/convolve_neon.S 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/17/12417/1 diff --git a/Transceiver52M/arch/arm/convolve_neon.S b/Transceiver52M/arch/arm/convolve_neon.S index 637d150..8a023ff 100644 --- a/Transceiver52M/arch/arm/convolve_neon.S +++ b/Transceiver52M/arch/arm/convolve_neon.S @@ -92,8 +92,8 @@ vld2.32 {q8-q9}, [r4], r6 vld2.32 {q10-q11}, [r5], r6 #ifdef HAVE_NEON_FMA - vfma.f32 q1, q6, q0 - vfma.f32 q3, q7, q0 + vmul.f32 q1, q6, q0 + vmul.f32 q3, q7, q0 vfma.f32 q1, q8, q2 vfma.f32 q3, q9, q2 vfma.f32 q1, q10, q4 -- To view, visit https://gerrit.osmocom.org/12417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic73f0746edd3f1f22bb1d79d4c64aa740691dd48 Gerrit-Change-Number: 12417 Gerrit-PatchSet: 1 Gerrit-Owner: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 15:51:58 2018 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Fri, 21 Dec 2018 15:51:58 +0000 Subject: Change in osmo-trx[master]: tests: Re-enable the convolve_test by default Message-ID: tnt has uploaded this change for review. ( https://gerrit.osmocom.org/12418 Change subject: tests: Re-enable the convolve_test by default ...................................................................... tests: Re-enable the convolve_test by default Change-Id: Ia26ef75bb11482fc0db3b790db1c93c8b74229d1 Signed-off-by: Sylvain Munaut --- M tests/testsuite.at 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/12418/1 diff --git a/tests/testsuite.at b/tests/testsuite.at index 22de782..f83ac65 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -52,8 +52,6 @@ AT_SETUP([convolve_test]) AT_KEYWORDS([convolve_test]) -# Different results for i686, x86_64 and ARM. see OS#2826, OS#2828, and https://lists.osmocom.org/pipermail/openbsc/2018-January/011655.html -AT_SKIP_IF(true) cat $abs_srcdir/Transceiver52M/convolve_test.ok > expout AT_CHECK([$abs_top_builddir/tests/Transceiver52M/convolve_test], [], [expout], []) AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/12418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia26ef75bb11482fc0db3b790db1c93c8b74229d1 Gerrit-Change-Number: 12418 Gerrit-PatchSet: 1 Gerrit-Owner: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 15:52:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 21 Dec 2018 15:52:31 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: account wait and http times separately In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12412 ) Change subject: ctrl2cgi: account wait and http times separately ...................................................................... ctrl2cgi: account wait and http times separately Save and propagate separate timestamp for HTTP request duration to distinguish between time spent waiting on connection limit availability from actual http request time. Change-Id: I14d1db5206864ac9ab7c64f96f67139113ab3fcf Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 28a7c3b..3226c1d 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.0.8" # bump this on every non-trivial change +__version__ = "0.0.9" # bump this on every non-trivial change import argparse, os, logging, logging.handlers, datetime import hashlib @@ -39,13 +39,22 @@ # we don't support older versions of TwistedIPA module assert V(twisted_ipa_version) > V('0.4') +def log_duration(log, bid, ts, ts_http): + """ + Log human-readable duration from timestamps + """ + base = datetime.datetime.now() + delta_t = datetime.timedelta(seconds = (base - ts).total_seconds()) + delta_h = datetime.timedelta(seconds = (base - ts_http).total_seconds()) + delta_w = delta_t - delta_h + log.debug('Request for BSC %s took %s total (%s wait, %s http)' % (bid, delta_t, delta_w, delta_h)) -def handle_reply(ts, bid, f, log, resp): +def handle_reply(ts, ts_http, bid, f, log, resp): """ Reply handler: process raw CGI server response, function f to run for each command """ decoded = json.loads(resp.decode('utf-8')) - log.debug('request for BSC %s took %d seconds' % (bid, (datetime.datetime.now() - ts).total_seconds())) + log_duration(log, bid, ts, ts_http) comm_proc(decoded.get('commands'), bid, f, log) def gen_hash(params, skey): @@ -63,7 +72,7 @@ def make_async_req(ts, dst, par, f_write, f_log, tout): d = post(dst, par, timeout=tout) - d.addCallback(collect, partial(handle_reply, ts, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once + d.addCallback(collect, partial(handle_reply, ts, datetime.datetime.now(), par['bsc_id'], f_write, f_log)) d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s (timeout %d)" % (repr(e), par['bsc_id'], dst, tout))) # handle HTTP errors return d -- To view, visit https://gerrit.osmocom.org/12412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I14d1db5206864ac9ab7c64f96f67139113ab3fcf Gerrit-Change-Number: 12412 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 15:57:22 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 15:57:22 +0000 Subject: Change in asn1c[master]: jenkins.sh: disable parallel build Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12419 Change subject: jenkins.sh: disable parallel build ...................................................................... jenkins.sh: disable parallel build Avoid a race condition that causes the build to fail on Jenkins with: asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ Change-Id: I80eecc60b96e87710218089dfdd1a3f87b40a8b1 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/asn1c refs/changes/19/12419/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 1b09c8b..823b343 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -14,7 +14,7 @@ set -x ./configure # CFLAGS="-Werror" CPPFLAGS="-Werror" #-Werror currently broken -$MAKE $PARALLEL_MAKE +$MAKE -j1 $MAKE check #$MAKE distcheck # distcheck currently broken -- To view, visit https://gerrit.osmocom.org/12419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: asn1c Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I80eecc60b96e87710218089dfdd1a3f87b40a8b1 Gerrit-Change-Number: 12419 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 15:58:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 15:58:37 +0000 Subject: Change in libasn1c[master]: Revert "jenkins.sh: disable parallel build" Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12420 Change subject: Revert "jenkins.sh: disable parallel build" ...................................................................... Revert "jenkins.sh: disable parallel build" This reverts commit a352642587d8835deb3c6f55da7986f427835157. I've confused the libasn1c and asn1c repositories. libasn1c does not need this workaround, asn1c does. Related Change-Id: I80eecc60b96e87710218089dfdd1a3f87b40a8b1 (asn1c) Change-Id: I73eac905524688939e133b6f91ad85514dc0393a --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/20/12420/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index dbdfda6..7d68736 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -14,10 +14,7 @@ autoreconf --install --force ./configure --enable-werror - -# Parallel make is disabled due to a race condition. On Jenkins, it often -# aborts the build with: "asn1p_y.y:357:13: error: 'param' undeclared" -$MAKE -j1 +$MAKE $PARALLEL_MAKE $MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/12420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I73eac905524688939e133b6f91ad85514dc0393a Gerrit-Change-Number: 12420 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 15:59:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 15:59:38 +0000 Subject: Change in asn1c[master]: jenkins.sh: disable parallel build In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12419 ) Change subject: jenkins.sh: disable parallel build ...................................................................... Patch Set 1: This was previously submitted to libasn1c.git, which was the wrong repo: https://gerrit.osmocom.org/#/c/libasn1c/+/12194/ Reverting that here: https://gerrit.osmocom.org/#/c/libasn1c/+/12420/ -- To view, visit https://gerrit.osmocom.org/12419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: asn1c Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80eecc60b96e87710218089dfdd1a3f87b40a8b1 Gerrit-Change-Number: 12419 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 21 Dec 2018 15:59:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 16:01:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 16:01:37 +0000 Subject: Change in asn1c[master]: jenkins.sh: disable parallel build In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12419 ) Change subject: jenkins.sh: disable parallel build ...................................................................... jenkins.sh: disable parallel build Avoid a race condition that causes the build to fail on Jenkins with: asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ Change-Id: I80eecc60b96e87710218089dfdd1a3f87b40a8b1 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/asn1c refs/changes/19/12419/2 -- To view, visit https://gerrit.osmocom.org/12419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: asn1c Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I80eecc60b96e87710218089dfdd1a3f87b40a8b1 Gerrit-Change-Number: 12419 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 16:03:48 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 21 Dec 2018 16:03:48 +0000 Subject: Change in asn1c[master]: jenkins.sh: disable parallel build In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/12419 ) Change subject: jenkins.sh: disable parallel build ...................................................................... Abandoned Wow, this workaround does not even help it. This is a race condition that even appears without parallel make as we can see from the Jenkins failure. -- To view, visit https://gerrit.osmocom.org/12419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: asn1c Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I80eecc60b96e87710218089dfdd1a3f87b40a8b1 Gerrit-Change-Number: 12419 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Dec 21 16:17:24 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 21 Dec 2018 16:17:24 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7633?= Message-ID: <1462729327.133.1545409044126.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 33.28 KB...] Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/src/gsm' CC a5.lo CC rxlev_stat.lo CC tlv_parser.lo CC comp128.lo CC rsl.lo CC gsm_utils.lo CC gsm48.lo CC comp128v23.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^ gsm_utils.c: In function 'osmo_get_rand_id': gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm29205.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo ipa.c: In function 'ipa_ccm_idtag_parse': ipa.c:103:2: warning: 'ipa_ccm_idtag_parse_off' is deprecated (declared at ../../include/osmocom/gsm/ipa.h:31): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^ CC gsup_sms.lo CC gprs_gea.lo CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo CC milenage/aes-encblock.lo CCLD libgsmint.la CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogsm.la' libtool: install: (cd /build/deps/libosmocore/src/gsm; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogsm.map -version-info 10:0:0 -no-undefined -o libosmogsm.la -rpath /build/deps/install/stow/libosmocore/lib libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T /build/deps/install/stow/libosmocore/lib/libosmogsm.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so.10 || { rm -f libosmogsm.so.10 && ln -s libosmogsm.so.10.0.0 libosmogsm.so.10; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so || { rm -f libosmogsm.so && ln -s libosmogsm.so.10.0.0 libosmogsm.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogsm.lai /build/deps/install/stow/libosmocore/lib/libosmogsm.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocoding.la' libtool: install: (cd /build/deps/libosmocore/src/coding; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -o libosmocoding.la -rpath /build/deps/install/stow/libosmocore/lib gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la ) libtool: install: /usr/bin/install -c .libs/libosmocoding.so.0.1.1T /build/deps/install/stow/libosmocore/lib/libosmocoding.so.0.1.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so.0 || { rm -f libosmocoding.so.0 && ln -s libosmocoding.so.0.1.1 libosmocoding.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so || { rm -f libosmocoding.so && ln -s libosmocoding.so.0.1.1 libosmocoding.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocoding.lai /build/deps/install/stow/libosmocore/lib/libosmocoding.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' CC gprs_ns.lo CC gprs_ns_frgre.lo CC gprs_bssgp.lo CC gprs_ns_vty.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC common_vty.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmogb.la' libtool: install: (cd /build/deps/libosmocore/src/gb; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -Wall -fno-strict-aliasing -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogb.map -version-info 7:0:1 -o libosmogb.la -rpath /build/deps/install/stow/libosmocore/lib gprs_ns.lo gprs_ns_frgre.lo gprs_ns_vty.lo gprs_bssgp.lo gprs_bssgp_util.lo gprs_bssgp_vty.lo gprs_bssgp_bss.lo common_vty.lo -ltalloc ../../src/libosmocore.la ../../src/vty/libosmovty.la ../../src/gsm/libosmogsm.la ) libtool: install: /usr/bin/install -c .libs/libosmogb.so.6.1.0T /build/deps/install/stow/libosmocore/lib/libosmogb.so.6.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmogb.so.6.1.0 libosmogb.so.6 || { rm -f libosmogb.so.6 && ln -s libosmogb.so.6.1.0 libosmogb.so.6; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmogb.so.6.1.0 libosmogb.so || { rm -f libosmogb.so && ln -s libosmogb.so.6.1.0 libosmogb.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogb.lai /build/deps/install/stow/libosmocore/lib/libosmogb.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' CC control_if.lo CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmoctrl.la' libtool: install: (cd /build/deps/libosmocore/src/ctrl; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -Wall -I../../include -I../../include -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmoctrl.map -version-info 3:0:3 -no-undefined -o libosmoctrl.la -rpath /build/deps/install/stow/libosmocore/lib control_cmd.lo control_if.lo fsm_ctrl_commands.lo control_vty.lo -ltalloc ../../src/libosmocore.la ../../src/gsm/libosmogsm.la ../../src/vty/libosmovty.la ) libtool: install: /usr/bin/install -c .libs/libosmoctrl.so.0.3.0T /build/deps/install/stow/libosmocore/lib/libosmoctrl.so.0.3.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmoctrl.so.0.3.0 libosmoctrl.so.0 || { rm -f libosmoctrl.so.0 && ln -s libosmoctrl.so.0.3.0 libosmoctrl.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmoctrl.so.0.3.0 libosmoctrl.so || { rm -f libosmoctrl.so && ln -s libosmoctrl.so.0.3.0 libosmoctrl.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmoctrl.lai /build/deps/install/stow/libosmocore/lib/libosmoctrl.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' CC core.lo CC reader.lo CC card_fs_isim.lo CC class_tables.lo CC reader_pcsc.lo CC card_fs_usim.lo CC card_fs_sim.lo CC card_fs_uicc.lo /bin/bash: line 2: 7486 Illegal instruction (core dumped) /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -DBUILDING_LIBOSMOCORE -Wall -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT card_fs_isim.lo -MD -MP -MF $depbase.Tpo -c -o card_fs_isim.lo card_fs_isim.c Makefile:489: recipe for target 'card_fs_isim.lo' failed make[2]: *** [card_fs_isim.lo] Error 132 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Makefile:604: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory '/build/deps/libosmocore' Makefile:903: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Dec 21 16:51:21 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 21 Dec 2018 16:51:21 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: explicitly ignore unrelated TRAPs Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12421 Change subject: ctrl2cgi: explicitly ignore unrelated TRAPs ...................................................................... ctrl2cgi: explicitly ignore unrelated TRAPs Previously we've tried to determine the type of TRAP and handle as many as possible via generic method dispatcher similar to parent class. Let's make code simpler by explicitly ignoring all but 'location-state' TRAPs. This should also reduce debug log output because we'll only log the TRAP variable for ignored messages instead of entire content. Change-Id: I42b715cb82eb309950ff387649726504b6c7cf61 Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 5 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/21/12421/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 3226c1d..0144f37 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -84,11 +84,11 @@ """ Parse CTRL TRAP and dispatch to appropriate handler after normalization """ - self.factory.log.debug('TRAP %s' % v) - t_type = get_type(v) - p = p_h(v) - method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) - method(p(1), p(3), p(5), p(7), get_r(v)) + if get_type(v) == 'location-state': + p = p_h(v) + self.handle_locationstate(p(1), p(3), p(5), p(7), get_r(v)) + else: + self.factory.log.debug('Ignoring TRAP %s' % (v.split()[0])) def ctrl_SET_REPLY(self, data, _, v): """ @@ -121,12 +121,6 @@ # Ensure that we run only limited number of requests in parallel: self.factory.semaphore.run(make_async_req, t, self.factory.location, params, self.transport.write, self.factory.log, self.factory.timeout) - def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): - """ - Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled - """ - self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) - class TrapFactory(IPAFactory): """ -- To view, visit https://gerrit.osmocom.org/12421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I42b715cb82eb309950ff387649726504b6c7cf61 Gerrit-Change-Number: 12421 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 16:52:19 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 21 Dec 2018 16:52:19 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: explicitly ignore unrelated TRAPs In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12421 to look at the new patch set (#2). Change subject: ctrl2cgi: explicitly ignore unrelated TRAPs ...................................................................... ctrl2cgi: explicitly ignore unrelated TRAPs Previously we've tried to determine the type of TRAP and handle as many as possible via generic method dispatcher similar to parent class. Let's make code simpler by explicitly ignoring all but 'location-state' TRAPs. This should also reduce debug log output because we'll only log the TRAP variable for ignored messages instead of entire content. Change-Id: I42b715cb82eb309950ff387649726504b6c7cf61 Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 6 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/21/12421/2 -- To view, visit https://gerrit.osmocom.org/12421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I42b715cb82eb309950ff387649726504b6c7cf61 Gerrit-Change-Number: 12421 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 17:20:59 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 21 Dec 2018 17:20:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: Add SGs testcases In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#19) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: Add SGs testcases ...................................................................... WIP: MSC_Tests: Add SGs testcases This extens MSC_Tests.ttcn with an initial set of SGs interface test cases for RESET, LU, DETACH, PAGING, SMS and CSFB procedures In particular the following testcases are added: - TC_sgsap_reset: isolated reset procedure test - TC_sgsap_lu: isolated location update with TMSI realloc - TC_sgsap_lu_imsi_reject: location update, reject case - TC_sgsap_lu_and_nothing: location update with failed TMSI realloc - TC_sgsap_expl_imsi_det_eps: detach from EPS serveces - TC_sgsap_expl_imsi_det_noneps: detach from non-EPS services - TC_sgsap_paging_rej: isolated paging, reject case - TC_sgsap_paging_subscr_rej: isolated paging, subscr rejects call - TC_sgsap_paging_ue_unr: isolated paging, ue is unreachable - TC_sgsap_paging_and_nothing: page, but don't respond - TC_sgsap_paging_and_lu: check paging followed by an LU - TC_sgsap_mt_sms: mobile terminated SMS through SGs Interface - TC_sgsap_mo_sms: mobile originated SMS through SGs Interface - TC_sgsap_mt_sms_and_nothing: trigger SMS, but don't respond to paging - TC_sgsap_mt_sms_and_reject: trigger SMS, but reject paging - TC_sgsap_unexp_ud: Send unexpected unitdata (SGs Association: NULL) - TC_sgsap_unsol_ud: Send unsolicited unitdata (subscriber not in VLR) - TC_bssap_lu_sgsap_lu_and_mt_call: LU on 2G, LU on SGs and CSFB call - TC_sgsap_lu_and_mt_call: LU on SGs, and CSFB call Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Depends: osmo-msc I73359925fc1ca72b33a1466e6ac41307f2f0b11d Related: OS#3645 --- M library/SGsAP_Emulation.ttcn M library/SGsAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/expected-results.xml M msc/gen_links.sh M msc/regen_makefile.sh 7 files changed, 1,116 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11488/19 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 19 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 17:21:01 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 21 Dec 2018 17:21:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Optionally check MM Info Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12422 Change subject: MSC_ConnectionHandler: Optionally check MM Info ...................................................................... MSC_ConnectionHandler: Optionally check MM Info The MM Info message is an optional message that is set to the MS usually after the location update. It contains the full network name and time information. At the moment the presence of this message is not checked or expected since sending of MM-Info is explicitly disabled in the osmo-msc configu. This patch adds an optional check of MM Info that is disabled by default. Change-Id: I431f50c2ff3536f87f0c7c3caf23b7a38d501904 Related: OS#3615 --- M library/L3_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 3 files changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/12422/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 3918f3d..3978498 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -2972,6 +2972,26 @@ } } +template PDU_ML3_NW_MS tr_ML3_MT_MM_Info := { + discriminator := '0101'B, + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + mm := { + mMInformation := { + messageType := '110010'B, + nsd := '00'B, + fullNetworkName := *, + shortNetworkName := *, + localtimeZone := *, + univTime := *, + lSAIdentity := *, + networkDST := * + } + } + } +} diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 1b31f75..bf83dd3 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -69,7 +69,8 @@ boolean send_early_cm, charstring ipa_ctrl_ip, integer ipa_ctrl_port, - boolean ipa_ctrl_enable + boolean ipa_ctrl_enable, + boolean mm_info }; /* get a one-octet bitmaks of supported algorithms based on Classmark information */ @@ -315,6 +316,12 @@ } } +function f_expect_mm_info() runs on BSC_ConnHdlr { + if (g_pars.mm_info == true) { + BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_Info)); + } +} + function f_perform_lu() runs on BSC_ConnHdlr { var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi) @@ -363,6 +370,10 @@ mtc.stop; } } + + /* Wait for MM-Information (if enabled) */ + f_expect_mm_info(); + /* FIXME: there could be pending SMS or other common procedures by the MSC, let's ignore them */ BSSAP.receive(tr_BSSMAP_ClearCommand); BSSAP.send(ts_BSSMAP_ClearComplete); diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index d121b63..0ac61bc 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -95,6 +95,7 @@ integer mp_msc_vty_port := 4254; /* local parameters of emulated HLR */ + boolean mp_mm_info := false; charstring mp_hlr_ip := "127.0.0.1"; integer mp_hlr_port := 4222; charstring mp_mgw_ip := "127.0.0.1"; @@ -457,7 +458,8 @@ send_early_cm := true, ipa_ctrl_ip := mp_msc_ip, ipa_ctrl_port := mp_msc_ctrl_port, - ipa_ctrl_enable := true + ipa_ctrl_enable := true, + mm_info := mp_mm_info }; return pars; } @@ -855,6 +857,9 @@ } } + /* Wait for MM-Information (if enabled) */ + f_expect_mm_info(); + /* wait for normal teardown */ f_expect_clear(); } -- To view, visit https://gerrit.osmocom.org/12422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I431f50c2ff3536f87f0c7c3caf23b7a38d501904 Gerrit-Change-Number: 12422 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 17:44:22 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 21 Dec 2018 17:44:22 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: update comments Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12423 Change subject: ctrl2cgi: update comments ...................................................................... ctrl2cgi: update comments * remove obsolete comments * add missing function comments Change-Id: I5ace594adbccf7ce7eda2c19aa639a4f46285c25 --- M scripts/ctrl2cgi.py 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/23/12423/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 3226c1d..2cf386c 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -29,7 +29,7 @@ import json import configparser from functools import partial -from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available +from distutils.version import StrictVersion as V from twisted.internet import defer, reactor from treq import post, collect from osmopy.trap_helper import debug_init, get_type, get_r, p_h, make_params, comm_proc @@ -58,6 +58,9 @@ comm_proc(decoded.get('commands'), bid, f, log) def gen_hash(params, skey): + """ + Make mandatory parameter for http request + """ inp = '' for key in ['time_stamp', 'position_validity', 'admin_status', 'policy_status']: inp += str(params.get(key)) @@ -67,10 +70,12 @@ m = hashlib.md5() m.update(inp.encode('utf-8')) res = m.hexdigest() - #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res def make_async_req(ts, dst, par, f_write, f_log, tout): + """ + Assemble deferred request parameters and partially instantiate response handler + """ d = post(dst, par, timeout=tout) d.addCallback(collect, partial(handle_reply, ts, datetime.datetime.now(), par['bsc_id'], f_write, f_log)) d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s (timeout %d)" % (repr(e), par['bsc_id'], dst, tout))) # handle HTTP errors -- To view, visit https://gerrit.osmocom.org/12423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5ace594adbccf7ce7eda2c19aa639a4f46285c25 Gerrit-Change-Number: 12423 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 18:12:05 2018 From: gerrit-no-reply at lists.osmocom.org (Mykola Shchetinin) Date: Fri, 21 Dec 2018 18:12:05 +0000 Subject: Change in osmo-mgw[neels/iuup]: iuup_cn_node.c: make it work for AMR 12.2k codec In-Reply-To: References: Message-ID: Mykola Shchetinin has abandoned this change. ( https://gerrit.osmocom.org/12390 ) Change subject: iuup_cn_node.c: make it work for AMR 12.2k codec ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: neels/iuup Gerrit-MessageType: abandon Gerrit-Change-Id: I244c4c4778798912c818812a15709695d3251f87 Gerrit-Change-Number: 12390 Gerrit-PatchSet: 1 Gerrit-Owner: Mykola Shchetinin Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Mykola Shchetinin -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 18:12:53 2018 From: gerrit-no-reply at lists.osmocom.org (Mykola Shchetinin) Date: Fri, 21 Dec 2018 18:12:53 +0000 Subject: Change in osmo-mgw[mykola/iuup]: iuup_cn_node.c: make it work for AMR 12.2k codec Message-ID: Mykola Shchetinin has uploaded this change for review. ( https://gerrit.osmocom.org/12424 Change subject: iuup_cn_node.c: make it work for AMR 12.2k codec ...................................................................... iuup_cn_node.c: make it work for AMR 12.2k codec rx_data: prepend hardcoded AMR 12.2 header "0xf03c" to the front of RTP payload osmo_iuup_cn_tx_payload: strip AMR header (2 bytes) from the front of RTP payload Change-Id: I244c4c4778798912c818812a15709695d3251f87 --- M src/libosmo-mgcp/iuup_cn_node.c M tests/iuup/iuup_test.c M tests/iuup/iuup_test.ok 3 files changed, 17 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/24/12424/1 diff --git a/src/libosmo-mgcp/iuup_cn_node.c b/src/libosmo-mgcp/iuup_cn_node.c index f555e36..fda7a7a 100644 --- a/src/libosmo-mgcp/iuup_cn_node.c +++ b/src/libosmo-mgcp/iuup_cn_node.c @@ -85,10 +85,12 @@ struct osmo_iuup_hdr_data *hdr) { /* Remove the IuUP bit from the middle of the buffer by writing the RTP header forward. */ + /* And append AMR 12.2k header "0xf03c". - AD HOC fix */ unsigned int pre_hdr_len = ((uint8_t*)hdr) - pdu->data; - memmove(pdu->data + sizeof(*hdr), pdu->data, pre_hdr_len); - - msgb_pull(pdu, sizeof(*hdr)); + memmove(pdu->data + sizeof(*hdr) - 2, pdu->data, pre_hdr_len); + ((uint8_t*)hdr)[2] = 0xf0; + ((uint8_t*)hdr)[3] = 0x3c; + msgb_pull(pdu, sizeof(*hdr) - 2); LOGP(DIUUP, LOGL_DEBUG, "(%s) IuUP stripping IuUP header from RTP data\n", cn->name); cn->cfg.rx_payload(pdu, cn->cfg.node_priv); @@ -191,7 +193,8 @@ rtp_was = (void*)pdu->data; /* copy the RTP header part backwards by the size needed for the IuUP header */ - rtp = (void*)msgb_push(pdu, sizeof(*iuup_hdr)); + /* also strips 2 bytes from the front of RTP payload - AMR header - AD HOC fix */ + rtp = (void*)msgb_push(pdu, sizeof(*iuup_hdr) - 2); memmove(rtp, rtp_was, sizeof(*rtp)); /* Send the same payload type to the peer (erm...) */ diff --git a/tests/iuup/iuup_test.c b/tests/iuup/iuup_test.c index 8d96f06..e6f2ca5 100644 --- a/tests/iuup/iuup_test.c +++ b/tests/iuup/iuup_test.c @@ -111,7 +111,7 @@ #define RTP_PAYLOAD "6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0" printf("\nReceive payload encapsulated in IuUP. Expecting rx_payload() of just RTP packet\n"); printf("i.e. should strip away " IUUP_HEADER "\n"); - expect_rx_payload = RTP_HEADER RTP_PAYLOAD; + expect_rx_payload = RTP_HEADER "f03c" RTP_PAYLOAD; rx_pdu(cn, msgb_from_hex("IuUP-Data", RTP_HEADER IUUP_HEADER RTP_PAYLOAD)); @@ -119,18 +119,18 @@ printf("\nTransmit RTP. Expecting tx_msg() with inserted IuUP header\n"); expect_tx_msg = RTP_HEADER "000002b3" RTP_PAYLOAD; tx_payload(cn, - msgb_from_hex("RTP data", RTP_HEADER RTP_PAYLOAD)); + msgb_from_hex("RTP data", RTP_HEADER "f03c" RTP_PAYLOAD)); printf("\nMore RTP, each time the Frame Nr advances, causing a new header CRC.\n"); expect_tx_msg = RTP_HEADER "0100e2b3" RTP_PAYLOAD; tx_payload(cn, - msgb_from_hex("RTP data", RTP_HEADER RTP_PAYLOAD)); + msgb_from_hex("RTP data", RTP_HEADER "f03c" RTP_PAYLOAD)); expect_tx_msg = RTP_HEADER "02007eb3" RTP_PAYLOAD; tx_payload(cn, - msgb_from_hex("RTP data", RTP_HEADER RTP_PAYLOAD)); + msgb_from_hex("RTP data", RTP_HEADER "f03c" RTP_PAYLOAD)); expect_tx_msg = RTP_HEADER "03009eb3" RTP_PAYLOAD; tx_payload(cn, - msgb_from_hex("RTP data", RTP_HEADER RTP_PAYLOAD)); + msgb_from_hex("RTP data", RTP_HEADER "f03c" RTP_PAYLOAD)); printf("All done.\n"); } diff --git a/tests/iuup/iuup_test.ok b/tests/iuup/iuup_test.ok index 2b09c66..8c473d6 100644 --- a/tests/iuup/iuup_test.ok +++ b/tests/iuup/iuup_test.ok @@ -15,14 +15,14 @@ 8060944c6256042c000101020100e2b36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 rx_payload() invoked by iuup_cn! [IuUP] -RTP-> -8060944c6256042c000101026cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 node_priv=0x2342 ok: matches expected msg rc=0 Transmit RTP. Expecting tx_msg() with inserted IuUP header [IuUP] <-RTP- -8060944c6256042c000101026cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 tx_msg() invoked by iuup_cn! <-PDU- [IuUP] 8060944c6256042c00010102000002b36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 @@ -32,7 +32,7 @@ More RTP, each time the Frame Nr advances, causing a new header CRC. [IuUP] <-RTP- -8060944c6256042c000101026cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 tx_msg() invoked by iuup_cn! <-PDU- [IuUP] 8060944c6256042c000101020100e2b36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 @@ -40,7 +40,7 @@ ok: matches expected msg rc=0 [IuUP] <-RTP- -8060944c6256042c000101026cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 tx_msg() invoked by iuup_cn! <-PDU- [IuUP] 8060944c6256042c0001010202007eb36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 @@ -48,7 +48,7 @@ ok: matches expected msg rc=0 [IuUP] <-RTP- -8060944c6256042c000101026cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 +8060944c6256042c00010102f03c6cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 tx_msg() invoked by iuup_cn! <-PDU- [IuUP] 8060944c6256042c0001010203009eb36cfb23bc46d18180c3e5ffe040045600005a7d35b625b80005fff03214ced0 -- To view, visit https://gerrit.osmocom.org/12424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: mykola/iuup Gerrit-MessageType: newchange Gerrit-Change-Id: I244c4c4778798912c818812a15709695d3251f87 Gerrit-Change-Number: 12424 Gerrit-PatchSet: 1 Gerrit-Owner: Mykola Shchetinin -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 18:15:14 2018 From: gerrit-no-reply at lists.osmocom.org (Mykola Shchetinin) Date: Fri, 21 Dec 2018 18:15:14 +0000 Subject: Change in osmo-mgw[mykola/iuup]: iuup_cn_node.c: make it work for AMR 12.2k codec In-Reply-To: References: Message-ID: Mykola Shchetinin has abandoned this change. ( https://gerrit.osmocom.org/12424 ) Change subject: iuup_cn_node.c: make it work for AMR 12.2k codec ...................................................................... Abandoned Wrong branch name. It should have been efistokl/iuup -- To view, visit https://gerrit.osmocom.org/12424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: mykola/iuup Gerrit-MessageType: abandon Gerrit-Change-Id: I244c4c4778798912c818812a15709695d3251f87 Gerrit-Change-Number: 12424 Gerrit-PatchSet: 1 Gerrit-Owner: Mykola Shchetinin Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 18:22:52 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 21 Dec 2018 18:22:52 +0000 Subject: Change in libosmocore[master]: tests/gsm0808: use new msgb comparison API In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12271 ) Change subject: tests/gsm0808: use new msgb comparison API ...................................................................... tests/gsm0808: use new msgb comparison API Since I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5, we have some helpers to compare certain msgb layer to a given buffer. Let's change 'VERIFY' macro to use msgb_eq_l3_data_print(). Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b --- M tests/gsm0808/gsm0808_test.c 1 file changed, 4 insertions(+), 12 deletions(-) Approvals: Max: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 46169ea..ebdfc29 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -39,18 +39,10 @@ OSMO_ASSERT(rc_enc == msg->len); \ } while(0) -#define VERIFY(msg, data, len) \ - if (msgb_l3len(msg) != len) { \ - printf("%s:%d Length don't match: %d vs. %d. %s\n", \ - __func__, __LINE__, msgb_l3len(msg), (int) len, \ - osmo_hexdump(msg->l3h, msgb_l3len(msg))); \ - abort(); \ - } else if (memcmp(msg->l3h, data, len) != 0) { \ - printf("%s:%d didn't match: got: %s\n", \ - __func__, __LINE__, \ - osmo_hexdump(msg->l3h, msgb_l3len(msg))); \ - abort(); \ - } +#define VERIFY(msg, data, data_len) do { \ + if (!msgb_eq_l3_data_print(msg, data, data_len)) \ + abort(); \ + } while(0) /* Setup a fake codec list for testing */ static void setup_codec_list(struct gsm0808_speech_codec_list *scl) -- To view, visit https://gerrit.osmocom.org/12271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib6be778236eff8f2153f3113f9379ecfbec9052b Gerrit-Change-Number: 12271 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: fixeria -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 18:32:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 18:32:25 +0000 Subject: Change in osmo-trx[master]: convolve: Remove support for step, offset parameters In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12415 ) Change subject: convolve: Remove support for step, offset parameters ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic850269a0ed5d98c0ea68980afd31016ed555b48 Gerrit-Change-Number: 12415 Gerrit-PatchSet: 1 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 21 Dec 2018 18:32:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Dec 21 18:32:38 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 21 Dec 2018 18:32:38 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB_sysm?= =?UTF-8?Q?o,superfemto=5Fv5.1,0,default,osmocom-master-debian9_#1584?= In-Reply-To: <624510803.130.1545396933808.JavaMail.jenkins@jenkins.osmocom.org> References: <624510803.130.1545396933808.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <433804479.134.1545417158744.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Dec 21 18:33:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 18:33:19 +0000 Subject: Change in osmo-trx[master]: tests: Rework the convolve_test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12416 ) Change subject: tests: Rework the convolve_test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e203d2c4b778af77d630ed15d4cef6b0c0eb76d Gerrit-Change-Number: 12416 Gerrit-PatchSet: 1 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 21 Dec 2018 18:33:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 18:33:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 18:33:31 +0000 Subject: Change in osmo-trx[master]: arm/convolve: Fix the vfp4 real convolution for h_len=12 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12417 ) Change subject: arm/convolve: Fix the vfp4 real convolution for h_len=12 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic73f0746edd3f1f22bb1d79d4c64aa740691dd48 Gerrit-Change-Number: 12417 Gerrit-PatchSet: 1 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 21 Dec 2018 18:33:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 18:33:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 21 Dec 2018 18:33:37 +0000 Subject: Change in osmo-trx[master]: tests: Re-enable the convolve_test by default In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12418 ) Change subject: tests: Re-enable the convolve_test by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia26ef75bb11482fc0db3b790db1c93c8b74229d1 Gerrit-Change-Number: 12418 Gerrit-PatchSet: 1 Gerrit-Owner: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 21 Dec 2018 18:33:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Dec 21 18:36:50 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 21 Dec 2018 18:36:50 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--ena?= =?UTF-8?Q?ble-iu,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7634?= In-Reply-To: <1462729327.133.1545409044126.JavaMail.jenkins@jenkins.osmocom.org> References: <1462729327.133.1545409044126.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <445068130.135.1545417410376.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Dec 21 18:45:49 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Dec 2018 18:45:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Optionally check MM Info In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12422 ) Change subject: MSC_ConnectionHandler: Optionally check MM Info ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I431f50c2ff3536f87f0c7c3caf23b7a38d501904 Gerrit-Change-Number: 12422 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 21 Dec 2018 18:45:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 18:54:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 21 Dec 2018 18:54:03 +0000 Subject: Change in osmo-hlr[master]: Reply to CHECK-IMEI GSUP messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12411 ) Change subject: Reply to CHECK-IMEI GSUP messages ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12411/2/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/12411/2/src/hlr.c at 431 PS2, Line 431: osmo_gsup_encode Not critical, but what if this function would fail? I think we should check the return value. -- To view, visit https://gerrit.osmocom.org/12411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib240474b0c3c603ba840cf26babb38a44dfc9364 Gerrit-Change-Number: 12411 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 21 Dec 2018 18:54:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 21 22:27:00 2018 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Fri, 21 Dec 2018 22:27:00 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: update comments In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/12423 ) Change subject: ctrl2cgi: update comments ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5ace594adbccf7ce7eda2c19aa639a4f46285c25 Gerrit-Change-Number: 12423 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: tnt Gerrit-Comment-Date: Fri, 21 Dec 2018 22:27:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Dec 22 00:11:12 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 22 Dec 2018 00:11:12 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4593?= Message-ID: <2056094192.140.1545437472878.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 889.30 KB...] early-classmark-sending forbidden early-classmark-sending-3g allowed ip.access unit_id 1800 0 oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr hr efr amr amr tch-f modes 1 2 6 7 amr tch-f threshold ms 32 32 32 amr tch-f hysteresis ms 8 8 8 amr tch-f threshold bts 32 32 32 amr tch-f hysteresis bts 8 8 8 amr tch-f start-mode auto amr tch-h modes 1 2 4 5 amr tch-h threshold ms 32 32 32 amr tch-h hysteresis ms 8 8 8 amr tch-h threshold bts 32 32 32 amr tch-h hysteresis bts 8 8 8 amr tch-h start-mode auto gprs mode none trx 0 rf_locked 0 arfcn 868 nominal power 23 max_power_red 0 rsl e1 tei 0 timeslot 0 phys_chan_config CCCH+SDCCH4 hopping enabled 0 timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 timeslot 2 phys_chan_config TCH/F hopping enabled 0 timeslot 3 phys_chan_config TCH/F hopping enabled 0 timeslot 4 phys_chan_config TCH/F hopping enabled 0 timeslot 5 phys_chan_config TCH/F hopping enabled 0 timeslot 6 phys_chan_config TCH/F hopping enabled 0 timeslot 7 phys_chan_config TCH/F hopping enabled 0 msc 0 ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text codec-list hr3 type normal allow-emergency deny amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden amr-config 7_40k forbidden amr-config 6_70k forbidden amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden asp-protocol m3ua lcls-mode disabled lcls-codec-mismatch forbidden bsc mid-call-timeout 0 no missing-msc-text end <0004> bsc_init.c:49 shutting down OML for BTS 0 logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) signal 15 received Terminating took 2.679s RESULTS: pass: ./handover_cfg.vty pass: ./neighbor_ident.vty pass: ./osmo-bsc.vty make[6]: Leaving directory '/build/tests' osmotestvty.py -p /build -w /build -v test_history (__main__.TestVTY) ... confpath /build, workdir /build Running tests for specific VTY commands Launch: ./src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg from /build Opening /dev/null Launching: PWD=/build './src/osmo-bsc/osmo-bsc' '-c' '/build/doc/examples/osmo-bsc/osmo-bsc.cfg' > ls -l /proc/1271/fd total 0 lr-x------ 1 build build 64 Dec 22 00:11 0 -> pipe:[2157794962] l-wx------ 1 build build 64 Dec 22 00:11 1 -> pipe:[2157794963] lr-x------ 1 build build 64 Dec 22 00:11 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 22 00:11 2 -> pipe:[2157794964] l-wx------ 1 build build 64 Dec 22 00:11 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1271 0.0 0.0 39460 14168 ? S 00:10 0:00 /usr/bin/python2 /usr/local/bin/osmotestvty.py -p /build -w /build -v build 1272 0.0 0.0 21474965716 15968 ? R 00:10 0:00 ./src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg build 1279 0.0 0.0 4336 760 ? S 00:10 0:00 /bin/sh -c ps xua | grep osmo build 1281 0.0 0.0 11128 1036 ? S 00:10 0:00 grep osmo ERROR test_terminal_length (__main__.TestVTY) ... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Connecting socket failed, retrying... Socket: closing 127.0.0.1:4242 (0 sockets open) Launch: ./src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg from /build Launching: PWD=/build './src/osmo-bsc/osmo-bsc' '-c' '/build/doc/examples/osmo-bsc/osmo-bsc.cfg' > ls -l /proc/1271/fd total 0 lr-x------ 1 build build 64 Dec 22 00:11 0 -> pipe:[2157794962] l-wx------ 1 build build 64 Dec 22 00:11 1 -> pipe:[2157794963] lr-x------ 1 build build 64 Dec 22 00:11 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 22 00:11 2 -> pipe:[2157794964] l-wx------ 1 build build 64 Dec 22 00:11 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1271 1.0 0.0 39460 14304 ? S 00:10 0:00 /usr/bin/python2 /usr/local/bin/osmotestvty.py -p /build -w /build -v build 1282 0.0 0.0 21474965716 18100 ? R 00:11 0:00 ./src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg build 1289 0.0 0.0 4336 816 ? S 00:11 0:00 /bin/sh -c ps xua | grep osmo build 1291 0.0 0.0 11128 952 ? S 00:11 0:00 grep osmo ok test_unknown_command (__main__.TestVTY) ... Connecting socket failed, retrying... Connecting socket failed, retrying... Socket: in 3 tries, connected to 127.0.0.1:4242 (1 sockets open) Socket: closing 127.0.0.1:4242 (0 sockets open) Terminating took 2.679s Launch: ./src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg from /build Launching: PWD=/build './src/osmo-bsc/osmo-bsc' '-c' '/build/doc/examples/osmo-bsc/osmo-bsc.cfg' > ls -l /proc/1271/fd total 0 lr-x------ 1 build build 64 Dec 22 00:11 0 -> pipe:[2157794962] l-wx------ 1 build build 64 Dec 22 00:11 1 -> pipe:[2157794963] lr-x------ 1 build build 64 Dec 22 00:11 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 22 00:11 2 -> pipe:[2157794964] l-wx------ 1 build build 64 Dec 22 00:11 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1271 0.5 0.0 39460 14308 ? S 00:10 0:00 /usr/bin/python2 /usr/local/bin/osmotestvty.py -p /build -w /build -v build 1292 0.0 0.0 21474965716 16852 ? R 00:11 0:00 ./src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg build 1299 0.0 0.0 4336 812 ? S 00:11 0:00 /bin/sh -c ps xua | grep osmo build 1301 0.0 0.0 11128 1008 ? S 00:11 0:00 grep osmo ok ====================================================================== ERROR: test_history (__main__.TestVTY) ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/local/lib/python2.7/dist-packages/osmopython-0.1.0-py2.7.egg/EGG-INFO/scripts/osmotestvty.py", line 56, in test_history self.vty.command(t1) File "/usr/local/lib/python2.7/dist-packages/osmopython-0.1.0-py2.7.egg/osmopy/obscvty.py", line 223, in command return self._common_command(request, close) File "/usr/local/lib/python2.7/dist-packages/osmopython-0.1.0-py2.7.egg/osmopy/obscvty.py", line 176, in _common_command self._connect_socket() File "/usr/local/lib/python2.7/dist-packages/osmopython-0.1.0-py2.7.egg/osmopy/obscvty.py", line 83, in _connect_socket self.socket.connect((self.host, self.port)) File "/usr/lib/python2.7/socket.py", line 224, in meth return getattr(self._sock,name)(*args) error: [Errno 111] Connection refused ---------------------------------------------------------------------- Ran 3 tests in 10.236s FAILED (errors=1) Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Socket: closing 127.0.0.1:4242 (0 sockets open) Terminating took 2.679s Makefile:684: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 1 Makefile:703: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:546: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory '/build/tests' Makefile:398: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:435: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:726: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sat Dec 22 00:17:43 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 22 Dec 2018 00:17:43 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-bsc_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#4594?= In-Reply-To: <2056094192.140.1545437472878.JavaMail.jenkins@jenkins.osmocom.org> References: <2056094192.140.1545437472878.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <262886412.141.1545437863552.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat Dec 22 03:39:19 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 22 Dec 2018 03:39:19 +0000 Subject: Change in libosmocore[master]: vty: The telnet interface is TCP only. Fix the comments Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12425 Change subject: vty: The telnet interface is TCP only. Fix the comments ...................................................................... vty: The telnet interface is TCP only. Fix the comments Change-Id: I38555c4d4f565ce21dda34fc3857c47b3d802dbd --- M src/vty/telnet_interface.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/12425/1 diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c index b021d80..e090e17 100644 --- a/src/vty/telnet_interface.c +++ b/src/vty/telnet_interface.c @@ -67,7 +67,7 @@ /*! Initialize telnet based VTY interface listening to 127.0.0.1 * \param[in] tall_ctx \ref talloc context * \param[in] priv private data to be passed to callback - * \param[in] port UDP port number + * \param[in] port TCP port number to bind to */ int telnet_init(void *tall_ctx, void *priv, int port) { @@ -78,7 +78,7 @@ * \param[in] tall_ctx \ref talloc context * \param[in] priv private data to be passed to callback * \param[in] ip IP to listen to ('::1' for localhost, '::0' for all, ...) - * \param[in] port UDP port number + * \param[in] port TCP port number to bind to */ int telnet_init_dynif(void *tall_ctx, void *priv, const char *ip, int port) { -- To view, visit https://gerrit.osmocom.org/12425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I38555c4d4f565ce21dda34fc3857c47b3d802dbd Gerrit-Change-Number: 12425 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 03:39:13 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 22 Dec 2018 03:39:13 +0000 Subject: Change in libosmocore[master]: vty: Introduce telnet_init_default and make vty port configurable In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12321 to look at the new patch set (#2). Change subject: vty: Introduce telnet_init_default and make vty port configurable ...................................................................... vty: Introduce telnet_init_default and make vty port configurable Make configuring the bind port optional in the line vty/bind command and introduce telnet_init_default to automatically consume this value. Client code should use it like: int rc = telnet_init_default(ctx, priv, OSMO_VTY_PORT_SGSN); Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 --- M include/osmocom/vty/telnet_interface.h M include/osmocom/vty/vty.h M src/vty/telnet_interface.c M src/vty/vty.c 4 files changed, 34 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/12321/2 -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 03:40:58 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 22 Dec 2018 03:40:58 +0000 Subject: Change in libosmocore[master]: vty: Introduce telnet_init_default and make vty port configurable In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12321 ) Change subject: vty: Introduce telnet_init_default and make vty port configurable ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12321/1/include/osmocom/vty/vty.h File include/osmocom/vty/vty.h: https://gerrit.osmocom.org/#/c/12321/1/include/osmocom/vty/vty.h at 214 PS1, Line 214: int vty_get_bind_port(int default_port); > Is there any use-case where we want to call vty_get_bind_port() with negative value? To see if it has been set through the VTY. It is convenient to have elements outside the range settable by users. But it is not only negative but also everything above 16 bits. -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 22 Dec 2018 03:40:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 08:16:43 2018 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Sat, 22 Dec 2018 08:16:43 +0000 Subject: Change in libosmocore[master]: vty: The telnet interface is TCP only. Fix the comments In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/12425 ) Change subject: vty: The telnet interface is TCP only. Fix the comments ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38555c4d4f565ce21dda34fc3857c47b3d802dbd Gerrit-Change-Number: 12425 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 22 Dec 2018 08:16:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 13:27:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 22 Dec 2018 13:27:11 +0000 Subject: Change in libosmocore[master]: vty: The telnet interface is TCP only. Fix the comments In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12425 ) Change subject: vty: The telnet interface is TCP only. Fix the comments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38555c4d4f565ce21dda34fc3857c47b3d802dbd Gerrit-Change-Number: 12425 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 22 Dec 2018 13:27:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Dec 22 15:14:11 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 22 Dec 2018 15:14:11 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-asn1c_=C2=BB_a1=3Ddefault,?= =?UTF-8?Q?a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#347?= In-Reply-To: <884155665.132.1545405007548.JavaMail.jenkins@jenkins.osmocom.org> References: <884155665.132.1545405007548.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1815995571.156.1545491651628.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat Dec 22 16:49:14 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 22 Dec 2018 16:49:14 +0000 Subject: Change in libosmocore[master]: vty: Make TCP port configurable and introduce telnet_init_default In-Reply-To: References: Message-ID: Hello Stefan Sperling, Vadim Yanitskiy, Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12321 to look at the new patch set (#3). Change subject: vty: Make TCP port configurable and introduce telnet_init_default ...................................................................... vty: Make TCP port configurable and introduce telnet_init_default Extend the vty_bind_cmd VTY command to allow to optionally specify a port in addition to the IPv4 address. Introduce telnet_init_default to relieve client code from having to query the bind IPv4 address (and now the TCP port). Instead a client only needs to pass the default TCP port to use. Client code should use it like: int rc = telnet_init_default(ctx, priv, OSMO_VTY_PORT_SGSN); Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 --- M include/osmocom/vty/telnet_interface.h M include/osmocom/vty/vty.h M src/vty/telnet_interface.c M src/vty/vty.c 4 files changed, 34 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/12321/3 -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 16:50:23 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 22 Dec 2018 16:50:23 +0000 Subject: Change in libosmocore[master]: vty: Make TCP port configurable and introduce telnet_init_default In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12321 ) Change subject: vty: Make TCP port configurable and introduce telnet_init_default ...................................................................... Patch Set 3: > Patch Set 1: Code-Review-1 > > (4 comments) > > I still would like to see a better commit description. "better" is not very actionable. What do you think can/should be better in the commit description? -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 22 Dec 2018 16:50:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 18:32:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 18:32:45 +0000 Subject: Change in libosmocore[master]: vty: Make TCP port configurable and introduce telnet_init_default In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12321 ) Change subject: vty: Make TCP port configurable and introduce telnet_init_default ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 22 Dec 2018 18:32:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 18:33:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 18:33:06 +0000 Subject: Change in libosmocore[master]: vty: The telnet interface is TCP only. Fix the comments In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12425 ) Change subject: vty: The telnet interface is TCP only. Fix the comments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38555c4d4f565ce21dda34fc3857c47b3d802dbd Gerrit-Change-Number: 12425 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 22 Dec 2018 18:33:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 18:34:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 18:34:55 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: update comments In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12423 ) Change subject: ctrl2cgi: update comments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5ace594adbccf7ce7eda2c19aa639a4f46285c25 Gerrit-Change-Number: 12423 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: tnt Gerrit-Comment-Date: Sat, 22 Dec 2018 18:34:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 18:34:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 18:34:59 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: update comments In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12423 ) Change subject: ctrl2cgi: update comments ...................................................................... ctrl2cgi: update comments * remove obsolete comments * add missing function comments Change-Id: I5ace594adbccf7ce7eda2c19aa639a4f46285c25 --- M scripts/ctrl2cgi.py 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 3226c1d..2cf386c 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -29,7 +29,7 @@ import json import configparser from functools import partial -from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available +from distutils.version import StrictVersion as V from twisted.internet import defer, reactor from treq import post, collect from osmopy.trap_helper import debug_init, get_type, get_r, p_h, make_params, comm_proc @@ -58,6 +58,9 @@ comm_proc(decoded.get('commands'), bid, f, log) def gen_hash(params, skey): + """ + Make mandatory parameter for http request + """ inp = '' for key in ['time_stamp', 'position_validity', 'admin_status', 'policy_status']: inp += str(params.get(key)) @@ -67,10 +70,12 @@ m = hashlib.md5() m.update(inp.encode('utf-8')) res = m.hexdigest() - #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res def make_async_req(ts, dst, par, f_write, f_log, tout): + """ + Assemble deferred request parameters and partially instantiate response handler + """ d = post(dst, par, timeout=tout) d.addCallback(collect, partial(handle_reply, ts, datetime.datetime.now(), par['bsc_id'], f_write, f_log)) d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s (timeout %d)" % (repr(e), par['bsc_id'], dst, tout))) # handle HTTP errors -- To view, visit https://gerrit.osmocom.org/12423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5ace594adbccf7ce7eda2c19aa639a4f46285c25 Gerrit-Change-Number: 12423 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:14:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:14:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: Add SGs testcases In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: Add SGs testcases ...................................................................... Patch Set 19: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 19 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: dexter Gerrit-Comment-Date: Sat, 22 Dec 2018 20:14:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:14:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:14:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Optionally check MM Info In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12422 ) Change subject: MSC_ConnectionHandler: Optionally check MM Info ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I431f50c2ff3536f87f0c7c3caf23b7a38d501904 Gerrit-Change-Number: 12422 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 22 Dec 2018 20:14:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:14:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:14:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Optionally check MM Info In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12422 ) Change subject: MSC_ConnectionHandler: Optionally check MM Info ...................................................................... MSC_ConnectionHandler: Optionally check MM Info The MM Info message is an optional message that is set to the MS usually after the location update. It contains the full network name and time information. At the moment the presence of this message is not checked or expected since sending of MM-Info is explicitly disabled in the osmo-msc configu. This patch adds an optional check of MM Info that is disabled by default. Change-Id: I431f50c2ff3536f87f0c7c3caf23b7a38d501904 Related: OS#3615 --- M library/L3_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 3 files changed, 38 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 3918f3d..3978498 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -2972,6 +2972,26 @@ } } +template PDU_ML3_NW_MS tr_ML3_MT_MM_Info := { + discriminator := '0101'B, + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + mm := { + mMInformation := { + messageType := '110010'B, + nsd := '00'B, + fullNetworkName := *, + shortNetworkName := *, + localtimeZone := *, + univTime := *, + lSAIdentity := *, + networkDST := * + } + } + } +} diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 1b31f75..bf83dd3 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -69,7 +69,8 @@ boolean send_early_cm, charstring ipa_ctrl_ip, integer ipa_ctrl_port, - boolean ipa_ctrl_enable + boolean ipa_ctrl_enable, + boolean mm_info }; /* get a one-octet bitmaks of supported algorithms based on Classmark information */ @@ -315,6 +316,12 @@ } } +function f_expect_mm_info() runs on BSC_ConnHdlr { + if (g_pars.mm_info == true) { + BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_Info)); + } +} + function f_perform_lu() runs on BSC_ConnHdlr { var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi) @@ -363,6 +370,10 @@ mtc.stop; } } + + /* Wait for MM-Information (if enabled) */ + f_expect_mm_info(); + /* FIXME: there could be pending SMS or other common procedures by the MSC, let's ignore them */ BSSAP.receive(tr_BSSMAP_ClearCommand); BSSAP.send(ts_BSSMAP_ClearComplete); diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index d121b63..0ac61bc 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -95,6 +95,7 @@ integer mp_msc_vty_port := 4254; /* local parameters of emulated HLR */ + boolean mp_mm_info := false; charstring mp_hlr_ip := "127.0.0.1"; integer mp_hlr_port := 4222; charstring mp_mgw_ip := "127.0.0.1"; @@ -457,7 +458,8 @@ send_early_cm := true, ipa_ctrl_ip := mp_msc_ip, ipa_ctrl_port := mp_msc_ctrl_port, - ipa_ctrl_enable := true + ipa_ctrl_enable := true, + mm_info := mp_mm_info }; return pars; } @@ -855,6 +857,9 @@ } } + /* Wait for MM-Information (if enabled) */ + f_expect_mm_info(); + /* wait for normal teardown */ f_expect_clear(); } -- To view, visit https://gerrit.osmocom.org/12422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I431f50c2ff3536f87f0c7c3caf23b7a38d501904 Gerrit-Change-Number: 12422 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:15:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:15:42 +0000 Subject: Change in osmo-hlr[master]: Reply to CHECK-IMEI GSUP messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12411 ) Change subject: Reply to CHECK-IMEI GSUP messages ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12411/2/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/12411/2/src/hlr.c at 431 PS2, Line 431: osmo_gsup_encode > Not critical, but what if this function would fail? [?] this is correct, but the style of the new code follows the style of the existing code, where the return value isn't checked either. Let's address that (if needed) in a separate patch. -- To view, visit https://gerrit.osmocom.org/12411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib240474b0c3c603ba840cf26babb38a44dfc9364 Gerrit-Change-Number: 12411 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 22 Dec 2018 20:15:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:15:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:15:53 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: explain msg format columns In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12413 ) Change subject: chapters/gsup.adoc: explain msg format columns ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf8614d4d0f462174426fd3afdb34bedfb859951 Gerrit-Change-Number: 12413 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 22 Dec 2018 20:15:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:16:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:16:12 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document CHECK-IMEI In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12414 ) Change subject: chapters/gsup.adoc: document CHECK-IMEI ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51dd09cda3c595f1d252546285ced9f06c748617 Gerrit-Change-Number: 12414 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 22 Dec 2018 20:16:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:16:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:16:45 +0000 Subject: Change in libasn1c[master]: Revert "jenkins.sh: disable parallel build" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12420 ) Change subject: Revert "jenkins.sh: disable parallel build" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73eac905524688939e133b6f91ad85514dc0393a Gerrit-Change-Number: 12420 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 22 Dec 2018 20:16:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:16:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:16:46 +0000 Subject: Change in libasn1c[master]: Revert "jenkins.sh: disable parallel build" In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12420 ) Change subject: Revert "jenkins.sh: disable parallel build" ...................................................................... Revert "jenkins.sh: disable parallel build" This reverts commit a352642587d8835deb3c6f55da7986f427835157. I've confused the libasn1c and asn1c repositories. libasn1c does not need this workaround, asn1c does. Related Change-Id: I80eecc60b96e87710218089dfdd1a3f87b40a8b1 (asn1c) Change-Id: I73eac905524688939e133b6f91ad85514dc0393a --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index dbdfda6..7d68736 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -14,10 +14,7 @@ autoreconf --install --force ./configure --enable-werror - -# Parallel make is disabled due to a race condition. On Jenkins, it often -# aborts the build with: "asn1p_y.y:357:13: error: 'param' undeclared" -$MAKE -j1 +$MAKE $PARALLEL_MAKE $MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/12420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I73eac905524688939e133b6f91ad85514dc0393a Gerrit-Change-Number: 12420 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:17:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:17:17 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: explicitly ignore unrelated TRAPs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12421 ) Change subject: ctrl2cgi: explicitly ignore unrelated TRAPs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42b715cb82eb309950ff387649726504b6c7cf61 Gerrit-Change-Number: 12421 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sat, 22 Dec 2018 20:17:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:19:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:19:07 +0000 Subject: Change in libosmo-sccp[master]: fix ipa_asp_fsm down state transition In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12364 ) Change subject: fix ipa_asp_fsm down state transition ...................................................................... fix ipa_asp_fsm down state transition Properly transition into IPA_ASP_S_DOWN from IPA_ASP_S_ACTIVE and fix the mask of legal out states from IPA_ASP_S_ACTIVE. BSC-sccplite tests are still passing with this change. Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Related: OS#3111 --- M src/xua_asp_fsm.c 1 file changed, 27 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index d6edac0..9dc9a82 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -916,6 +916,29 @@ } } +static void ipa_asp_fsm_del_route(struct ipa_asp_fsm_priv *iafp) +{ + struct osmo_ss7_asp *asp = iafp->asp; + struct osmo_ss7_instance *inst = asp->inst; + struct osmo_ss7_as *as = osmo_ss7_as_find_by_rctx(inst, 0); + struct osmo_ss7_route *rt; + + OSMO_ASSERT(as); + + /* find the route which we have created if we ever reached ipa_asp_fsm_wait_id_ack2 */ + rt = osmo_ss7_route_find_dpc_mask(inst->rtable_system, as->cfg.routing_key.pc, 0xffffff); + /* no route found, bail out */ + if (!rt) + return; + /* route points to different AS, bail out */ + if (rt->dest.as != as) + return; + + osmo_ss7_route_destroy(rt); + /* FIXME: Why don't we also delete this timer if we return early above? + * FIXME: Where is this timer even scheduled? */ + osmo_timer_del(&iafp->pong_timer); +} /* Server + Client: We're actively transmitting user data */ static void ipa_asp_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -923,7 +946,8 @@ switch (event) { case XUA_ASP_E_M_ASP_DOWN_REQ: case XUA_ASP_E_M_ASP_INACTIVE_REQ: - /* FIXME: kill ASP and (wait for) re-connect */ + ipa_asp_fsm_del_route(fi->priv); + osmo_fsm_inst_state_chg(fi, IPA_ASP_S_DOWN, 0, 0); break; } } @@ -1025,8 +1049,7 @@ [IPA_ASP_S_ACTIVE] = { .in_event_mask = S(XUA_ASP_E_M_ASP_DOWN_REQ) | S(XUA_ASP_E_M_ASP_INACTIVE_REQ), - .out_state_mask = S(XUA_ASP_S_INACTIVE) | - S(XUA_ASP_S_DOWN), + .out_state_mask = S(IPA_ASP_S_DOWN), .name = "ASP_ACTIVE", .action = ipa_asp_fsm_active, .onenter = ipa_asp_fsm_active_onenter, @@ -1035,25 +1058,7 @@ static void ipa_asp_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { - struct ipa_asp_fsm_priv *iafp = fi->priv; - struct osmo_ss7_asp *asp = iafp->asp; - struct osmo_ss7_instance *inst = asp->inst; - struct osmo_ss7_as *as = osmo_ss7_as_find_by_rctx(inst, 0); - struct osmo_ss7_route *rt; - - OSMO_ASSERT(as); - - /* find the route which we have created if we ever reached ipa_asp_fsm_wait_id_ack2 */ - rt = osmo_ss7_route_find_dpc_mask(inst->rtable_system, as->cfg.routing_key.pc, 0xffffff); - /* no route found, bail out */ - if (!rt) - return; - /* route points to different AS, bail out */ - if (rt->dest.as != as) - return; - - osmo_ss7_route_destroy(rt); - osmo_timer_del(&iafp->pong_timer); + ipa_asp_fsm_del_route(fi->priv); } struct osmo_fsm ipa_asp_fsm = { -- To view, visit https://gerrit.osmocom.org/12364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571 Gerrit-Change-Number: 12364 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:19:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:19:36 +0000 Subject: Change in osmo-msc[master]: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12387 ) Change subject: vty cfg: move 'ipa-name' from 'msc' to 'hlr' section ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a572865aa90c5fa43c6f57282a6e2b06776e425 Gerrit-Change-Number: 12387 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sat, 22 Dec 2018 20:19:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:20:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:20:16 +0000 Subject: Change in osmo-bsc[master]: comments: describe some lchan details In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12406 ) Change subject: comments: describe some lchan details ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I04ec4ce1fd2b7b110bb496186aae39ecfbbc3628 Gerrit-Change-Number: 12406 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 22 Dec 2018 20:20:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:20:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:20:42 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: tweak some log levels INFO -> {DEBUG, ERROR} In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12407 ) Change subject: mgcp_client: tweak some log levels INFO -> {DEBUG,ERROR} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie4ecb4b82a7a1e476c58d0a6056525733254adbb Gerrit-Change-Number: 12407 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 22 Dec 2018 20:20:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 22 20:23:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 22 Dec 2018 20:23:53 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: make domain part of endpoint configurable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12357 ) Change subject: mgcp_client: make domain part of endpoint configurable ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/12357/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12357/3//COMMIT_MSG at 20 PS3, Line 20: Rationale: reading pcaps becomes so much easier when each of osmo-bsc and : osmo-msc address their MGW with differing domain names. Otherwise, both will : have a '0 at mgw' endpoint and it gets really confusing. How cold both use the same endpoint? The endpoint names (local part in front of @) is allocated by the mgw, so if osmo-bsc uses 0 at mgw, osmo-msc will get allocated foo at mgw where foo != "0". https://gerrit.osmocom.org/#/c/12357/3/include/osmocom/mgcp_client/mgcp_client.h File include/osmocom/mgcp_client/mgcp_client.h: https://gerrit.osmocom.org/#/c/12357/3/include/osmocom/mgcp_client/mgcp_client.h at 28 PS3, Line 28: 64 why 64? Is there some kind of maximum DNS domain name length we should use? -- To view, visit https://gerrit.osmocom.org/12357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8 Gerrit-Change-Number: 12357 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 22 Dec 2018 20:23:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Dec 22 23:18:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 22 Dec 2018 23:18:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_sysmo, su?= =?UTF-8?Q?perfemto=5Fv3.1,0,default,osmocom-master-debian9_#1588?= Message-ID: <1992691277.157.1545520701316.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 51.79 KB...] make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc8gen.c GEN crc16gen.c GEN crc32gen.c GEN crc64gen.c make install-am make[3]: Entering directory ' CC timer_gettimeofday.lo CC timer.lo CC timer_clockgettime.lo CC signal.lo CC select.lo CC msgb.lo CC bits.lo CC bitvec.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_gsmtap.lo CC logging_syslog.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC prim.lo CC stats_statsd.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC plugin.lo CC conv_acc_sse_avx.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC vty.lo CC vector.lo CC stats_vty.lo CC telnet_interface.lo CC utils.lo CC logging_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC gsm660.lo CC gsm690.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC tlv_parser.lo CC comp128.lo CC rxlev_stat.lo CC rsl.lo CC gsm_utils.lo CC gsm48.lo CC comp128v23.lo /bin/bash: line 2: 32690 Illegal instruction /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT rsl.lo -MD -MP -MF $depbase.Tpo -c -o rsl.lo rsl.c Makefile:597: recipe for target 'rsl.lo' failed make[3]: *** [rsl.lo] Error 132 make[3]: *** Waiting for unfinished jobs.... gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ make[3]: Leaving directory ' Makefile:702: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sat Dec 22 23:18:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 22 Dec 2018 23:18:22 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_sysmo,f?= =?UTF-8?Q?emtobts=5Fv2.7,1,default,osmocom-master-debian9_#1588?= Message-ID: <1927064880.158.1545520702395.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 53.57 KB...] GEN crc32gen.c GEN crc8gen.c GEN crc64gen.c GEN crc16gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC timer_clockgettime.lo CC signal.lo CC msgb.lo CC select.lo CC bitvec.lo CC bits.lo CC bitcomp.lo CC counter.lo CC write_queue.lo CC fsm.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC conv.lo CC panic.lo CC application.lo CC rbtree.lo CC backtrace.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC conv_acc_sse.lo CC isdnhdlc.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC vty.lo CC command.lo CC utils.lo CC stats_vty.lo CC telnet_interface.lo CC logging_vty.lo CC vector.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm660.lo CC gsm620.lo CC gsm610.lo CC gsm690.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC rxlev_stat.lo CC a5.lo CC tlv_parser.lo CC comp128.lo CC gsm48.lo CC comp128v23.lo CC gsm_utils.lo CC rsl.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo /bin/bash: line 2: 403 Illegal instruction /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gsm0808.lo -MD -MP -MF $depbase.Tpo -c -o gsm0808.lo gsm0808.c Makefile:597: recipe for target 'gsm0808.lo' failed make[3]: *** [gsm0808.lo] Error 132 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:702: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 00:02:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 00:02:29 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB_sysm?= =?UTF-8?Q?o,superfemto=5Fv3.1,0,default,osmocom-master-debian9_#1589?= In-Reply-To: <1992691277.157.1545520701316.JavaMail.jenkins@jenkins.osmocom.org> References: <1992691277.157.1545520701316.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <801012804.159.1545523349855.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Dec 23 00:06:05 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 00:06:05 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB_sys?= =?UTF-8?Q?mo,femtobts=5Fv2.7,1,default,osmocom-master-debian9_#1589?= In-Reply-To: <1927064880.158.1545520702395.JavaMail.jenkins@jenkins.osmocom.org> References: <1927064880.158.1545520702395.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <184496684.160.1545523565772.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 23 04:00:44 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Dec 2018 04:00:44 +0000 Subject: Change in libosmocore[master]: vty: The telnet interface is TCP only. Fix the comments In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/12425 ) Change subject: vty: The telnet interface is TCP only. Fix the comments ...................................................................... vty: The telnet interface is TCP only. Fix the comments Change-Id: I38555c4d4f565ce21dda34fc3857c47b3d802dbd --- M src/vty/telnet_interface.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, approved Harald Welte: Looks good to me, approved diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c index fcb4c8d..47c45fc 100644 --- a/src/vty/telnet_interface.c +++ b/src/vty/telnet_interface.c @@ -67,7 +67,7 @@ /*! Initialize telnet based VTY interface listening to 127.0.0.1 * \param[in] tall_ctx \ref talloc context * \param[in] priv private data to be passed to callback - * \param[in] port UDP port number + * \param[in] port TCP port number to bind to */ int telnet_init(void *tall_ctx, void *priv, int port) { @@ -78,7 +78,7 @@ * \param[in] tall_ctx \ref talloc context * \param[in] priv private data to be passed to callback * \param[in] ip IP to listen to ('::1' for localhost, '::0' for all, ...) - * \param[in] port UDP port number + * \param[in] port TCP port number to bind to */ int telnet_init_dynif(void *tall_ctx, void *priv, const char *ip, int port) { -- To view, visit https://gerrit.osmocom.org/12425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I38555c4d4f565ce21dda34fc3857c47b3d802dbd Gerrit-Change-Number: 12425 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 04:20:00 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Dec 2018 04:20:00 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: use VTY bind addr from config, deprecate cmd line opt... In-Reply-To: References: Message-ID: Holger Freyther has abandoned this change. ( https://gerrit.osmocom.org/12208 ) Change subject: Revert "mobile: use VTY bind addr from config, deprecate cmd line options" ...................................................................... Abandoned The new feature is in. -- To view, visit https://gerrit.osmocom.org/12208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ie89bc16b667dbe05baa76cfa4f86b4946f8019e8 Gerrit-Change-Number: 12208 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 04:20:08 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Dec 2018 04:20:08 +0000 Subject: Change in libosmocore[master]: vty: Make TCP port configurable and introduce telnet_init_default In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/12321 ) Change subject: vty: Make TCP port configurable and introduce telnet_init_default ...................................................................... vty: Make TCP port configurable and introduce telnet_init_default Extend the vty_bind_cmd VTY command to allow to optionally specify a port in addition to the IPv4 address. Introduce telnet_init_default to relieve client code from having to query the bind IPv4 address (and now the TCP port). Instead a client only needs to pass the default TCP port to use. Client code should use it like: int rc = telnet_init_default(ctx, priv, OSMO_VTY_PORT_SGSN); Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 --- M include/osmocom/vty/telnet_interface.h M include/osmocom/vty/vty.h M src/vty/telnet_interface.c M src/vty/vty.c 4 files changed, 34 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/vty/telnet_interface.h b/include/osmocom/vty/telnet_interface.h index d653466..da7cf83 100644 --- a/include/osmocom/vty/telnet_interface.h +++ b/include/osmocom/vty/telnet_interface.h @@ -47,6 +47,7 @@ int telnet_init(void *tall_ctx, void *priv, int port); int telnet_init_dynif(void *tall_ctx, void *priv, const char *ip, int port); +int telnet_init_default(void *tall_ctx, void *priv, int default_port); void telnet_exit(void); diff --git a/include/osmocom/vty/vty.h b/include/osmocom/vty/vty.h index 02ba03e..c4cf707 100644 --- a/include/osmocom/vty/vty.h +++ b/include/osmocom/vty/vty.h @@ -210,6 +210,8 @@ /* Return IP address passed to the 'line vty'/'bind' command, or "127.0.0.1" */ const char *vty_get_bind_addr(void); +/** Returns configured port passed to the 'line vty'/'bind' command or default_port. */ +int vty_get_bind_port(int default_port); extern void *tall_vty_ctx; diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c index 47c45fc..e090e17 100644 --- a/src/vty/telnet_interface.c +++ b/src/vty/telnet_interface.c @@ -105,6 +105,18 @@ return 0; } +/*! Initializes telnet based VTY interface using the configured bind addr/port. + * \param[in] tall_ctx \ref talloc context + * \param[in] priv private data to be passed to callback + * \param[in] default_port TCP port number to bind to if not explicitely configured + */ +int telnet_init_default(void *tall_ctx, void *priv, int default_port) +{ + return telnet_init_dynif(tall_ctx, priv, vty_get_bind_addr(), + vty_get_bind_port(default_port)); +} + + extern struct host host; /*! close a telnet connection */ diff --git a/src/vty/vty.c b/src/vty/vty.c index 70f6811..7f6c225 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -90,6 +90,8 @@ * use NULL and VTY_BIND_ADDR_DEFAULT instead. */ static const char *vty_bind_addr = NULL; #define VTY_BIND_ADDR_DEFAULT "127.0.0.1" +/* Port the VTY should bind to. -1 means not configured */ +static int vty_bind_port = -1; /* Configure lock. */ static int vty_config; @@ -1612,12 +1614,13 @@ } /* vty bind */ -DEFUN(vty_bind, vty_bind_cmd, "bind A.B.C.D", +DEFUN(vty_bind, vty_bind_cmd, "bind A.B.C.D [<0-65535>]", "Accept VTY telnet connections on local interface\n" "Local interface IP address (default: " VTY_BIND_ADDR_DEFAULT ")\n") { talloc_free((void*)vty_bind_addr); vty_bind_addr = talloc_strdup(tall_vty_ctx, argv[0]); + vty_bind_port = argc > 1 ? atoi(argv[1]) : -1; return CMD_SUCCESS; } @@ -1628,6 +1631,13 @@ return vty_bind_addr; } +int vty_get_bind_port(int default_port) +{ + if (vty_bind_port >= 0) + return vty_bind_port; + return default_port; +} + DEFUN(service_advanced_vty, service_advanced_vty_cmd, "service advanced-vty", @@ -1700,8 +1710,14 @@ vty_out(vty, " login%s", VTY_NEWLINE); /* bind */ - if (vty_bind_addr && (strcmp(vty_bind_addr, VTY_BIND_ADDR_DEFAULT) != 0)) - vty_out(vty, " bind %s%s", vty_bind_addr, VTY_NEWLINE); + if (vty_bind_addr && (strcmp(vty_bind_addr, VTY_BIND_ADDR_DEFAULT) != 0 || vty_bind_port >= 0)) { + if (vty_bind_port >= 0) { + vty_out(vty, " bind %s %d%s", vty_bind_addr, + vty_bind_port, VTY_NEWLINE); + } else { + vty_out(vty, " bind %s%s", vty_bind_addr, VTY_NEWLINE); + } + } vty_out(vty, "!%s", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/12321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id5fb2faaf4311bd7284ee870526a6f87b7e260f3 Gerrit-Change-Number: 12321 Gerrit-PatchSet: 4 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 23 04:23:50 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:23:50 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_v20?= =?UTF-8?Q?17.01,0,osmocom-master-debian9,lc15,True_#1103?= Message-ID: <1823779805.169.1545539030436.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 138.72 KB...] ^ In file included from ../../../src/gprs_debug.h:25:0, from ../../../src/osmo-bts-litecell15/lc15_l1_if.c:35: ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?handle_ph_data_ind?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :93:54: note: in definition of macro ?LOGPSRCC? logp2(ss, level, caller_file, caller_line, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :95:48: note: in definition of macro ?LOGPSRCC? logp2(ss, level, __FILE__, __LINE__, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?l1if_pdch_req?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:321:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] data_req->hLayer1 = (HANDLE)fl1h->hLayer1; ^ CC osmo-bts-litecell15/lc15_l1_hw.o CC osmo-bts-litecell15/lc15bts.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in doc make[2]: Entering directory ' Making all in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' Making all in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' Making all in contrib make[2]: Entering directory ' Making all in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in doc make[2]: Entering directory ' Making dvi in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' Making dvi in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in contrib make[2]: Entering directory ' Making dvi in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in doc make[2]: Entering directory ' Making check in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## ---------------------------------- ## ## osmo-pcu 0.5.1.38-5b52 test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' osmotestvty.py -p -w -v test_history (__main__.TestVTY) ... ok test_terminal_length (__main__.TestVTY) ... ok test_unknown_command (__main__.TestVTY) ... ok ---------------------------------------------------------------------- Ran 3 tests in 0.813s OK confpath workdir Running tests for specific VTY commands Launch: src/osmo-pcu -c from Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' osmotestconfig.py -p -w -v Documentation error (missing docs): ERRORS: 1 Verifying src/osmo-pcu -c test verify_doc Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test write_config Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test token_vty_command Launching: PWD= 'src/osmo-pcu' '-c' ' Makefile:1256: recipe for target 'python-tests' failed make[4]: *** [python-tests] Error 1 make[4]: Leaving directory ' Makefile:1263: recipe for target 'check-local' failed make[3]: *** [check-local] Error 2 make[3]: Leaving directory ' Makefile:1097: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:466: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:671: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:25:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:25:14 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7653?= Message-ID: <1247862856.170.1545539114543.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.18 MB...] build 12184 0.0 0.0 21474974756 15112 ? R 04:24 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg3nADe9 build 12191 0.0 0.0 4336 732 ? S 04:24 0:00 /bin/sh -c ps xua | grep osmo build 12193 0.0 0.0 11128 1028 ? S 04:24 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg3nADe9, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfg3nADe9' > ls -l /proc/12173/fd total 0 lr-x------ 1 build build 64 Dec 23 04:24 0 -> pipe:[235424179] l-wx------ 1 build build 64 Dec 23 04:24 1 -> pipe:[235424180] lr-x------ 1 build build 64 Dec 23 04:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:24 2 -> pipe:[235424181] l-wx------ 1 build build 64 Dec 23 04:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12173 0.8 0.0 39752 14652 ? S 04:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12194 0.0 0.0 21474974756 12492 ? R 04:24 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg3nADe9 build 12201 0.0 0.0 4336 732 ? S 04:24 0:00 /bin/sh -c ps xua | grep osmo build 12203 0.0 0.0 11128 1028 ? S 04:24 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/12173/fd total 0 lr-x------ 1 build build 64 Dec 23 04:24 0 -> pipe:[235424179] l-wx------ 1 build build 64 Dec 23 04:24 1 -> pipe:[235424180] lr-x------ 1 build build 64 Dec 23 04:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:24 2 -> pipe:[235424181] l-wx------ 1 build build 64 Dec 23 04:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12173 0.5 0.0 39752 14652 ? S 04:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12204 0.0 0.0 21474974756 14420 ? R 04:24 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 12211 0.0 0.0 4336 732 ? S 04:24 0:00 /bin/sh -c ps xua | grep osmo build 12213 0.0 0.0 11128 1028 ? S 04:24 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgAyTTZA, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgAyTTZA' > ls -l /proc/12173/fd total 0 lr-x------ 1 build build 64 Dec 23 04:24 0 -> pipe:[235424179] l-wx------ 1 build build 64 Dec 23 04:24 1 -> pipe:[235424180] lr-x------ 1 build build 64 Dec 23 04:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:24 2 -> pipe:[235424181] l-wx------ 1 build build 64 Dec 23 04:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12173 0.5 0.0 39752 14668 ? S 04:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12214 0.0 0.0 21474979696 16424 ? D 04:24 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgAyTTZA build 12221 0.0 0.0 4336 732 ? S 04:24 0:00 /bin/sh -c ps xua | grep osmo build 12223 0.0 0.0 4336 104 ? R 04:24 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgAyTTZA, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgAyTTZA' > ls -l /proc/12173/fd total 0 lr-x------ 1 build build 64 Dec 23 04:24 0 -> pipe:[235424179] l-wx------ 1 build build 64 Dec 23 04:24 1 -> pipe:[235424180] lr-x------ 1 build build 64 Dec 23 04:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:24 2 -> pipe:[235424181] l-wx------ 1 build build 64 Dec 23 04:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12173 0.4 0.0 39752 14668 ? S 04:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12224 0.0 0.0 21474974760 14980 ? R 04:24 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgAyTTZA build 12231 0.0 0.0 4336 732 ? S 04:24 0:00 /bin/sh -c ps xua | grep osmo build 12233 0.0 0.0 11128 1028 ? S 04:24 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/12173/fd total 0 lr-x------ 1 build build 64 Dec 23 04:24 0 -> pipe:[235424179] l-wx------ 1 build build 64 Dec 23 04:24 1 -> pipe:[235424180] lr-x------ 1 build build 64 Dec 23 04:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:24 2 -> pipe:[235424181] l-wx------ 1 build build 64 Dec 23 04:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12173 0.3 0.0 39752 14668 ? S 04:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12234 0.0 0.0 21474974756 13888 ? R 04:25 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 12241 0.0 0.0 4336 732 ? S 04:25 0:00 /bin/sh -c ps xua | grep osmo build 12243 0.0 0.0 11128 1028 ? S 04:25 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgfg1_mZ, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgfg1_mZ' > ls -l /proc/12173/fd total 0 lr-x------ 1 build build 64 Dec 23 04:24 0 -> pipe:[235424179] l-wx------ 1 build build 64 Dec 23 04:24 1 -> pipe:[235424180] lr-x------ 1 build build 64 Dec 23 04:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:24 2 -> pipe:[235424181] l-wx------ 1 build build 64 Dec 23 04:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12173 0.3 0.0 39752 14668 ? S 04:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12244 0.0 0.0 21474974756 13728 ? R 04:25 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgfg1_mZ build 12251 0.0 0.0 4336 732 ? S 04:25 0:00 /bin/sh -c ps xua | grep osmo build 12253 0.0 0.0 11128 1028 ? S 04:25 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgfg1_mZ, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgfg1_mZ' > ls -l /proc/12173/fd total 0 lr-x------ 1 build build 64 Dec 23 04:24 0 -> pipe:[235424179] l-wx------ 1 build build 64 Dec 23 04:24 1 -> pipe:[235424180] lr-x------ 1 build build 64 Dec 23 04:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:24 2 -> pipe:[235424181] l-wx------ 1 build build 64 Dec 23 04:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12173 0.3 0.0 39752 14668 ? S 04:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12254 0.0 0.0 21474979732 15488 ? R 04:25 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgfg1_mZ build 12261 0.0 0.0 4336 732 ? S 04:25 0:00 /bin/sh -c ps xua | grep osmo build 12263 0.0 0.0 11128 1028 ? S 04:25 0:00 grep osmo ERRORS: 3 Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) make[7]: *** [vty-python-test] Error 3 Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:743: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:29:32 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:29:32 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7669?= Message-ID: <613836532.171.1545539372030.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 277.43 KB...] State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32110 1.2 0.0 39608 14488 ? S 04:29 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32151 0.0 0.0 21474958492 11276 ? S 04:29 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg2evIxL build 32158 0.0 0.0 4336 724 ? S 04:29 0:00 /bin/sh -c ps xua | grep osmo build 32160 0.0 0.0 11128 1020 ? S 04:29 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg2evIxL, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfg2evIxL' > ls -l /proc/32110/fd total 0 lr-x------ 1 build build 64 Dec 23 04:29 0 -> pipe:[235648734] l-wx------ 1 build build 64 Dec 23 04:29 1 -> pipe:[235648735] lr-x------ 1 build build 64 Dec 23 04:29 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:29 2 -> pipe:[235648736] l-wx------ 1 build build 64 Dec 23 04:29 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4263 *:* LISTEN 0 10 127.0.0.1:4246 *:* > ps xua | grep osmo build 32110 1.0 0.0 39608 14488 ? S 04:29 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32161 0.0 0.0 21474958492 11388 ? S 04:29 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg2evIxL build 32168 0.0 0.0 4336 724 ? S 04:29 0:00 /bin/sh -c ps xua | grep osmo build 32170 0.0 0.0 11128 1020 ? S 04:29 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/32110/fd total 0 lr-x------ 1 build build 64 Dec 23 04:29 0 -> pipe:[235648734] l-wx------ 1 build build 64 Dec 23 04:29 1 -> pipe:[235648735] lr-x------ 1 build build 64 Dec 23 04:29 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:29 2 -> pipe:[235648736] l-wx------ 1 build build 64 Dec 23 04:29 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32110 0.8 0.0 39608 14488 ? S 04:29 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32171 1.0 0.0 21475032288 17992 ? R 04:29 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 32178 0.0 0.0 4336 724 ? S 04:29 0:00 /bin/sh -c ps xua | grep osmo build 32180 0.0 0.0 11128 1020 ? S 04:29 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgYPMMuL, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgYPMMuL' > ls -l /proc/32110/fd total 0 lr-x------ 1 build build 64 Dec 23 04:29 0 -> pipe:[235648734] l-wx------ 1 build build 64 Dec 23 04:29 1 -> pipe:[235648735] lr-x------ 1 build build 64 Dec 23 04:29 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:29 2 -> pipe:[235648736] l-wx------ 1 build build 64 Dec 23 04:29 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32110 0.8 0.0 39764 14540 ? S 04:29 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32181 0.0 0.0 21475098452 26696 ? R 04:29 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgYPMMuL build 32188 0.0 0.0 4336 724 ? S 04:29 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgYPMMuL, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgYPMMuL' > ls -l /proc/32110/fd total 0 lr-x------ 1 build build 64 Dec 23 04:29 0 -> pipe:[235648734] l-wx------ 1 build build 64 Dec 23 04:29 1 -> pipe:[235648735] lr-x------ 1 build build 64 Dec 23 04:29 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:29 2 -> pipe:[235648736] l-wx------ 1 build build 64 Dec 23 04:29 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32110 0.7 0.0 39764 14540 ? S 04:29 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32191 0.0 0.0 21474966128 13124 ? D 04:29 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgYPMMuL build 32198 0.0 0.0 4336 724 ? S 04:29 0:00 /bin/sh -c ps xua | grep osmo build 32200 0.0 0.0 4336 104 ? R 04:29 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/32110/fd total 0 lr-x------ 1 build build 64 Dec 23 04:29 0 -> pipe:[235648734] l-wx------ 1 build build 64 Dec 23 04:29 1 -> pipe:[235648735] lr-x------ 1 build build 64 Dec 23 04:29 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:29 2 -> pipe:[235648736] l-wx------ 1 build build 64 Dec 23 04:29 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32110 0.7 0.0 39764 14540 ? S 04:29 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32201 0.0 0.0 21474956232 10668 ? S 04:29 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 32208 0.0 0.0 4336 724 ? S 04:29 0:00 /bin/sh -c ps xua | grep osmo build 32210 0.0 0.0 4336 104 ? R 04:29 0:00 /bin/sh -c ps xua | grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgblKZrF, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgblKZrF' > ls -l /proc/32110/fd total 0 lr-x------ 1 build build 64 Dec 23 04:29 0 -> pipe:[235648734] l-wx------ 1 build build 64 Dec 23 04:29 1 -> pipe:[235648735] lr-x------ 1 build build 64 Dec 23 04:29 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:29 2 -> pipe:[235648736] l-wx------ 1 build build 64 Dec 23 04:29 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32110 0.6 0.0 39764 14540 ? S 04:29 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32211 0.0 0.0 21474956232 10664 ? S 04:29 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgblKZrF build 32218 0.0 0.0 4336 724 ? S 04:29 0:00 /bin/sh -c ps xua | grep osmo build 32220 0.0 0.0 11128 1020 ? S 04:29 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgblKZrF, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgblKZrF' > ls -l /proc/32110/fd total 0 lr-x------ 1 build build 64 Dec 23 04:29 0 -> pipe:[235648734] l-wx------ 1 build build 64 Dec 23 04:29 1 -> pipe:[235648735] lr-x------ 1 build build 64 Dec 23 04:29 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:29 2 -> pipe:[235648736] l-wx------ 1 build build 64 Dec 23 04:29 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32110 0.6 0.0 39764 14540 ? S 04:29 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32221 0.0 0.0 21474956236 10704 ? D 04:29 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgblKZrF build 32228 0.0 0.0 4336 724 ? S 04:29 0:00 /bin/sh -c ps xua | grep osmo build 32230 0.0 0.0 11128 1020 ? S 04:29 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) ERRORS: 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 4 Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make: *** [check] Error 2 Makefile:732: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:29:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:29:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-osmo-sip-connector_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,a4=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#1000?= Message-ID: <1617871652.172.1545539375188.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 121.11 KB...] 'common/chapters/smpp.adoc' -> ' 'common/chapters/msc_mncc_mo_sip_mgcp.msc' -> ' 'common/chapters/msc_mncc_mo_rtp.msc' -> ' 'common/chapters/vty.adoc' -> ' 'common/chapters/control_if.adoc' -> ' 'common/chapters/nitb_mncc_mo_tch.msc' -> ' 'common/chapters/cell-broadcast.adoc' -> ' 'common/chapters/bibliography.adoc' -> ' 'common/chapters/sigtran-simple-3g.dot' -> ' 'common/chapters/preface.adoc' -> ' 'common/chapters/glossary.adoc' -> ' 'common/chapters/abis.adoc' -> ' 'common/chapters/port_numbers.adoc' -> ' 'common/ns_vty_additions.xml' -> ' 'common/vty_additions.xml' -> ' install: creating directory ' 'common/images/wireshark-gsmtap-log.png' -> ' 'common/images/lte-eps.dot' -> ' 'common/images/osmocom.pdf' -> ' 'common/images/sysmocom.pdf' -> ' 'common/images/lte-eps-sgs.dot' -> ' 'merge_doc.xsl' -> ' 'vty_reference.xsl' -> ' install -Dm755 "./check-depends.sh" " make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow osmo-gsm-manuals + CONFIG=--enable-manuals + set +x =============================== osmo-sip-connector =============================== + autoreconf --install --force configure.ac:23: installing './compile' configure.ac:8: installing './install-sh' configure.ac:8: installing './missing' src/Makefile.am: installing './depcomp' + ./configure --enable-werror --enable-vty-tests --enable-external-tests --enable-manuals checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking whether make supports nested variables... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for SOFIASIP... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes checking for OSMO_GSM_MANUALS_DIR... (from pkg-conf) All dependencies installed! CPPFLAGS=" -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" CFLAGS="-g -O2 -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" CXXFLAGS="" LDFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating tests/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating Makefile config.status: executing depfiles commands + make -j 4 echo 1.1.1.36-0c23 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory ' Making all in src make[2]: Entering directory ' CC sdp.o CC app.o CC call.o CC sip.o CC mncc.o CC evpoll.o CC vty.o CC main.o CCLD osmo-sip-connector make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in contrib make[2]: Entering directory ' Making all in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in doc make[2]: Entering directory ' Making all in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' Making all in manuals make[3]: Entering directory ' ln -s build ln -s common " \ ./vty/*reference.xml \ \ ./vty/*additions*.xml xmllint --xinclude --postvalid --noout osmosipconnector-vty-reference.xml + mkdir -p generated + cp ./vty/sipconn_vty_reference.xml generated/combined.xml + [ -n ] + realpath + addition= + shift + [ -f generated/combine_src.xml ] + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with generated/combine_src.xml + [ -n ./vty/sipconn_vty_additions.xml ] + realpath ./vty/sipconn_vty_additions.xml + addition= + shift + [ -f generated/combine_src.xml ] + chmod 644 generated/combine_src.xml + mv generated/combined.xml generated/combine_src.xml + xsltproc -o generated/combined.xml --stringparam with generated/combine_src.xml # a2x can't use a different output file. To support out-of-tree builds, + [ -n ] xsltproc generated/combined.xml \ > generated/docbook_vty.xml # we create a symlink at ./srcfile.adoc pointing at # ./srcfile.adoc. osmosipconnector-usermanual.adoc is the ./srcfile.adoc, # is like basename from coreutils, and . is WD. if ! [ -f osmosipconnector-usermanual.adoc ]; then \ ln -s osmosipconnector-usermanual.adoc osmosipconnector-usermanual.adoc; \ fi # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} # in TEXINPUTS=" \ a2x -L --asciidoc-opts="-f -f -f -f -a srcdir='.'" --dblatex-opts="-s -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT 1.1.1-36-g0c23" -a revdate="2018-Nov-14" osmosipconnector-usermanual.adoc || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ asciidoc -v -f -f -f -f -a srcdir='.' osmosipconnector-usermanual.adoc; exit 1) dblatex --xslt-opts="--path :$PWD/generated" \ -P draft.mode=no -o osmosipconnector-vty-reference.pdf osmosipconnector-vty-reference.xml Build the book set list... Build the listings... XSLT stylesheets DocBook - LaTeX 2e (0.3.9-3) =================================================== Stripping NS from DocBook 5/NG document. Processing stripped document. Build osmosipconnector-vty-reference.pdf 'osmosipconnector-vty-reference.pdf' successfully built make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' + make check make check-recursive make[1]: Entering directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make check-local make[3]: Entering directory ' make python-tests make[4]: Entering directory ' osmotestvty.py -p -w -v test_history (__main__.TestVTY) ... ok test_terminal_length (__main__.TestVTY) ... ok test_unknown_command (__main__.TestVTY) ... ok ---------------------------------------------------------------------- Ran 3 tests in 0.810s OK confpath workdir Running tests for specific VTY commands Launch: ./src/osmo-sip-connector -c from Opening /dev/null Launching: PWD= './src/osmo-sip-connector' '-c' ' Launch: ./src/osmo-sip-connector -c from Launching: PWD= './src/osmo-sip-connector' '-c' ' Launch: ./src/osmo-sip-connector -c from Launching: PWD= './src/osmo-sip-connector' '-c' ' osmotestconfig.py -p -w -v Documentation error (missing docs): ERRORS: 1 Verifying src/osmo-sip-connector -c test verify_doc Opening /dev/null Launching: PWD= 'src/osmo-sip-connector' '-c' ' Verifying src/osmo-sip-connector -c test write_config Launching: PWD= 'src/osmo-sip-connector' '-c' ' Verifying src/osmo-sip-connector -c test token_vty_command Launching: PWD= 'src/osmo-sip-connector' '-c' ' Makefile:415: recipe for target 'python-tests' failed make[4]: *** [python-tests] Error 1 make[4]: Leaving directory ' Makefile:421: recipe for target 'check-local' failed make[3]: *** [check-local] Error 2 make[3]: Leaving directory ' Makefile:299: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:362: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:653: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:30:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:30:49 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7669?= Message-ID: <813102597.173.1545539449081.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.04 MB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7127 0.7 0.0 39612 14604 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7168 0.0 0.0 21474958492 11360 ? S 04:30 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgJdxsFd build 7175 0.0 0.0 4336 724 ? S 04:30 0:00 /bin/sh -c ps xua | grep osmo build 7177 0.0 0.0 11128 1040 ? R 04:30 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgJdxsFd, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgJdxsFd' > ls -l /proc/7127/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169476786] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169476787] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169476788] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7127 0.7 0.0 39612 14604 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7178 0.0 0.0 21474958492 11728 ? S 04:30 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgJdxsFd build 7185 0.0 0.0 4336 760 ? S 04:30 0:00 /bin/sh -c ps xua | grep osmo build 7187 0.0 0.0 11128 1032 ? S 04:30 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/7127/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169476786] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169476787] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169476788] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7127 0.7 0.0 39612 14604 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7188 0.0 0.0 21475044716 21092 ? R 04:30 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 7195 0.0 0.0 4336 760 ? S 04:30 0:00 /bin/sh -c ps xua | grep osmo build 7197 0.0 0.0 11128 936 ? R 04:30 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgAH7osh, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgAH7osh' > ls -l /proc/7127/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169476786] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169476787] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169476788] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4245 *:* LISTEN 0 10 127.0.0.1:4251 *:* > ps xua | grep osmo build 7127 0.6 0.0 39764 14760 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7198 0.0 0.0 21475110880 31484 ? R 04:30 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgAH7osh build 7205 0.0 0.0 4336 800 ? S 04:30 0:00 /bin/sh -c ps xua | grep osmo build 7207 0.0 0.0 11128 996 ? S 04:30 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgAH7osh, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgAH7osh' > ls -l /proc/7127/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169476786] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169476787] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169476788] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7127 0.5 0.0 39764 14760 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7208 0.0 0.0 21475044716 15324 ? R 04:30 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgAH7osh build 7215 0.0 0.0 4336 804 ? S 04:30 0:00 /bin/sh -c ps xua | grep osmo build 7217 0.0 0.0 11128 1032 ? S 04:30 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/7127/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169476786] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169476787] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169476788] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 7127 0.6 0.0 39764 14760 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7218 0.0 0.0 21474962696 10920 ? S 04:30 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 7225 0.0 0.0 4336 716 ? S 04:30 0:00 /bin/sh -c ps xua | grep osmo build 7227 0.0 0.0 4336 108 ? R 04:30 0:00 /bin/sh -c ps xua | grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg7CUctN, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg7CUctN' > ls -l /proc/7127/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169476786] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169476787] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169476788] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7127 0.5 0.0 39764 14760 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7228 0.0 0.0 21474962696 11068 ? S 04:30 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg7CUctN build 7235 0.0 0.0 4336 760 ? S 04:30 0:00 /bin/sh -c ps xua | grep osmo build 7237 0.0 0.0 4336 108 ? R 04:30 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg7CUctN, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg7CUctN' > ls -l /proc/7127/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169476786] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169476787] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169476788] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 7127 0.5 0.0 39764 14760 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7238 0.0 0.0 21474962696 11048 ? S 04:30 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg7CUctN build 7245 0.0 0.0 4336 724 ? S 04:30 0:00 /bin/sh -c ps xua | grep osmo build 7247 0.0 0.0 11128 984 ? S 04:30 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:31:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:31:22 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7654?= Message-ID: <646278541.174.1545539482622.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 808.96 KB...] build 9314 0.0 0.0 4336 764 ? S 04:30 0:00 /bin/sh -c ps xua | grep osmo build 9316 0.0 0.0 11128 932 ? S 04:30 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgFycL26, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfgFycL26' > ls -l /proc/9296/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169491679] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169491680] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169491681] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9296 0.6 0.0 39756 14728 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9317 0.0 0.0 21474968784 14160 ? R 04:30 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgFycL26 build 9324 0.0 0.0 4336 728 ? S 04:30 0:00 /bin/sh -c ps xua | grep osmo build 9326 0.0 0.0 11128 988 ? S 04:30 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/9296/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169491679] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169491680] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169491681] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9296 0.4 0.0 39756 14728 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9327 0.0 0.0 21474968780 13644 ? R 04:30 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 9334 0.0 0.0 4336 716 ? R 04:30 0:00 /bin/sh -c ps xua | grep osmo build 9336 0.0 0.0 4336 108 ? R 04:30 0:00 /bin/sh -c ps xua | grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgzsBAzr, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgzsBAzr' > ls -l /proc/9296/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169491679] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169491680] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169491681] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9296 0.4 0.0 39756 14744 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9337 0.0 0.0 21474973756 14560 ? R 04:31 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgzsBAzr build 9344 0.0 0.0 4336 764 ? S 04:31 0:00 /bin/sh -c ps xua | grep osmo build 9346 0.0 0.0 11128 1048 ? S 04:31 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgzsBAzr, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgzsBAzr' > ls -l /proc/9296/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169491679] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169491680] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169491681] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9296 0.3 0.0 39756 14744 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9347 0.0 0.0 21474968780 13252 ? R 04:31 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgzsBAzr build 9354 0.0 0.0 4336 756 ? S 04:31 0:00 /bin/sh -c ps xua | grep osmo build 9356 0.0 0.0 11128 1036 ? S 04:31 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/9296/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169491679] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169491680] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169491681] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9296 0.3 0.0 39756 14744 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9357 0.0 0.0 21474968780 13524 ? R 04:31 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 9364 0.0 0.0 4336 760 ? S 04:31 0:00 /bin/sh -c ps xua | grep osmo build 9366 0.0 0.0 11128 956 ? S 04:31 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgjslPkr, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgjslPkr' > ls -l /proc/9296/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169491679] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169491680] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169491681] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9296 0.3 0.0 39756 14744 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9367 0.0 0.0 21474973756 14568 ? R 04:31 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgjslPkr build 9374 0.0 0.0 4336 768 ? S 04:31 0:00 /bin/sh -c ps xua | grep osmo build 9376 0.0 0.0 11128 1004 ? R 04:31 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgjslPkr, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgjslPkr' > ls -l /proc/9296/fd total 0 lr-x------ 1 build build 64 Dec 23 04:30 0 -> pipe:[2169491679] l-wx------ 1 build build 64 Dec 23 04:30 1 -> pipe:[2169491680] lr-x------ 1 build build 64 Dec 23 04:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:30 2 -> pipe:[2169491681] l-wx------ 1 build build 64 Dec 23 04:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9296 0.2 0.0 39756 14744 ? S 04:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9377 0.0 0.0 21474968780 13604 ? R 04:31 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgjslPkr build 9384 0.0 0.0 4336 732 ? S 04:31 0:00 /bin/sh -c ps xua | grep osmo build 9386 0.0 0.0 11128 964 ? S 04:31 0:00 grep osmo ERRORS: 3 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-python-test] Error 3 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: *** [python-tests] Error 2 make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:743: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:31:24 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:31:24 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_ma?= =?UTF-8?Q?ster,0,osmocom-master-debian9,sysmo,True_#1104?= Message-ID: <1754045820.175.1545539484154.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 132.85 KB...] CXX csn1.lo CXX gsm_rlcmac.lo CXX gprs_bssgp_pcu.lo ../../../src/gprs_bssgp_pcu.cpp:982:2: warning: #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" [-Wcpp] #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" ^~~~~~~ CXX gprs_rlcmac.lo CXX gprs_rlcmac_sched.lo CXX gprs_rlcmac_meas.lo CXX gprs_rlcmac_ts_alloc.lo CXX gprs_ms.lo CXX gprs_ms_storage.lo CXX gsm_timer.lo CXX pcu_l1_if.lo CC pcu_vty.lo CXX pcu_vty_functions.lo CC mslot_class.lo CXX tbf.lo CXX tbf_ul.lo CXX tbf_dl.lo CXX bts.lo CXX pdch.lo CXX poll_controller.lo CXX encoding.lo CXX sba.lo CXX decoding.lo CXX llc.lo CXX rlc.lo CXX osmobts_sock.lo CC gprs_codel.lo CXX gprs_coding_scheme.lo CXX egprs_rlc_compression.lo CXXLD libgprs.la ar: `u' modifier ignored since `D' is the default (see `U') CXX pcu_main.o CC osmo-bts-sysmo/sysmo_l1_if.o CC osmo-bts-sysmo/sysmo_l1_hw.o CC osmo-bts-sysmo/femtobts.o CXXLD osmo-pcu CC osmo-bts-sysmo/sysmo_l1_fwd.o CXXLD osmo-pcu-remote make[2]: Leaving directory ' Making all in doc make[2]: Entering directory ' Making all in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' Making all in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' Making all in contrib make[2]: Entering directory ' Making all in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in doc make[2]: Entering directory ' Making dvi in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' Making dvi in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in contrib make[2]: Entering directory ' Making dvi in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in doc make[2]: Entering directory ' Making check in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## ---------------------------------- ## ## osmo-pcu 0.5.1.38-5b52 test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' osmotestvty.py -p -w -v test_history (__main__.TestVTY) ... ok test_terminal_length (__main__.TestVTY) ... ok test_unknown_command (__main__.TestVTY) ... ok ---------------------------------------------------------------------- Ran 3 tests in 0.811s OK confpath workdir Running tests for specific VTY commands Launch: src/osmo-pcu -c from Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' osmotestconfig.py -p -w -v Documentation error (missing docs): ERRORS: 1 Verifying src/osmo-pcu -c test verify_doc Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test write_config Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test token_vty_command Launching: PWD= 'src/osmo-pcu' '-c' ' Makefile:1256: recipe for target 'python-tests' failed make[4]: *** [python-tests] Error 1 make[4]: Leaving directory ' Makefile:1263: recipe for target 'check-local' failed make[3]: *** [check-local] Error 2 make[3]: Leaving directory ' Makefile:1097: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:466: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:671: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:31:54 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:31:54 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7654?= In-Reply-To: <1247862856.170.1545539114543.JavaMail.jenkins@jenkins.osmocom.org> References: <1247862856.170.1545539114543.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1001696934.176.1545539514716.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.09 MB...] Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg_J2XwK, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfg_J2XwK' > ls -l /proc/12107/fd total 0 lr-x------ 1 build build 64 Dec 23 04:31 0 -> pipe:[2169493787] l-wx------ 1 build build 64 Dec 23 04:31 1 -> pipe:[2169493788] lr-x------ 1 build build 64 Dec 23 04:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:31 2 -> pipe:[2169493789] l-wx------ 1 build build 64 Dec 23 04:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12107 0.6 0.0 39756 14680 ? S 04:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12128 0.0 0.0 21474974756 14520 ? R 04:31 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg_J2XwK build 12135 0.0 0.0 4336 760 ? S 04:31 0:00 /bin/sh -c ps xua | grep osmo build 12137 0.0 0.0 11128 1000 ? S 04:31 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/12107/fd total 0 lr-x------ 1 build build 64 Dec 23 04:31 0 -> pipe:[2169493787] l-wx------ 1 build build 64 Dec 23 04:31 1 -> pipe:[2169493788] lr-x------ 1 build build 64 Dec 23 04:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:31 2 -> pipe:[2169493789] l-wx------ 1 build build 64 Dec 23 04:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12107 0.4 0.0 39756 14680 ? S 04:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12138 0.0 0.0 21474974756 10916 ? R 04:31 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 12145 0.0 0.0 4336 724 ? S 04:31 0:00 /bin/sh -c ps xua | grep osmo build 12147 0.0 0.0 11128 1000 ? S 04:31 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgJrE6JO, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgJrE6JO' > ls -l /proc/12107/fd total 0 lr-x------ 1 build build 64 Dec 23 04:31 0 -> pipe:[2169493787] l-wx------ 1 build build 64 Dec 23 04:31 1 -> pipe:[2169493788] lr-x------ 1 build build 64 Dec 23 04:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:31 2 -> pipe:[2169493789] l-wx------ 1 build build 64 Dec 23 04:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12107 0.4 0.0 39756 14692 ? S 04:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12148 0.0 0.0 21474974756 14024 ? R 04:31 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgJrE6JO build 12155 0.0 0.0 4336 724 ? S 04:31 0:00 /bin/sh -c ps xua | grep osmo build 12157 0.0 0.0 4336 104 ? R 04:31 0:00 /bin/sh -c ps xua | grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgJrE6JO, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgJrE6JO' > ls -l /proc/12107/fd total 0 lr-x------ 1 build build 64 Dec 23 04:31 0 -> pipe:[2169493787] l-wx------ 1 build build 64 Dec 23 04:31 1 -> pipe:[2169493788] lr-x------ 1 build build 64 Dec 23 04:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:31 2 -> pipe:[2169493789] l-wx------ 1 build build 64 Dec 23 04:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12107 0.3 0.0 39756 14692 ? S 04:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12158 0.0 0.0 21474974756 15292 ? R 04:31 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgJrE6JO build 12165 0.0 0.0 4336 732 ? S 04:31 0:00 /bin/sh -c ps xua | grep osmo build 12167 0.0 0.0 11128 1000 ? S 04:31 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/12107/fd total 0 lr-x------ 1 build build 64 Dec 23 04:31 0 -> pipe:[2169493787] l-wx------ 1 build build 64 Dec 23 04:31 1 -> pipe:[2169493788] lr-x------ 1 build build 64 Dec 23 04:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:31 2 -> pipe:[2169493789] l-wx------ 1 build build 64 Dec 23 04:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12107 0.2 0.0 39756 14692 ? S 04:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12168 0.0 0.0 21474974756 14016 ? R 04:31 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 12175 0.0 0.0 4336 812 ? S 04:31 0:00 /bin/sh -c ps xua | grep osmo build 12177 0.0 0.0 11128 1028 ? S 04:31 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgwUyTJp, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgwUyTJp' > ls -l /proc/12107/fd total 0 lr-x------ 1 build build 64 Dec 23 04:31 0 -> pipe:[2169493787] l-wx------ 1 build build 64 Dec 23 04:31 1 -> pipe:[2169493788] lr-x------ 1 build build 64 Dec 23 04:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:31 2 -> pipe:[2169493789] l-wx------ 1 build build 64 Dec 23 04:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4254 *:* LISTEN 0 10 127.0.0.1:4255 *:* > ps xua | grep osmo build 12107 0.3 0.0 39756 14692 ? S 04:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12178 0.0 0.0 21474979696 16568 ? D 04:31 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgwUyTJp build 12185 0.0 0.0 4336 732 ? S 04:31 0:00 /bin/sh -c ps xua | grep osmo build 12187 0.0 0.0 11128 1032 ? S 04:31 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgwUyTJp, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgwUyTJp' > ls -l /proc/12107/fd total 0 lr-x------ 1 build build 64 Dec 23 04:31 0 -> pipe:[2169493787] l-wx------ 1 build build 64 Dec 23 04:31 1 -> pipe:[2169493788] lr-x------ 1 build build 64 Dec 23 04:31 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:31 2 -> pipe:[2169493789] l-wx------ 1 build build 64 Dec 23 04:31 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12107 0.3 0.0 39756 14692 ? S 04:31 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12188 0.0 0.0 21474974756 14460 ? R 04:31 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgwUyTJp build 12195 0.0 0.0 4336 724 ? S 04:31 0:00 /bin/sh -c ps xua | grep osmo build 12197 0.0 0.0 11128 936 ? S 04:31 0:00 grep osmo ERRORS: 3 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-python-test] Error 3 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:36:27 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:36:27 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_ma?= =?UTF-8?Q?ster,0,osmocom-master-debian9,lc15,True_#1104?= Message-ID: <411474919.177.1545539787454.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 138.18 KB...] ^ In file included from ../../../src/gprs_debug.h:25:0, from ../../../src/osmo-bts-litecell15/lc15_l1_if.c:35: ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?handle_ph_data_ind?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :93:54: note: in definition of macro ?LOGPSRCC? logp2(ss, level, caller_file, caller_line, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :95:48: note: in definition of macro ?LOGPSRCC? logp2(ss, level, __FILE__, __LINE__, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?l1if_pdch_req?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:321:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] data_req->hLayer1 = (HANDLE)fl1h->hLayer1; ^ CC osmo-bts-litecell15/lc15_l1_hw.o CC osmo-bts-litecell15/lc15bts.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in doc make[2]: Entering directory ' Making all in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' Making all in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' Making all in contrib make[2]: Entering directory ' Making all in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in doc make[2]: Entering directory ' Making dvi in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' Making dvi in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in contrib make[2]: Entering directory ' Making dvi in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in doc make[2]: Entering directory ' Making check in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## ---------------------------------- ## ## osmo-pcu 0.5.1.38-5b52 test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' osmotestvty.py -p -w -v test_history (__main__.TestVTY) ... ok test_terminal_length (__main__.TestVTY) ... ok test_unknown_command (__main__.TestVTY) ... ok ---------------------------------------------------------------------- Ran 3 tests in 0.811s OK confpath workdir Running tests for specific VTY commands Launch: src/osmo-pcu -c from Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' osmotestconfig.py -p -w -v Documentation error (missing docs): ERRORS: 1 Verifying src/osmo-pcu -c test verify_doc Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test write_config Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test token_vty_command Launching: PWD= 'src/osmo-pcu' '-c' ' Makefile:1256: recipe for target 'python-tests' failed make[4]: *** [python-tests] Error 1 make[4]: Leaving directory ' Makefile:1263: recipe for target 'check-local' failed make[3]: *** [check-local] Error 2 make[3]: Leaving directory ' Makefile:1097: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:466: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:671: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:36:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:36:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-mgw_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#1980?= Message-ID: <1100041291.178.1545539807523.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 217.36 KB...] make check-local make[4]: Entering directory '/build/tests' :;{ \ echo '# Signature of the current package.' && \ echo 'm4_define([AT_PACKAGE_NAME],' && \ echo ' [osmo-mgw])' && \ echo 'm4_define([AT_PACKAGE_TARNAME],' && \ echo ' [osmo-mgw])' && \ echo 'm4_define([AT_PACKAGE_VERSION],' && \ echo ' [1.4.0.88-0a403])' && \ echo 'm4_define([AT_PACKAGE_STRING],' && \ echo ' [osmo-mgw 1.4.0.88-0a403])' && \ echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ echo ' [openbsc at lists.osmocom.org])'; \ echo 'm4_define([AT_PACKAGE_URL],' && \ echo ' [])'; \ } >'./package.m4' /bin/bash ../missing --run autom4te --language=autotest -I '.' -o testsuite.tmp testsuite.at mv testsuite.tmp testsuite /bin/bash './testsuite' ## ----------------------------------- ## ## osmo-mgw 1.4.0.88-0a403 test suite. ## ## ----------------------------------- ## Regression tests. 1: mgcp_client ok 2: mgcp ok ## ------------- ## ## Test results. ## ## ------------- ## All 2 tests were successful. make python-tests make[5]: Entering directory '/build/tests' osmotestvty.py -p /build -w /build -v test_history (__main__.TestVTY) ... confpath /build, workdir /build Running tests for specific VTY commands Launch: ./src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg from /build Opening /dev/null Launching: PWD=/build './src/osmo-mgw/osmo-mgw' '-c' '/build/doc/examples/osmo-mgw/osmo-mgw.cfg' > ls -l /proc/22682/fd total 0 lr-x------ 1 build build 64 Dec 23 04:36 0 -> pipe:[1898962712] l-wx------ 1 build build 64 Dec 23 04:36 1 -> pipe:[1898962713] lr-x------ 1 build build 64 Dec 23 04:36 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:36 2 -> pipe:[1898962714] l-wx------ 1 build build 64 Dec 23 04:36 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 22682 0.0 0.0 39460 14168 ? S 04:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestvty.py -p /build -w /build -v build 22683 0.0 0.0 41336 4648 ? S 04:36 0:00 ./src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg build 22690 0.0 0.0 4336 768 ? S 04:36 0:00 /bin/sh -c ps xua | grep osmo build 22692 0.0 0.0 11128 1044 ? S 04:36 0:00 grep osmo ok test_terminal_length (__main__.TestVTY) ... Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Launch: ./src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg from /build Launching: PWD=/build './src/osmo-mgw/osmo-mgw' '-c' '/build/doc/examples/osmo-mgw/osmo-mgw.cfg' > ls -l /proc/22682/fd total 0 lr-x------ 1 build build 64 Dec 23 04:36 0 -> pipe:[1898962712] l-wx------ 1 build build 64 Dec 23 04:36 1 -> pipe:[1898962713] lr-x------ 1 build build 64 Dec 23 04:36 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:36 2 -> pipe:[1898962714] l-wx------ 1 build build 64 Dec 23 04:36 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 22682 0.0 0.0 39460 14240 ? S 04:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestvty.py -p /build -w /build -v build 22693 0.0 0.0 41336 4772 ? S 04:36 0:00 ./src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg build 22700 0.0 0.0 4336 724 ? S 04:36 0:00 /bin/sh -c ps xua | grep osmo build 22702 0.0 0.0 11128 948 ? S 04:36 0:00 grep osmo ok test_unknown_command (__main__.TestVTY) ... Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Launch: ./src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg from /build Launching: PWD=/build './src/osmo-mgw/osmo-mgw' '-c' '/build/doc/examples/osmo-mgw/osmo-mgw.cfg' > ls -l /proc/22682/fd total 0 lr-x------ 1 build build 64 Dec 23 04:36 0 -> pipe:[1898962712] l-wx------ 1 build build 64 Dec 23 04:36 1 -> pipe:[1898962713] lr-x------ 1 build build 64 Dec 23 04:36 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:36 2 -> pipe:[1898962714] l-wx------ 1 build build 64 Dec 23 04:36 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 22682 4.0 0.0 39460 14240 ? S 04:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestvty.py -p /build -w /build -v build 22703 0.0 0.0 41336 4652 ? S 04:36 0:00 ./src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg build 22710 0.0 0.0 4336 756 ? S 04:36 0:00 /bin/sh -c ps xua | grep osmo build 22712 0.0 0.0 11128 996 ? S 04:36 0:00 grep osmo ok ---------------------------------------------------------------------- Ran 3 tests in 0.540s OK Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) osmotestconfig.py -p /build -w /build -v Verifying src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg, test verify_doc Opening /dev/null Launching: PWD=/build 'src/osmo-mgw/osmo-mgw' '-c' '/build/doc/examples/osmo-mgw/osmo-mgw.cfg' > ls -l /proc/22713/fd total 0 lr-x------ 1 build build 64 Dec 23 04:36 0 -> pipe:[1898962712] l-wx------ 1 build build 64 Dec 23 04:36 1 -> pipe:[1898962713] lr-x------ 1 build build 64 Dec 23 04:36 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:36 2 -> pipe:[1898962714] l-wx------ 1 build build 64 Dec 23 04:36 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 22713 0.0 0.0 39464 14200 ? S 04:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 22714 0.0 0.0 41336 4724 ? S 04:36 0:00 src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg build 22721 0.0 0.0 4336 732 ? S 04:36 0:00 /bin/sh -c ps xua | grep osmo build 22723 0.0 0.0 11128 1004 ? S 04:36 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Verifying src/osmo-mgw/osmo-mgw -c /build/writtenconfig/osmo-mgw.cfg5WxIvR, test write_config Launching: PWD=/build 'src/osmo-mgw/osmo-mgw' '-c' '/build/writtenconfig/osmo-mgw.cfg5WxIvR' > ls -l /proc/22713/fd total 0 lr-x------ 1 build build 64 Dec 23 04:36 0 -> pipe:[1898962712] l-wx------ 1 build build 64 Dec 23 04:36 1 -> pipe:[1898962713] lr-x------ 1 build build 64 Dec 23 04:36 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:36 2 -> pipe:[1898962714] l-wx------ 1 build build 64 Dec 23 04:36 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 22713 0.0 0.0 39608 14584 ? S 04:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 22724 0.0 0.0 41336 4784 ? S 04:36 0:00 src/osmo-mgw/osmo-mgw -c /build/writtenconfig/osmo-mgw.cfg5WxIvR build 22731 0.0 0.0 4336 736 ? S 04:36 0:00 /bin/sh -c ps xua | grep osmo build 22733 0.0 0.0 11128 984 ? S 04:36 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Verifying src/osmo-mgw/osmo-mgw -c /build/writtenconfig/osmo-mgw.cfg5WxIvR, test token_vty_command Launching: PWD=/build 'src/osmo-mgw/osmo-mgw' '-c' '/build/writtenconfig/osmo-mgw.cfg5WxIvR' > ls -l /proc/22713/fd total 0 lr-x------ 1 build build 64 Dec 23 04:36 0 -> pipe:[1898962712] l-wx------ 1 build build 64 Dec 23 04:36 1 -> pipe:[1898962713] lr-x------ 1 build build 64 Dec 23 04:36 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:36 2 -> pipe:[1898962714] l-wx------ 1 build build 64 Dec 23 04:36 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 22713 4.0 0.0 39608 14584 ? S 04:36 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 22734 0.0 0.0 41336 4684 ? S 04:36 0:00 src/osmo-mgw/osmo-mgw -c /build/writtenconfig/osmo-mgw.cfg5WxIvR build 22741 0.0 0.0 4336 712 ? S 04:36 0:00 /bin/sh -c ps xua | grep osmo build 22743 0.0 0.0 11128 988 ? S 04:36 0:00 grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) make[5]: *** [python-tests] Error 1 Makefile:671: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:677: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:533: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:385: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:489: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:780: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:37:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:37:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7670?= In-Reply-To: <613836532.171.1545539372030.JavaMail.jenkins@jenkins.osmocom.org> References: <613836532.171.1545539372030.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1561788112.179.1545539841944.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 299.27 KB...] State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32151 1.0 0.0 39608 14500 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32192 0.0 0.0 21474958492 11288 ? S 04:37 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg8D5o3x build 32199 0.0 0.0 4336 732 ? S 04:37 0:00 /bin/sh -c ps xua | grep osmo build 32201 0.0 0.0 11128 1028 ? S 04:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg8D5o3x, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfg8D5o3x' > ls -l /proc/32151/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[236132076] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[236132077] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[236132078] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32151 0.8 0.0 39608 14500 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32202 0.0 0.0 21474958492 11400 ? S 04:37 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg8D5o3x build 32209 0.0 0.0 4336 732 ? S 04:37 0:00 /bin/sh -c ps xua | grep osmo build 32211 0.0 0.0 11128 1028 ? S 04:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/32151/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[236132076] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[236132077] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[236132078] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32151 0.7 0.0 39608 14500 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32212 0.0 0.0 21474966124 11272 ? R 04:37 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 32219 0.0 0.0 4336 732 ? S 04:37 0:00 /bin/sh -c ps xua | grep osmo build 32221 0.0 0.0 4336 104 ? R 04:37 0:00 /bin/sh -c ps xua | grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgdoSaOK, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgdoSaOK' > ls -l /proc/32151/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[236132076] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[236132077] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[236132078] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32151 0.6 0.0 39764 14552 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32222 0.0 0.0 21475032288 16420 ? R 04:37 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgdoSaOK build 32229 0.0 0.0 4336 732 ? S 04:37 0:00 /bin/sh -c ps xua | grep osmo build 32231 0.0 0.0 11128 1028 ? S 04:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgdoSaOK, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgdoSaOK' > ls -l /proc/32151/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[236132076] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[236132077] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[236132078] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32151 0.6 0.0 39764 14552 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32232 0.0 0.0 21474966128 13136 ? D 04:37 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgdoSaOK build 32239 0.0 0.0 4336 732 ? S 04:37 0:00 /bin/sh -c ps xua | grep osmo build 32241 0.0 0.0 4336 104 ? R 04:37 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/32151/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[236132076] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[236132077] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[236132078] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32151 0.5 0.0 39764 14552 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32242 0.0 0.0 21474956232 10680 ? S 04:37 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 32249 0.0 0.0 4336 732 ? S 04:37 0:00 /bin/sh -c ps xua | grep osmo build 32251 0.0 0.0 10996 1028 ? R 04:37 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgXyMKFP, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgXyMKFP' > ls -l /proc/32151/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[236132076] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[236132077] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[236132078] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 32151 0.5 0.0 39764 14552 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32252 0.0 0.0 21474956236 10656 ? D 04:37 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgXyMKFP build 32259 0.0 0.0 4336 732 ? S 04:37 0:00 /bin/sh -c ps xua | grep osmo build 32261 0.0 0.0 11128 1028 ? S 04:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgXyMKFP, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgXyMKFP' > ls -l /proc/32151/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[236132076] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[236132077] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[236132078] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32151 0.5 0.0 39764 14552 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32262 0.0 0.0 21474956232 10716 ? S 04:37 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgXyMKFP build 32269 0.0 0.0 4336 732 ? S 04:37 0:00 /bin/sh -c ps xua | grep osmo build 32271 0.0 0.0 11128 1028 ? S 04:37 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:38:13 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:38:13 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7670?= In-Reply-To: <813102597.173.1545539449081.JavaMail.jenkins@jenkins.osmocom.org> References: <813102597.173.1545539449081.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <777648303.180.1545539893190.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.13 MB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7132 1.0 0.0 39612 14568 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7173 0.0 0.0 21474958492 11372 ? S 04:37 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgGbAAci build 7180 0.0 0.0 4336 744 ? S 04:37 0:00 /bin/sh -c ps xua | grep osmo build 7182 0.0 0.0 11128 972 ? S 04:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgGbAAci, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgGbAAci' > ls -l /proc/7132/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[2169896223] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[2169896224] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[2169896225] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7132 0.7 0.0 39612 14568 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7183 0.0 0.0 21474958492 11480 ? R 04:37 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgGbAAci build 7190 0.0 0.0 4336 736 ? S 04:37 0:00 /bin/sh -c ps xua | grep osmo build 7192 0.0 0.0 11128 1032 ? S 04:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/7132/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[2169896223] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[2169896224] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[2169896225] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7132 0.6 0.0 39612 14568 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7193 0.0 0.0 21474978432 9404 ? R 04:37 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 7200 0.0 0.0 4336 768 ? S 04:37 0:00 /bin/sh -c ps xua | grep osmo build 7202 0.0 0.0 11128 996 ? S 04:37 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgj0n2Kd, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgj0n2Kd' > ls -l /proc/7132/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[2169896223] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[2169896224] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[2169896225] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7132 0.6 0.0 39768 14724 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7203 0.0 0.0 21474978556 15016 ? D 04:37 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgj0n2Kd build 7210 0.0 0.0 4336 768 ? S 04:37 0:00 /bin/sh -c ps xua | grep osmo build 7212 0.0 0.0 11128 944 ? S 04:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgj0n2Kd, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgj0n2Kd' > ls -l /proc/7132/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[2169896223] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[2169896224] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[2169896225] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7132 0.2 0.0 39768 14724 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7213 0.0 0.0 21474978556 14888 ? R 04:38 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgj0n2Kd build 7220 0.0 0.0 4336 744 ? S 04:38 0:00 /bin/sh -c ps xua | grep osmo build 7222 0.0 0.0 11128 1032 ? S 04:38 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/7132/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[2169896223] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[2169896224] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[2169896225] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7132 0.2 0.0 39768 14724 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7223 0.0 0.0 21474962696 11080 ? S 04:38 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 7230 0.0 0.0 4336 728 ? S 04:38 0:00 /bin/sh -c ps xua | grep osmo build 7232 0.0 0.0 11128 964 ? S 04:38 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgJpHvKJ, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgJpHvKJ' > ls -l /proc/7132/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[2169896223] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[2169896224] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[2169896225] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 7132 0.2 0.0 39768 14724 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7233 0.0 0.0 21474962696 10948 ? S 04:38 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgJpHvKJ build 7240 0.0 0.0 4336 800 ? S 04:38 0:00 /bin/sh -c ps xua | grep osmo build 7242 0.0 0.0 11128 952 ? R 04:38 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgJpHvKJ, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgJpHvKJ' > ls -l /proc/7132/fd total 0 lr-x------ 1 build build 64 Dec 23 04:37 0 -> pipe:[2169896223] l-wx------ 1 build build 64 Dec 23 04:37 1 -> pipe:[2169896224] lr-x------ 1 build build 64 Dec 23 04:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:37 2 -> pipe:[2169896225] l-wx------ 1 build build 64 Dec 23 04:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 7132 0.3 0.0 39768 14724 ? S 04:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7243 0.0 0.0 21474962696 11176 ? S 04:38 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgJpHvKJ build 7250 0.0 0.0 4336 764 ? S 04:38 0:00 /bin/sh -c ps xua | grep osmo build 7252 0.0 0.0 5096 340 ? R 04:38 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 4 make[4]: *** [check-local] Error 2 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:732: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:38:45 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:38:45 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7671?= In-Reply-To: <1561788112.179.1545539841944.JavaMail.jenkins@jenkins.osmocom.org> References: <1561788112.179.1545539841944.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1275411601.181.1545539925211.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 276.84 KB...] LISTEN 0 10 127.0.0.1:4246 *:* LISTEN 0 10 127.0.0.1:4263 *:* > ps xua | grep osmo build 32153 1.0 0.0 39608 14500 ? S 04:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32194 0.0 0.0 21474958492 11288 ? S 04:38 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgG_pd93 build 32201 0.0 0.0 4336 732 ? S 04:38 0:00 /bin/sh -c ps xua | grep osmo build 32203 0.0 0.0 11128 1028 ? S 04:38 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgG_pd93, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgG_pd93' > ls -l /proc/32153/fd total 0 lr-x------ 1 build build 64 Dec 23 04:38 0 -> pipe:[236188124] l-wx------ 1 build build 64 Dec 23 04:38 1 -> pipe:[236188125] lr-x------ 1 build build 64 Dec 23 04:38 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:38 2 -> pipe:[236188126] l-wx------ 1 build build 64 Dec 23 04:38 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32153 1.0 0.0 39608 14500 ? S 04:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32204 0.0 0.0 21474958492 11400 ? S 04:38 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgG_pd93 build 32211 0.0 0.0 4336 732 ? S 04:38 0:00 /bin/sh -c ps xua | grep osmo build 32213 0.0 0.0 11128 1028 ? S 04:38 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/32153/fd total 0 lr-x------ 1 build build 64 Dec 23 04:38 0 -> pipe:[236188124] l-wx------ 1 build build 64 Dec 23 04:38 1 -> pipe:[236188125] lr-x------ 1 build build 64 Dec 23 04:38 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:38 2 -> pipe:[236188126] l-wx------ 1 build build 64 Dec 23 04:38 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32153 0.8 0.0 39608 14500 ? S 04:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32214 0.0 0.0 21475098452 25124 ? R 04:38 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 32221 0.0 0.0 4336 732 ? S 04:38 0:00 /bin/sh -c ps xua | grep osmo build 32223 0.0 0.0 4336 104 ? R 04:38 0:00 /bin/sh -c ps xua | grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgYQvbtE, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgYQvbtE' > ls -l /proc/32153/fd total 0 lr-x------ 1 build build 64 Dec 23 04:38 0 -> pipe:[236188124] l-wx------ 1 build build 64 Dec 23 04:38 1 -> pipe:[236188125] lr-x------ 1 build build 64 Dec 23 04:38 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:38 2 -> pipe:[236188126] l-wx------ 1 build build 64 Dec 23 04:38 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32153 0.7 0.0 39764 14552 ? S 04:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32224 0.0 0.0 21475032288 20644 ? R 04:38 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgYQvbtE build 32231 0.0 0.0 4336 732 ? S 04:38 0:00 /bin/sh -c ps xua | grep osmo build 32233 0.0 0.0 11128 1028 ? S 04:38 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgYQvbtE, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgYQvbtE' > ls -l /proc/32153/fd total 0 lr-x------ 1 build build 64 Dec 23 04:38 0 -> pipe:[236188124] l-wx------ 1 build build 64 Dec 23 04:38 1 -> pipe:[236188125] lr-x------ 1 build build 64 Dec 23 04:38 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:38 2 -> pipe:[236188126] l-wx------ 1 build build 64 Dec 23 04:38 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4245 *:* LISTEN 0 10 127.0.0.1:4251 *:* > ps xua | grep osmo build 32153 0.6 0.0 39764 14552 ? S 04:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32234 0.0 0.0 21475098452 33712 ? S 04:38 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgYQvbtE build 32241 0.0 0.0 4336 732 ? S 04:38 0:00 /bin/sh -c ps xua | grep osmo build 32243 0.0 0.0 11128 1028 ? S 04:38 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/32153/fd total 0 lr-x------ 1 build build 64 Dec 23 04:38 0 -> pipe:[236188124] l-wx------ 1 build build 64 Dec 23 04:38 1 -> pipe:[236188125] lr-x------ 1 build build 64 Dec 23 04:38 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:38 2 -> pipe:[236188126] l-wx------ 1 build build 64 Dec 23 04:38 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32153 0.6 0.0 39764 14552 ? S 04:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32244 0.0 0.0 21474956232 10680 ? S 04:38 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 32251 0.0 0.0 4336 732 ? S 04:38 0:00 /bin/sh -c ps xua | grep osmo build 32253 0.0 0.0 11128 1028 ? S 04:38 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg0k6ydl, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg0k6ydl' > ls -l /proc/32153/fd total 0 lr-x------ 1 build build 64 Dec 23 04:38 0 -> pipe:[236188124] l-wx------ 1 build build 64 Dec 23 04:38 1 -> pipe:[236188125] lr-x------ 1 build build 64 Dec 23 04:38 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:38 2 -> pipe:[236188126] l-wx------ 1 build build 64 Dec 23 04:38 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 32153 0.6 0.0 39764 14552 ? S 04:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32254 0.0 0.0 21474956236 10656 ? D 04:38 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg0k6ydl build 32261 0.0 0.0 4336 732 ? S 04:38 0:00 /bin/sh -c ps xua | grep osmo build 32263 0.0 0.0 11128 1028 ? S 04:38 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg0k6ydl, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg0k6ydl' > ls -l /proc/32153/fd total 0 lr-x------ 1 build build 64 Dec 23 04:38 0 -> pipe:[236188124] l-wx------ 1 build build 64 Dec 23 04:38 1 -> pipe:[236188125] lr-x------ 1 build build 64 Dec 23 04:38 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:38 2 -> pipe:[236188126] l-wx------ 1 build build 64 Dec 23 04:38 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 32153 0.5 0.0 39764 14552 ? S 04:38 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32264 0.0 0.0 21474956232 10716 ? S 04:38 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg0k6ydl build 32271 0.0 0.0 4336 732 ? S 04:38 0:00 /bin/sh -c ps xua | grep osmo build 32273 0.0 0.0 11128 1028 ? S 04:38 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 4 Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:39:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:39:31 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7671?= In-Reply-To: <777648303.180.1545539893190.JavaMail.jenkins@jenkins.osmocom.org> References: <777648303.180.1545539893190.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1541458124.182.1545539971246.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.04 MB...] State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4246 *:* LISTEN 0 10 127.0.0.1:4263 *:* > ps xua | grep osmo build 7213 0.8 0.0 39608 14500 ? S 04:39 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7254 0.0 0.0 21474958492 11288 ? S 04:39 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgdEKT_v build 7261 0.0 0.0 4336 732 ? S 04:39 0:00 /bin/sh -c ps xua | grep osmo build 7263 0.0 0.0 11128 1028 ? R 04:39 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgdEKT_v, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgdEKT_v' > ls -l /proc/7213/fd total 0 lr-x------ 1 build build 64 Dec 23 04:39 0 -> pipe:[236210444] l-wx------ 1 build build 64 Dec 23 04:39 1 -> pipe:[236210445] lr-x------ 1 build build 64 Dec 23 04:39 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:39 2 -> pipe:[236210446] l-wx------ 1 build build 64 Dec 23 04:39 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4246 *:* LISTEN 0 10 127.0.0.1:4263 *:* > ps xua | grep osmo build 7213 0.8 0.0 39608 14500 ? S 04:39 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7264 0.0 0.0 21474958492 11400 ? S 04:39 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgdEKT_v build 7271 0.0 0.0 4336 732 ? S 04:39 0:00 /bin/sh -c ps xua | grep osmo build 7273 0.0 0.0 11128 1028 ? S 04:39 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/7213/fd total 0 lr-x------ 1 build build 64 Dec 23 04:39 0 -> pipe:[236210444] l-wx------ 1 build build 64 Dec 23 04:39 1 -> pipe:[236210445] lr-x------ 1 build build 64 Dec 23 04:39 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:39 2 -> pipe:[236210446] l-wx------ 1 build build 64 Dec 23 04:39 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7213 0.8 0.0 39608 14500 ? S 04:39 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7274 0.0 0.0 21475110880 24280 ? R 04:39 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 7281 0.0 0.0 4336 732 ? S 04:39 0:00 /bin/sh -c ps xua | grep osmo build 7283 0.0 0.0 4336 104 ? R 04:39 0:00 /bin/sh -c ps xua | grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfguktwWs, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfguktwWs' > ls -l /proc/7213/fd total 0 lr-x------ 1 build build 64 Dec 23 04:39 0 -> pipe:[236210444] l-wx------ 1 build build 64 Dec 23 04:39 1 -> pipe:[236210445] lr-x------ 1 build build 64 Dec 23 04:39 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:39 2 -> pipe:[236210446] l-wx------ 1 build build 64 Dec 23 04:39 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7213 0.7 0.0 39764 14652 ? S 04:39 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7284 0.0 0.0 21474978552 14316 ? R 04:39 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfguktwWs build 7291 0.0 0.0 4336 732 ? S 04:39 0:00 /bin/sh -c ps xua | grep osmo build 7293 0.0 0.0 11128 1028 ? S 04:39 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfguktwWs, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfguktwWs' > ls -l /proc/7213/fd total 0 lr-x------ 1 build build 64 Dec 23 04:39 0 -> pipe:[236210444] l-wx------ 1 build build 64 Dec 23 04:39 1 -> pipe:[236210445] lr-x------ 1 build build 64 Dec 23 04:39 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:39 2 -> pipe:[236210446] l-wx------ 1 build build 64 Dec 23 04:39 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7213 0.6 0.0 39764 14652 ? S 04:39 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7294 0.0 0.0 21474978556 14552 ? R 04:39 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfguktwWs build 7301 0.0 0.0 4336 732 ? S 04:39 0:00 /bin/sh -c ps xua | grep osmo build 7303 0.0 0.0 11128 1024 ? S 04:39 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/7213/fd total 0 lr-x------ 1 build build 64 Dec 23 04:39 0 -> pipe:[236210444] l-wx------ 1 build build 64 Dec 23 04:39 1 -> pipe:[236210445] lr-x------ 1 build build 64 Dec 23 04:39 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:39 2 -> pipe:[236210446] l-wx------ 1 build build 64 Dec 23 04:39 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7213 0.6 0.0 39764 14652 ? S 04:39 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7304 0.0 0.0 21474962696 10756 ? S 04:39 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 7311 0.0 0.0 4336 732 ? S 04:39 0:00 /bin/sh -c ps xua | grep osmo build 7313 0.0 0.0 11128 1028 ? S 04:39 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg4zGznr, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg4zGznr' > ls -l /proc/7213/fd total 0 lr-x------ 1 build build 64 Dec 23 04:39 0 -> pipe:[236210444] l-wx------ 1 build build 64 Dec 23 04:39 1 -> pipe:[236210445] lr-x------ 1 build build 64 Dec 23 04:39 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:39 2 -> pipe:[236210446] l-wx------ 1 build build 64 Dec 23 04:39 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7213 0.6 0.0 39764 14652 ? S 04:39 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7314 0.0 0.0 21474962700 10796 ? D 04:39 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg4zGznr build 7321 0.0 0.0 4336 732 ? S 04:39 0:00 /bin/sh -c ps xua | grep osmo build 7323 0.0 0.0 11128 1028 ? S 04:39 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg4zGznr, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg4zGznr' > ls -l /proc/7213/fd total 0 lr-x------ 1 build build 64 Dec 23 04:39 0 -> pipe:[236210444] l-wx------ 1 build build 64 Dec 23 04:39 1 -> pipe:[236210445] lr-x------ 1 build build 64 Dec 23 04:39 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:39 2 -> pipe:[236210446] l-wx------ 1 build build 64 Dec 23 04:39 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 7213 0.5 0.0 39764 14652 ? S 04:39 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7324 0.0 0.0 21474962696 10856 ? S 04:39 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg4zGznr build 7331 0.0 0.0 4336 732 ? S 04:39 0:00 /bin/sh -c ps xua | grep osmo build 7333 0.0 0.0 4336 104 ? R 04:39 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) ERRORS: 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 4 Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:39:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:39:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_origin/nr?= =?UTF-8?Q?w/litecell15,0,osmocom-master-debian9,lc15,True_#1104?= Message-ID: <2073228724.183.1545539975995.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 142.24 KB...] ^ In file included from ../../../src/gprs_debug.h:25:0, from ../../../src/osmo-bts-litecell15/lc15_l1_if.c:35: ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?handle_ph_data_ind?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :93:54: note: in definition of macro ?LOGPSRCC? logp2(ss, level, caller_file, caller_line, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :95:48: note: in definition of macro ?LOGPSRCC? logp2(ss, level, __FILE__, __LINE__, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?l1if_pdch_req?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:321:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] data_req->hLayer1 = (HANDLE)fl1h->hLayer1; ^ CC osmo-bts-litecell15/lc15_l1_hw.o CC osmo-bts-litecell15/lc15bts.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in doc make[2]: Entering directory ' Making all in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' Making all in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' Making all in contrib make[2]: Entering directory ' Making all in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in doc make[2]: Entering directory ' Making dvi in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' Making dvi in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in contrib make[2]: Entering directory ' Making dvi in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in doc make[2]: Entering directory ' Making check in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## ---------------------------------- ## ## osmo-pcu 0.5.1.38-5b52 test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' osmotestvty.py -p -w -v test_history (__main__.TestVTY) ... ok test_terminal_length (__main__.TestVTY) ... ok test_unknown_command (__main__.TestVTY) ... ok ---------------------------------------------------------------------- Ran 3 tests in 0.810s OK confpath workdir Running tests for specific VTY commands Launch: src/osmo-pcu -c from Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' osmotestconfig.py -p -w -v Documentation error (missing docs): ERRORS: 1 Verifying src/osmo-pcu -c test verify_doc Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test write_config Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test token_vty_command Launching: PWD= 'src/osmo-pcu' '-c' ' Makefile:1256: recipe for target 'python-tests' failed make[4]: *** [python-tests] Error 1 make[4]: Leaving directory ' Makefile:1263: recipe for target 'check-local' failed make[3]: *** [check-local] Error 2 make[3]: Leaving directory ' Makefile:1097: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:466: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:671: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:40:37 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:40:37 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7655?= In-Reply-To: <646278541.174.1545539482622.JavaMail.jenkins@jenkins.osmocom.org> References: <646278541.174.1545539482622.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1978677994.184.1545540037888.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 808.22 KB...] build 9239 0.0 0.0 4336 716 ? S 04:40 0:00 /bin/sh -c ps xua | grep osmo build 9241 0.0 0.0 11128 956 ? S 04:40 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgA6sff0, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfgA6sff0' > ls -l /proc/9221/fd total 0 lr-x------ 1 build build 64 Dec 23 04:40 0 -> pipe:[1899009859] l-wx------ 1 build build 64 Dec 23 04:40 1 -> pipe:[1899009860] lr-x------ 1 build build 64 Dec 23 04:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:40 2 -> pipe:[1899009861] l-wx------ 1 build build 64 Dec 23 04:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9221 0.7 0.0 39756 14568 ? S 04:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9242 0.0 0.0 21474968780 13848 ? R 04:40 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgA6sff0 build 9249 0.0 0.0 4336 804 ? S 04:40 0:00 /bin/sh -c ps xua | grep osmo build 9251 0.0 0.0 11128 1032 ? S 04:40 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/9221/fd total 0 lr-x------ 1 build build 64 Dec 23 04:40 0 -> pipe:[1899009859] l-wx------ 1 build build 64 Dec 23 04:40 1 -> pipe:[1899009860] lr-x------ 1 build build 64 Dec 23 04:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:40 2 -> pipe:[1899009861] l-wx------ 1 build build 64 Dec 23 04:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9221 0.5 0.0 39756 14568 ? S 04:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9252 0.0 0.0 21474973720 15636 ? D 04:40 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 9259 0.0 0.0 4336 756 ? S 04:40 0:00 /bin/sh -c ps xua | grep osmo build 9261 0.0 0.0 11128 1036 ? S 04:40 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgXeirbp, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgXeirbp' > ls -l /proc/9221/fd total 0 lr-x------ 1 build build 64 Dec 23 04:40 0 -> pipe:[1899009859] l-wx------ 1 build build 64 Dec 23 04:40 1 -> pipe:[1899009860] lr-x------ 1 build build 64 Dec 23 04:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:40 2 -> pipe:[1899009861] l-wx------ 1 build build 64 Dec 23 04:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9221 0.5 0.0 39756 14580 ? S 04:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9262 0.0 0.0 21474932700 5992 ? R 04:40 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgXeirbp build 9269 0.0 0.0 4336 804 ? S 04:40 0:00 /bin/sh -c ps xua | grep osmo build 9271 0.0 0.0 4336 104 ? R 04:40 0:00 /bin/sh -c ps xua | grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgXeirbp, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgXeirbp' > ls -l /proc/9221/fd total 0 lr-x------ 1 build build 64 Dec 23 04:40 0 -> pipe:[1899009859] l-wx------ 1 build build 64 Dec 23 04:40 1 -> pipe:[1899009860] lr-x------ 1 build build 64 Dec 23 04:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:40 2 -> pipe:[1899009861] l-wx------ 1 build build 64 Dec 23 04:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9221 0.3 0.0 39756 14580 ? S 04:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9272 0.0 0.0 21474968780 13508 ? R 04:40 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgXeirbp build 9279 0.0 0.0 4336 760 ? S 04:40 0:00 /bin/sh -c ps xua | grep osmo build 9281 0.0 0.0 11128 924 ? S 04:40 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/9221/fd total 0 lr-x------ 1 build build 64 Dec 23 04:40 0 -> pipe:[1899009859] l-wx------ 1 build build 64 Dec 23 04:40 1 -> pipe:[1899009860] lr-x------ 1 build build 64 Dec 23 04:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:40 2 -> pipe:[1899009861] l-wx------ 1 build build 64 Dec 23 04:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9221 0.3 0.0 39756 14580 ? S 04:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9282 0.0 0.0 21474968784 13936 ? R 04:40 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 9289 0.0 0.0 4336 732 ? S 04:40 0:00 /bin/sh -c ps xua | grep osmo build 9291 0.0 0.0 11128 1044 ? S 04:40 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgGkK0QP, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgGkK0QP' > ls -l /proc/9221/fd total 0 lr-x------ 1 build build 64 Dec 23 04:40 0 -> pipe:[1899009859] l-wx------ 1 build build 64 Dec 23 04:40 1 -> pipe:[1899009860] lr-x------ 1 build build 64 Dec 23 04:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:40 2 -> pipe:[1899009861] l-wx------ 1 build build 64 Dec 23 04:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9221 0.3 0.0 39756 14580 ? S 04:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9292 0.0 0.0 21474968780 13500 ? R 04:40 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgGkK0QP build 9299 0.0 0.0 4336 756 ? S 04:40 0:00 /bin/sh -c ps xua | grep osmo build 9301 0.0 0.0 11128 940 ? S 04:40 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgGkK0QP, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgGkK0QP' > ls -l /proc/9221/fd total 0 lr-x------ 1 build build 64 Dec 23 04:40 0 -> pipe:[1899009859] l-wx------ 1 build build 64 Dec 23 04:40 1 -> pipe:[1899009860] lr-x------ 1 build build 64 Dec 23 04:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:40 2 -> pipe:[1899009861] l-wx------ 1 build build 64 Dec 23 04:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9221 0.3 0.0 39756 14580 ? S 04:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9302 0.0 0.0 21474968780 13728 ? R 04:40 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgGkK0QP build 9309 0.0 0.0 4336 728 ? S 04:40 0:00 /bin/sh -c ps xua | grep osmo build 9311 0.0 0.0 11128 944 ? S 04:40 0:00 grep osmo ERRORS: 3 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) make[7]: *** [vty-python-test] Error 3 Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:41:24 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:41:24 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7672?= In-Reply-To: <1275411601.181.1545539925211.JavaMail.jenkins@jenkins.osmocom.org> References: <1275411601.181.1545539925211.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1260201094.185.1545540084082.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 300.41 KB...] > ps xua | grep osmo build 32146 1.0 0.0 39608 14500 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32187 0.0 0.0 21474958492 11288 ? S 04:41 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgwui9ho build 32194 0.0 0.0 4336 732 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 32196 0.0 0.0 11128 1028 ? S 04:41 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgwui9ho, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgwui9ho' > ls -l /proc/32146/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236319055] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236319056] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236319057] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4246 *:* LISTEN 0 10 127.0.0.1:4263 *:* > ps xua | grep osmo build 32146 0.8 0.0 39608 14500 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32197 0.0 0.0 21474958492 11400 ? S 04:41 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgwui9ho build 32204 0.0 0.0 4336 732 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 32206 0.0 0.0 11128 1028 ? S 04:41 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/32146/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236319055] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236319056] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236319057] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4245 *:* LISTEN 0 10 127.0.0.1:4251 *:* > ps xua | grep osmo build 32146 0.8 0.0 39608 14500 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32207 0.0 0.0 21475098452 29872 ? R 04:41 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 32214 0.0 0.0 4336 732 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 32216 0.0 0.0 11032 528 ? R 04:41 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg6jDUOa, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg6jDUOa' > ls -l /proc/32146/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236319055] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236319056] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236319057] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32146 0.7 0.0 39764 14552 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32217 0.0 0.0 21475032288 16948 ? R 04:41 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg6jDUOa build 32224 0.0 0.0 4336 732 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 32226 0.0 0.0 4336 104 ? R 04:41 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg6jDUOa, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg6jDUOa' > ls -l /proc/32146/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236319055] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236319056] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236319057] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32146 0.6 0.0 39764 14552 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32227 0.0 0.0 21474966128 13136 ? D 04:41 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg6jDUOa build 32234 0.0 0.0 4336 732 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 32236 0.0 0.0 11128 1028 ? S 04:41 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/32146/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236319055] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236319056] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236319057] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 32146 0.7 0.0 39764 14552 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32237 0.0 0.0 21474956232 10680 ? S 04:41 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 32244 0.0 0.0 4336 732 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 32246 0.0 0.0 4336 104 ? R 04:41 0:00 /bin/sh -c ps xua | grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgfouss5, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgfouss5' > ls -l /proc/32146/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236319055] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236319056] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236319057] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 32146 0.6 0.0 39764 14552 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32247 0.0 0.0 21474956232 10676 ? S 04:41 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgfouss5 build 32254 0.0 0.0 4336 732 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 32256 0.0 0.0 11128 1028 ? S 04:41 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgfouss5, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgfouss5' > ls -l /proc/32146/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236319055] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236319056] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236319057] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32146 0.6 0.0 39764 14552 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32257 0.0 0.0 21474956232 10716 ? S 04:41 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgfouss5 build 32264 0.0 0.0 4336 732 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 32266 0.0 0.0 11128 1028 ? S 04:41 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 4 Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:41:34 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:41:34 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4609?= Message-ID: <40694436.186.1545540094932.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 894.85 KB...] Launch: ./src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg from /build Launching: PWD=/build './src/osmo-bsc/osmo-bsc' '-c' '/build/doc/examples/osmo-bsc/osmo-bsc.cfg' > ls -l /proc/1713/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170049580] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170049581] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170049582] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1713 0.7 0.0 39460 14200 ? S 04:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestvty.py -p /build -w /build -v build 1734 0.0 0.0 21474965720 16888 ? R 04:41 0:00 ./src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg build 1741 0.0 0.0 4336 804 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 1743 0.0 0.0 11128 948 ? S 04:41 0:00 grep osmo ok ---------------------------------------------------------------------- Ran 3 tests in 10.561s OK Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Socket: closing 127.0.0.1:4242 (0 sockets open) Terminating took 2.679s osmotestconfig.py -p /build -w /build -v Warning: doc/examples/osmo-bsc/osmo-bsc-minimal.cfg is not being tested Verifying src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg, test verify_doc Opening /dev/null Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/doc/examples/osmo-bsc/osmo-bsc.cfg' > ls -l /proc/1744/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170049580] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170049581] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170049582] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1744 0.0 0.0 39468 14208 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1745 0.0 0.0 21474965876 20228 ? S 04:41 0:00 src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg build 1752 0.0 0.0 4336 748 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 1754 0.0 0.0 11128 992 ? S 04:41 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc.cfgbcKiDg, test write_config Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/writtenconfig/osmo-bsc.cfgbcKiDg' > ls -l /proc/1744/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170049580] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170049581] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170049582] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1744 1.5 0.0 39548 14604 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1755 0.0 0.0 21474965720 17840 ? R 04:41 0:00 src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc.cfgbcKiDg build 1762 0.0 0.0 4336 760 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 1764 0.0 0.0 11128 988 ? S 04:41 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc.cfgbcKiDg, test token_vty_command Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/writtenconfig/osmo-bsc.cfgbcKiDg' > ls -l /proc/1744/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170049580] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170049581] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170049582] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1744 0.7 0.0 39548 14604 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1765 0.0 0.0 21474965728 19316 ? R 04:41 0:00 src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc.cfgbcKiDg build 1772 0.0 0.0 4336 808 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 1774 0.0 0.0 11128 1000 ? R 04:41 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg' > ls -l /proc/1744/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170049580] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170049581] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170049582] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1744 0.5 0.0 39548 14604 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1775 0.0 0.0 21474965876 20200 ? S 04:41 0:00 src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg build 1782 0.0 0.0 4336 772 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 1784 0.0 0.0 11128 924 ? R 04:41 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc_custom-sccp.cfgIWj6TL, test write_config Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/writtenconfig/osmo-bsc_custom-sccp.cfgIWj6TL' > ls -l /proc/1744/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170049580] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170049581] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170049582] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 1744 0.6 0.0 39620 14688 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1785 0.0 0.0 21474965876 20160 ? S 04:41 0:00 src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc_custom-sccp.cfgIWj6TL build 1792 0.0 0.0 4336 760 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 1794 0.0 0.0 11128 976 ? S 04:41 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc_custom-sccp.cfgIWj6TL, test token_vty_command Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/writtenconfig/osmo-bsc_custom-sccp.cfgIWj6TL' > ls -l /proc/1744/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170049580] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170049581] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170049582] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1744 0.5 0.0 39620 14688 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1795 0.0 0.0 21474965720 18308 ? R 04:41 0:00 src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc_custom-sccp.cfgIWj6TL build 1802 0.0 0.0 4336 732 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 1804 0.0 0.0 11128 1028 ? S 04:41 0:00 grep osmo ERRORS: 2 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) make[5]: *** [python-tests] Error 2 Makefile:684: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:703: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:546: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory '/build/tests' Makefile:398: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:435: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:726: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:42:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:42:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7672?= In-Reply-To: <1541458124.182.1545539971246.JavaMail.jenkins@jenkins.osmocom.org> References: <1541458124.182.1545539971246.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2020532002.187.1545540135191.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.04 MB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7424 1.0 0.0 39608 14500 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7465 0.0 0.0 21474958492 11288 ? S 04:42 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgvNcXQh build 7472 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 7474 0.0 0.0 4336 104 ? R 04:42 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgvNcXQh, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgvNcXQh' > ls -l /proc/7424/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236324849] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236324850] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236324851] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7424 0.8 0.0 39608 14500 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7475 0.0 0.0 21474958492 11400 ? S 04:42 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgvNcXQh build 7482 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 7484 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/7424/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236324849] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236324850] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236324851] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7424 0.6 0.0 39608 14500 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7485 0.0 0.0 21474978552 13916 ? R 04:42 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 7492 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 7494 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgQAc37z, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgQAc37z' > ls -l /proc/7424/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236324849] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236324850] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236324851] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7424 0.7 0.0 39764 14652 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7495 0.0 0.0 21474978552 12040 ? R 04:42 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgQAc37z build 7502 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 7504 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgQAc37z, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgQAc37z' > ls -l /proc/7424/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236324849] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236324850] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236324851] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7424 0.7 0.0 39764 14652 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7505 0.0 0.0 21474978552 14224 ? R 04:42 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgQAc37z build 7512 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 7514 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/7424/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236324849] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236324850] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236324851] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7424 0.6 0.0 39764 14652 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7515 0.0 0.0 21474962696 10756 ? S 04:42 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 7522 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 7524 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgYKVEyJ, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgYKVEyJ' > ls -l /proc/7424/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236324849] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236324850] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236324851] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7424 0.6 0.0 39764 14652 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7525 0.0 0.0 21474962700 10796 ? D 04:42 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgYKVEyJ build 7532 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 7534 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgYKVEyJ, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgYKVEyJ' > ls -l /proc/7424/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[236324849] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[236324850] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[236324851] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7424 0.6 0.0 39764 14652 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7535 0.0 0.0 21474962700 10856 ? D 04:42 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgYKVEyJ build 7542 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 7544 0.0 0.0 4336 104 ? R 04:42 0:00 /bin/sh -c ps xua | grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:42:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:42:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7655?= In-Reply-To: <1001696934.176.1545539514716.JavaMail.jenkins@jenkins.osmocom.org> References: <1001696934.176.1545539514716.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1194603571.188.1545540136461.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.18 MB...] build 12096 0.0 0.0 11128 1044 ? S 04:41 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfguibeeW, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfguibeeW' > ls -l /proc/12076/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170027359] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170027360] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170027361] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12076 0.7 0.0 39500 14452 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12097 0.0 0.0 21474974756 11808 ? R 04:41 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfguibeeW build 12104 0.0 0.0 4336 816 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 12106 0.0 0.0 11128 1048 ? S 04:41 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/12076/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170027359] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170027360] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170027361] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12076 0.5 0.0 39500 14452 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12107 0.0 0.0 21474974756 13840 ? R 04:41 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 12114 0.0 0.0 4336 748 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 12116 0.0 0.0 11128 1044 ? S 04:41 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgiMpfoG, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgiMpfoG' > ls -l /proc/12076/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170027359] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170027360] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170027361] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12076 0.4 0.0 39504 14464 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12117 0.0 0.0 21474979696 16460 ? D 04:41 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgiMpfoG build 12124 0.0 0.0 4336 808 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 12126 0.0 0.0 11128 1008 ? S 04:41 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgiMpfoG, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgiMpfoG' > ls -l /proc/12076/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170027359] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170027360] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170027361] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12076 0.3 0.0 39504 14464 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12127 0.0 0.0 21474974756 14268 ? R 04:41 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgiMpfoG build 12134 0.0 0.0 4336 768 ? S 04:41 0:00 /bin/sh -c ps xua | grep osmo build 12136 0.0 0.0 11128 1004 ? S 04:41 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/12076/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170027359] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170027360] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170027361] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12076 0.3 0.0 39504 14464 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12137 0.0 0.0 21474979732 15512 ? R 04:42 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 12144 0.0 0.0 4336 808 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 12146 0.0 0.0 11128 900 ? S 04:42 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgYHFdZr, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgYHFdZr' > ls -l /proc/12076/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170027359] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170027360] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170027361] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12076 0.3 0.0 39504 14464 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12147 0.0 0.0 21474974756 13564 ? R 04:42 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgYHFdZr build 12154 0.0 0.0 4336 728 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 12156 0.0 0.0 4336 108 ? R 04:42 0:00 /bin/sh -c ps xua | grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgYHFdZr, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgYHFdZr' > ls -l /proc/12076/fd total 0 lr-x------ 1 build build 64 Dec 23 04:41 0 -> pipe:[2170027359] l-wx------ 1 build build 64 Dec 23 04:41 1 -> pipe:[2170027360] lr-x------ 1 build build 64 Dec 23 04:41 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:41 2 -> pipe:[2170027361] l-wx------ 1 build build 64 Dec 23 04:41 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 12076 0.3 0.0 39504 14464 ? S 04:41 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12157 0.0 0.0 21474974760 15196 ? R 04:42 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgYHFdZr build 12164 0.0 0.0 4336 724 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 12166 0.0 0.0 11128 1004 ? S 04:42 0:00 grep osmo ERRORS: 3 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-python-test] Error 3 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: *** [python-tests] Error 2 make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make: *** [check] Error 2 Makefile:743: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:42:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:42:31 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_v20?= =?UTF-8?Q?17.01,0,osmocom-master-debian9,lc15,True_#1104?= In-Reply-To: <1823779805.169.1545539030436.JavaMail.jenkins@jenkins.osmocom.org> References: <1823779805.169.1545539030436.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1224067308.189.1545540151690.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 138.74 KB...] ^ In file included from ../../../src/gprs_debug.h:25:0, from ../../../src/osmo-bts-litecell15/lc15_l1_if.c:35: ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?handle_ph_data_ind?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :93:54: note: in definition of macro ?LOGPSRCC? logp2(ss, level, caller_file, caller_line, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :95:48: note: in definition of macro ?LOGPSRCC? logp2(ss, level, __FILE__, __LINE__, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?l1if_pdch_req?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:321:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] data_req->hLayer1 = (HANDLE)fl1h->hLayer1; ^ CC osmo-bts-litecell15/lc15_l1_hw.o CC osmo-bts-litecell15/lc15bts.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in doc make[2]: Entering directory ' Making all in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' Making all in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' Making all in contrib make[2]: Entering directory ' Making all in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in doc make[2]: Entering directory ' Making dvi in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' Making dvi in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in contrib make[2]: Entering directory ' Making dvi in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in doc make[2]: Entering directory ' Making check in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## ---------------------------------- ## ## osmo-pcu 0.5.1.38-5b52 test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' osmotestvty.py -p -w -v test_history (__main__.TestVTY) ... ok test_terminal_length (__main__.TestVTY) ... ok test_unknown_command (__main__.TestVTY) ... ok ---------------------------------------------------------------------- Ran 3 tests in 0.809s OK confpath workdir Running tests for specific VTY commands Launch: src/osmo-pcu -c from Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' osmotestconfig.py -p -w -v Documentation error (missing docs): ERRORS: 1 Verifying src/osmo-pcu -c test verify_doc Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test write_config Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test token_vty_command Launching: PWD= 'src/osmo-pcu' '-c' ' Makefile:1256: recipe for target 'python-tests' failed make[4]: *** [python-tests] Error 1 make[4]: Leaving directory ' Makefile:1263: recipe for target 'check-local' failed make[3]: *** [check-local] Error 2 make[3]: Leaving directory ' Makefile:1097: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:466: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:671: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:42:37 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:42:37 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3479?= Message-ID: <1478628211.190.1545540157562.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 812.53 KB...] l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[2170084365] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 4925 0.6 0.0 39732 14688 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5006 0.0 0.0 43540 4872 ? S 04:42 0:00 src/osmo-bsc_mgcp/osmo-bsc_mgcp -c /build/openbsc/writtenconfig/osmo-bsc-mgcp.cfgD5Xznb build 5013 0.0 0.0 4336 764 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5015 0.0 0.0 11128 944 ? S 04:42 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg, test verify_doc Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg' > ls -l /proc/4925/fd total 0 lr-x------ 1 build build 64 Dec 23 04:42 0 -> pipe:[2170084363] l-wx------ 1 build build 64 Dec 23 04:42 1 -> pipe:[2170084364] lr-x------ 1 build build 64 Dec 23 04:42 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[2170084365] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 4925 0.6 0.0 39732 14688 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5016 0.0 0.0 57964 7152 ? D 04:42 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg build 5023 0.0 0.0 4336 768 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5025 0.0 0.0 11128 1032 ? S 04:42 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfgOHnUki, test write_config Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/openbsc-multitrx.cfgOHnUki' > ls -l /proc/4925/fd total 0 lr-x------ 1 build build 64 Dec 23 04:42 0 -> pipe:[2170084363] l-wx------ 1 build build 64 Dec 23 04:42 1 -> pipe:[2170084364] lr-x------ 1 build build 64 Dec 23 04:42 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[2170084365] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 4925 0.6 0.0 39716 14744 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5026 0.0 0.0 57964 7096 ? D 04:42 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfgOHnUki build 5033 0.0 0.0 4336 764 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5035 0.0 0.0 11128 936 ? S 04:42 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfgOHnUki, test token_vty_command Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/openbsc-multitrx.cfgOHnUki' > ls -l /proc/4925/fd total 0 lr-x------ 1 build build 64 Dec 23 04:42 0 -> pipe:[2170084363] l-wx------ 1 build build 64 Dec 23 04:42 1 -> pipe:[2170084364] lr-x------ 1 build build 64 Dec 23 04:42 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[2170084365] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 4925 0.5 0.0 39716 14744 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5036 0.0 0.0 57964 7224 ? D 04:42 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfgOHnUki build 5043 0.0 0.0 4336 760 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5045 0.0 0.0 11128 976 ? S 04:42 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg, test verify_doc Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg' > ls -l /proc/4925/fd total 0 lr-x------ 1 build build 64 Dec 23 04:42 0 -> pipe:[2170084363] l-wx------ 1 build build 64 Dec 23 04:42 1 -> pipe:[2170084364] lr-x------ 1 build build 64 Dec 23 04:42 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[2170084365] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 4925 0.4 0.0 39716 14744 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5046 0.0 0.0 57812 7276 ? D 04:42 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg build 5053 0.0 0.0 4336 772 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5055 0.0 0.0 11128 964 ? S 04:42 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfglxZotc, test write_config Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/osmo-nitb.cfglxZotc' > ls -l /proc/4925/fd total 0 lr-x------ 1 build build 64 Dec 23 04:42 0 -> pipe:[2170084363] l-wx------ 1 build build 64 Dec 23 04:42 1 -> pipe:[2170084364] lr-x------ 1 build build 64 Dec 23 04:42 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[2170084365] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 4925 0.4 0.0 39716 14744 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5056 0.0 0.0 57812 7012 ? D 04:42 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfglxZotc build 5063 0.0 0.0 4336 772 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5065 0.0 0.0 3032 284 ? R 04:42 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfglxZotc, test token_vty_command Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/osmo-nitb.cfglxZotc' > ls -l /proc/4925/fd total 0 lr-x------ 1 build build 64 Dec 23 04:42 0 -> pipe:[2170084363] l-wx------ 1 build build 64 Dec 23 04:42 1 -> pipe:[2170084364] lr-x------ 1 build build 64 Dec 23 04:42 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[2170084365] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 4925 0.4 0.0 39716 14744 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5066 0.0 0.0 57812 7284 ? D 04:42 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfglxZotc build 5073 0.0 0.0 4336 760 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5075 0.0 0.0 11128 956 ? S 04:42 0:00 grep osmo ERRORS: 5 Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Makefile:714: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/openbsc/tests' make[5]: *** [python-tests] Error 5 make[4]: *** [check-local] Error 2 Makefile:724: recipe for target 'check-local' failed make[4]: Leaving directory '/build/openbsc/tests' Makefile:576: recipe for target 'check-am' failed make[3]: Leaving directory '/build/openbsc/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:428: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/openbsc/tests' Makefile:514: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [check-recursive] Error 1 Makefile:805: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:42:50 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:42:50 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-?= =?UTF-8?Q?openbsc_=C2=BB_--disable-iu,--enable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3479?= Message-ID: <1513911491.191.1545540170062.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 813.39 KB...] State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 5079 0.7 0.0 39732 14636 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5160 0.0 0.0 45648 4656 ? S 04:42 0:00 src/osmo-bsc_mgcp/osmo-bsc_mgcp -c /build/openbsc/writtenconfig/osmo-bsc-mgcp.cfgf2GPkj build 5167 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5169 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg, test verify_doc Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg' > ls -l /proc/5079/fd total 0 lr-x------ 1 build build 64 Dec 23 04:42 0 -> pipe:[236368976] l-wx------ 1 build build 64 Dec 23 04:42 1 -> pipe:[236368977] lr-x------ 1 build build 64 Dec 23 04:42 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[236368978] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5079 0.6 0.0 39732 14636 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5170 0.0 0.0 57964 7208 ? D 04:42 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg build 5177 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5179 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfgjUqTlE, test write_config Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/openbsc-multitrx.cfgjUqTlE' > ls -l /proc/5079/fd total 0 lr-x------ 1 build build 64 Dec 23 04:42 0 -> pipe:[236368976] l-wx------ 1 build build 64 Dec 23 04:42 1 -> pipe:[236368977] lr-x------ 1 build build 64 Dec 23 04:42 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[236368978] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5079 0.6 0.0 39716 14692 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5180 0.0 0.0 57964 7208 ? D 04:42 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfgjUqTlE build 5187 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5189 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfgjUqTlE, test token_vty_command Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/openbsc-multitrx.cfgjUqTlE' > ls -l /proc/5079/fd total 0 lr-x------ 1 build build 64 Dec 23 04:42 0 -> pipe:[236368976] l-wx------ 1 build build 64 Dec 23 04:42 1 -> pipe:[236368977] lr-x------ 1 build build 64 Dec 23 04:42 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[236368978] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5079 0.5 0.0 39716 14692 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5190 0.0 0.0 57964 7208 ? D 04:42 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfgjUqTlE build 5197 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5199 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg, test verify_doc Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg' > ls -l /proc/5079/fd total 0 lr-x------ 1 build build 64 Dec 23 04:42 0 -> pipe:[236368976] l-wx------ 1 build build 64 Dec 23 04:42 1 -> pipe:[236368977] lr-x------ 1 build build 64 Dec 23 04:42 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[236368978] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5079 0.4 0.0 39716 14692 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5200 0.0 0.0 57812 7056 ? D 04:42 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg build 5207 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5209 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfgctwtVn, test write_config Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/osmo-nitb.cfgctwtVn' > ls -l /proc/5079/fd total 0 lr-x------ 1 build build 64 Dec 23 04:42 0 -> pipe:[236368976] l-wx------ 1 build build 64 Dec 23 04:42 1 -> pipe:[236368977] lr-x------ 1 build build 64 Dec 23 04:42 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[236368978] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5079 0.4 0.0 39716 14692 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5210 0.0 0.0 57812 7056 ? D 04:42 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfgctwtVn build 5217 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5219 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfgctwtVn, test token_vty_command Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/osmo-nitb.cfgctwtVn' > ls -l /proc/5079/fd total 0 lr-x------ 1 build build 64 Dec 23 04:42 0 -> pipe:[236368976] l-wx------ 1 build build 64 Dec 23 04:42 1 -> pipe:[236368977] lr-x------ 1 build build 64 Dec 23 04:42 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:42 2 -> pipe:[236368978] l-wx------ 1 build build 64 Dec 23 04:42 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5079 0.4 0.0 39716 14692 ? S 04:42 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5220 0.0 0.0 57812 7056 ? D 04:42 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfgctwtVn build 5227 0.0 0.0 4336 732 ? S 04:42 0:00 /bin/sh -c ps xua | grep osmo build 5229 0.0 0.0 11128 1028 ? S 04:42 0:00 grep osmo ERRORS: 5 Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Makefile:714: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/openbsc/tests' make[5]: *** [python-tests] Error 5 Makefile:724: recipe for target 'check-local' failed make[4]: Leaving directory '/build/openbsc/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:576: recipe for target 'check-am' failed make[3]: Leaving directory '/build/openbsc/tests' Makefile:428: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/openbsc/tests' make[2]: *** [check-recursive] Error 1 Makefile:514: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [check-recursive] Error 1 Makefile:805: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:47:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:47:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7673?= In-Reply-To: <1260201094.185.1545540084082.JavaMail.jenkins@jenkins.osmocom.org> References: <1260201094.185.1545540084082.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1668370008.193.1545540467680.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 277.70 KB...] > ps xua | grep osmo build 32333 0.7 0.0 39612 14568 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32374 0.0 0.0 21474958492 11468 ? S 04:47 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgKAAo2I build 32381 0.0 0.0 4336 724 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 32383 0.0 0.0 11128 1028 ? S 04:47 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgKAAo2I, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgKAAo2I' > ls -l /proc/32333/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[2170185559] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[2170185560] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[2170185561] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32333 0.7 0.0 39612 14568 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32384 0.0 0.0 21474958492 11672 ? S 04:47 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgKAAo2I build 32391 0.0 0.0 4336 804 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 32393 0.0 0.0 11128 960 ? R 04:47 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/32333/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[2170185559] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[2170185560] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[2170185561] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32333 0.6 0.0 39612 14568 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32394 0.0 0.0 21475032288 21232 ? R 04:47 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 32401 0.0 0.0 4336 720 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 32403 0.0 0.0 11128 960 ? S 04:47 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgG1C4_d, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgG1C4_d' > ls -l /proc/32333/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[2170185559] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[2170185560] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[2170185561] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4251 *:* LISTEN 0 10 127.0.0.1:4245 *:* > ps xua | grep osmo build 32333 0.6 0.0 39768 14620 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32404 0.0 0.0 21475098452 26548 ? R 04:47 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgG1C4_d build 32411 0.0 0.0 4336 748 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 32413 0.0 0.0 11128 1004 ? S 04:47 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgG1C4_d, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgG1C4_d' > ls -l /proc/32333/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[2170185559] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[2170185560] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[2170185561] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4251 *:* LISTEN 0 10 127.0.0.1:4245 *:* > ps xua | grep osmo build 32333 0.6 0.0 39768 14620 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32414 0.0 0.0 21475098452 23544 ? R 04:47 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgG1C4_d build 32421 0.0 0.0 4336 768 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 32423 0.0 0.0 11128 988 ? S 04:47 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/32333/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[2170185559] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[2170185560] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[2170185561] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 32333 0.5 0.0 39768 14620 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32424 0.0 0.0 21474956232 10876 ? S 04:47 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 32431 0.0 0.0 4336 728 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 32433 0.0 0.0 11128 1028 ? R 04:47 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgXm5dGW, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgXm5dGW' > ls -l /proc/32333/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[2170185559] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[2170185560] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[2170185561] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 32333 0.5 0.0 39768 14620 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32434 0.0 0.0 21474956232 10892 ? S 04:47 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgXm5dGW build 32441 0.0 0.0 4336 732 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 32443 0.0 0.0 11128 952 ? S 04:47 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgXm5dGW, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgXm5dGW' > ls -l /proc/32333/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[2170185559] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[2170185560] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[2170185561] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 32333 0.5 0.0 39768 14620 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32444 0.0 0.0 21474956232 10944 ? S 04:47 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgXm5dGW build 32451 0.0 0.0 4336 760 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 32453 0.0 0.0 11128 996 ? S 04:47 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:699: recipe for target 'check-local' failed make[4]: *** [check-local] Error 2 make[4]: Leaving directory '/build/tests' Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:404: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory '/build/tests' Makefile:441: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory '/build' Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:47:53 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:47:53 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7673?= In-Reply-To: <2020532002.187.1545540135191.JavaMail.jenkins@jenkins.osmocom.org> References: <2020532002.187.1545540135191.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <504549275.194.1545540473716.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.04 MB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7052 0.5 0.0 39608 14564 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7093 0.0 0.0 21474958492 11400 ? S 04:47 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgItgBqQ build 7100 0.0 0.0 4336 804 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 7102 0.0 0.0 11128 944 ? S 04:47 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgItgBqQ, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgItgBqQ' > ls -l /proc/7052/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[1899412241] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[1899412242] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[1899412243] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7052 0.5 0.0 39608 14564 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7103 0.0 0.0 21474958492 11724 ? S 04:47 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgItgBqQ build 7110 0.0 0.0 4336 764 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 7112 0.0 0.0 11128 1036 ? S 04:47 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/7052/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[1899412241] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[1899412242] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[1899412243] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7052 0.4 0.0 39608 14564 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7113 0.0 0.0 21474978552 12552 ? R 04:47 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 7120 0.0 0.0 4336 808 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 7122 0.0 0.0 4336 108 ? R 04:47 0:00 /bin/sh -c ps xua | grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg_Nddam, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg_Nddam' > ls -l /proc/7052/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[1899412241] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[1899412242] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[1899412243] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7052 0.5 0.0 39764 14748 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7123 0.0 0.0 21474978552 12920 ? R 04:47 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg_Nddam build 7130 0.0 0.0 4336 712 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 7132 0.0 0.0 11128 1036 ? S 04:47 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg_Nddam, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg_Nddam' > ls -l /proc/7052/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[1899412241] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[1899412242] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[1899412243] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7052 0.5 0.0 39764 14748 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7133 0.0 0.0 21474978432 9420 ? R 04:47 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg_Nddam build 7140 0.0 0.0 4336 760 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 7142 0.0 0.0 11128 972 ? S 04:47 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/7052/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[1899412241] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[1899412242] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[1899412243] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7052 0.5 0.0 39764 14748 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7143 0.0 0.0 21474962696 11036 ? S 04:47 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 7150 0.0 0.0 4336 756 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 7152 0.0 0.0 11128 1032 ? S 04:47 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg_f1tzE, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg_f1tzE' > ls -l /proc/7052/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[1899412241] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[1899412242] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[1899412243] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7052 0.5 0.0 39764 14748 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7153 0.0 0.0 21474962700 11032 ? D 04:47 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg_f1tzE build 7160 0.0 0.0 4336 816 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 7162 0.0 0.0 11128 1044 ? S 04:47 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg_f1tzE, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg_f1tzE' > ls -l /proc/7052/fd total 0 lr-x------ 1 build build 64 Dec 23 04:47 0 -> pipe:[1899412241] l-wx------ 1 build build 64 Dec 23 04:47 1 -> pipe:[1899412242] lr-x------ 1 build build 64 Dec 23 04:47 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:47 2 -> pipe:[1899412243] l-wx------ 1 build build 64 Dec 23 04:47 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7052 0.5 0.0 39764 14748 ? S 04:47 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7163 2.0 0.0 21474962700 11076 ? D 04:47 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg_f1tzE build 7170 0.0 0.0 4336 732 ? S 04:47 0:00 /bin/sh -c ps xua | grep osmo build 7172 0.0 0.0 11128 936 ? S 04:47 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:48:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:48:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7656?= In-Reply-To: <1978677994.184.1545540037888.JavaMail.jenkins@jenkins.osmocom.org> References: <1978677994.184.1545540037888.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2100255631.195.1545540527027.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 840.26 KB...] build 9310 0.0 0.0 4336 724 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 9312 0.0 0.0 11128 964 ? S 04:48 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgv_Uxv8, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfgv_Uxv8' > ls -l /proc/9292/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170185430] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170185431] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170185432] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9292 0.7 0.0 39496 14532 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9313 0.0 0.0 21474968780 13268 ? R 04:48 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgv_Uxv8 build 9320 0.0 0.0 4336 764 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 9322 0.0 0.0 4336 104 ? R 04:48 0:00 /bin/sh -c ps xua | grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/9292/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170185430] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170185431] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170185432] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9292 0.5 0.0 39496 14532 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9323 0.0 0.0 21474973720 14624 ? R 04:48 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 9330 0.0 0.0 4336 768 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 9332 0.0 0.0 11128 960 ? S 04:48 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgOJlqZC, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgOJlqZC' > ls -l /proc/9292/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170185430] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170185431] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170185432] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9292 0.4 0.0 39504 14548 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9333 0.0 0.0 21474968780 13348 ? R 04:48 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgOJlqZC build 9340 0.0 0.0 4336 804 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 9342 0.0 0.0 11128 996 ? S 04:48 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgOJlqZC, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgOJlqZC' > ls -l /proc/9292/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170185430] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170185431] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170185432] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9292 0.3 0.0 39504 14548 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9343 0.0 0.0 21474968780 13296 ? R 04:48 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgOJlqZC build 9350 0.0 0.0 4336 712 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 9352 0.0 0.0 11128 1044 ? S 04:48 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/9292/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170185430] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170185431] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170185432] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9292 0.3 0.0 39504 14548 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9353 0.0 0.0 21474973756 14464 ? R 04:48 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 9360 0.0 0.0 4336 760 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 9362 0.0 0.0 11128 992 ? S 04:48 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgVtKvnu, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgVtKvnu' > ls -l /proc/9292/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170185430] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170185431] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170185432] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9292 0.3 0.0 39504 14548 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9363 0.0 0.0 21474968780 13120 ? R 04:48 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgVtKvnu build 9370 0.0 0.0 4336 724 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 9372 0.0 0.0 4336 108 ? R 04:48 0:00 /bin/sh -c ps xua | grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgVtKvnu, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgVtKvnu' > ls -l /proc/9292/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170185430] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170185431] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170185432] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9292 0.3 0.0 39504 14548 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9373 0.0 0.0 21474968780 13896 ? R 04:48 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgVtKvnu build 9380 0.0 0.0 4336 804 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 9382 0.0 0.0 11128 988 ? S 04:48 0:00 grep osmo ERRORS: 3 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) make[7]: *** [vty-python-test] Error 3 Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 04:49:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 04:49:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7656?= In-Reply-To: <1194603571.188.1545540136461.JavaMail.jenkins@jenkins.osmocom.org> References: <1194603571.188.1545540136461.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1491181281.196.1545540542998.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.18 MB...] build 11890 0.0 0.0 4336 808 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 11892 0.0 0.0 4336 108 ? R 04:48 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg79uuuo, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfg79uuuo' > ls -l /proc/11872/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170180574] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170180575] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170180576] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11872 0.8 0.0 39752 14724 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11893 0.0 0.0 21474974756 14300 ? R 04:48 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg79uuuo build 11900 0.0 0.0 4336 764 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 11902 0.0 0.0 11128 972 ? S 04:48 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/11872/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170180574] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170180575] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170180576] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11872 0.6 0.0 39752 14724 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11903 0.0 0.0 21474979696 16600 ? D 04:48 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 11910 0.0 0.0 4336 764 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 11912 0.0 0.0 11128 992 ? S 04:48 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfg2y4DCO, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfg2y4DCO' > ls -l /proc/11872/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170180574] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170180575] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170180576] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11872 0.5 0.0 39752 14740 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11913 0.0 0.0 21474974756 12124 ? R 04:48 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfg2y4DCO build 11920 0.0 0.0 4336 804 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 11922 0.0 0.0 11128 1004 ? S 04:48 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfg2y4DCO, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfg2y4DCO' > ls -l /proc/11872/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170180574] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170180575] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170180576] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11872 0.4 0.0 39752 14740 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11923 0.0 0.0 21474979696 16712 ? D 04:48 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfg2y4DCO build 11930 0.0 0.0 4336 724 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 11932 0.0 0.0 11128 940 ? S 04:48 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/11872/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170180574] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170180575] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170180576] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11872 0.3 0.0 39752 14740 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11933 0.0 0.0 21474974756 14232 ? R 04:48 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 11940 0.0 0.0 4336 804 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 11942 0.0 0.0 11128 972 ? S 04:48 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgLiAQtT, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgLiAQtT' > ls -l /proc/11872/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170180574] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170180575] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170180576] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11872 0.3 0.0 39752 14740 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11943 1.0 0.0 21474974756 13712 ? R 04:48 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgLiAQtT build 11950 0.0 0.0 4336 692 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 11952 0.0 0.0 11032 536 ? R 04:48 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgLiAQtT, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgLiAQtT' > ls -l /proc/11872/fd total 0 lr-x------ 1 build build 64 Dec 23 04:48 0 -> pipe:[2170180574] l-wx------ 1 build build 64 Dec 23 04:48 1 -> pipe:[2170180575] lr-x------ 1 build build 64 Dec 23 04:48 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 04:48 2 -> pipe:[2170180576] l-wx------ 1 build build 64 Dec 23 04:48 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11872 0.3 0.0 39752 14740 ? S 04:48 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11953 0.0 0.0 21474974756 13364 ? R 04:48 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgLiAQtT build 11960 0.0 0.0 4336 732 ? S 04:48 0:00 /bin/sh -c ps xua | grep osmo build 11962 0.0 0.0 4336 108 ? R 04:48 0:00 /bin/sh -c ps xua | grep osmo ERRORS: 3 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) make[7]: *** [vty-python-test] Error 3 Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 make[5]: *** [python-tests] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Dec 23 05:25:38 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Dec 2018 05:25:38 +0000 Subject: Change in osmocom-bb[master]: mobile: Use new VTY telnet API to allow binding to random port In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/12326 ) Change subject: mobile: Use new VTY telnet API to allow binding to random port ...................................................................... mobile: Use new VTY telnet API to allow binding to random port Change-Id: I5a6214aec2dcb92495038ea8311c0df22fa8d07b --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve; Verified Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 84dec86..8b5fc91 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -454,8 +454,7 @@ LOGP(DMOB, LOGL_INFO, "Using configuration from '%s'\n", config_file); } vty_reading = 0; - rc = telnet_init_dynif(l23_ctx, NULL, - vty_get_bind_addr(), OSMO_VTY_PORT_BB); + rc = telnet_init_default(l23_ctx, NULL, OSMO_VTY_PORT_BB); if (rc < 0) { LOGP(DMOB, LOGL_FATAL, "Cannot init VTY on %s port %u: %s\n", vty_get_bind_addr(), OSMO_VTY_PORT_BB, strerror(errno)); -- To view, visit https://gerrit.osmocom.org/12326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5a6214aec2dcb92495038ea8311c0df22fa8d07b Gerrit-Change-Number: 12326 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 23 06:19:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:19:29 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7674?= In-Reply-To: <1668370008.193.1545540467680.JavaMail.jenkins@jenkins.osmocom.org> References: <1668370008.193.1545540467680.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1142659744.198.1545545969443.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 275.53 KB...] > ps xua | grep osmo build 301 0.0 0.0 4336 768 ? S 06:19 0:00 /bin/sh -c ps xua | grep osmo build 303 0.0 0.0 11128 936 ? S 06:19 0:00 grep osmo build 32721 0.6 0.0 39608 14612 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32762 0.0 0.0 21474958492 11404 ? S 06:19 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgtGzSEG Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgtGzSEG, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgtGzSEG' > ls -l /proc/32721/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900299135] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900299136] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900299137] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 304 0.0 0.0 21474958492 11428 ? S 06:19 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgtGzSEG build 311 0.0 0.0 4336 712 ? S 06:19 0:00 /bin/sh -c ps xua | grep osmo build 313 0.0 0.0 11128 924 ? S 06:19 0:00 grep osmo build 32721 0.7 0.0 39608 14612 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/32721/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900299135] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900299136] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900299137] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4251 *:* LISTEN 0 10 127.0.0.1:4245 *:* > ps xua | grep osmo build 314 0.0 0.0 21474966128 13172 ? D 06:19 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 321 0.0 0.0 4336 692 ? S 06:19 0:00 /bin/sh -c ps xua | grep osmo build 323 0.0 0.0 11128 988 ? S 06:19 0:00 grep osmo build 32721 0.5 0.0 39608 14612 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgIC8boR, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgIC8boR' > ls -l /proc/32721/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900299135] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900299136] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900299137] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 324 0.0 0.0 21474965960 6248 ? R 06:19 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgIC8boR build 331 0.0 0.0 4336 732 ? S 06:19 0:00 /bin/sh -c ps xua | grep osmo build 333 0.0 0.0 4336 104 ? R 06:19 0:00 /bin/sh -c ps xua | grep osmo build 32721 0.6 0.0 39764 14664 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgIC8boR, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgIC8boR' > ls -l /proc/32721/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900299135] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900299136] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900299137] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4251 *:* LISTEN 0 10 127.0.0.1:4245 *:* > ps xua | grep osmo build 334 0.0 0.0 21475098452 33312 ? R 06:19 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgIC8boR build 341 0.0 0.0 4336 812 ? S 06:19 0:00 /bin/sh -c ps xua | grep osmo build 343 0.0 0.0 11128 960 ? S 06:19 0:00 grep osmo build 32721 0.5 0.0 39764 14664 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/32721/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900299135] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900299136] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900299137] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 344 0.0 0.0 21474956232 10716 ? S 06:19 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 351 0.0 0.0 4336 764 ? S 06:19 0:00 /bin/sh -c ps xua | grep osmo build 353 0.0 0.0 11128 960 ? S 06:19 0:00 grep osmo build 32721 0.4 0.0 39764 14664 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfga_IGun, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfga_IGun' > ls -l /proc/32721/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900299135] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900299136] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900299137] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 354 0.0 0.0 21474956232 10856 ? S 06:19 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfga_IGun build 361 0.0 0.0 4336 760 ? S 06:19 0:00 /bin/sh -c ps xua | grep osmo build 363 0.0 0.0 11128 996 ? S 06:19 0:00 grep osmo build 32721 0.4 0.0 39764 14664 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfga_IGun, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfga_IGun' > ls -l /proc/32721/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900299135] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900299136] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900299137] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 364 0.0 0.0 21474956236 10924 ? D 06:19 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfga_IGun build 371 0.0 0.0 4336 724 ? S 06:19 0:00 /bin/sh -c ps xua | grep osmo build 373 0.0 0.0 11128 992 ? S 06:19 0:00 grep osmo build 32721 0.4 0.0 39764 14664 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 4 make[4]: *** [check-local] Error 2 Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:20:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:20:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7657?= In-Reply-To: <2100255631.195.1545540527027.JavaMail.jenkins@jenkins.osmocom.org> References: <2100255631.195.1545540527027.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1611615108.199.1545546021390.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 838.68 KB...] build 10137 0.0 0.0 11128 988 ? S 06:19 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgRvDWwu, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfgRvDWwu' > ls -l /proc/10117/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900300650] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900300651] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900300652] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 10117 0.8 0.0 39756 14648 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 10138 0.0 0.0 21474968780 13348 ? R 06:19 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgRvDWwu build 10145 0.0 0.0 4336 728 ? S 06:19 0:00 /bin/sh -c ps xua | grep osmo build 10147 0.0 0.0 11128 1044 ? S 06:19 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/10117/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900300650] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900300651] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900300652] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 10117 0.7 0.0 39756 14648 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 10148 0.0 0.0 21474973720 14612 ? R 06:19 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 10155 0.0 0.0 4336 728 ? S 06:19 0:00 /bin/sh -c ps xua | grep osmo build 10157 0.0 0.0 11128 996 ? S 06:19 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfg_kXBef, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfg_kXBef' > ls -l /proc/10117/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900300650] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900300651] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900300652] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 10117 0.6 0.0 39756 14664 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 10158 0.0 0.0 21474968780 13516 ? R 06:20 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfg_kXBef build 10165 0.0 0.0 4336 800 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 10167 0.0 0.0 11128 1032 ? S 06:20 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfg_kXBef, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfg_kXBef' > ls -l /proc/10117/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900300650] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900300651] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900300652] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 10117 0.5 0.0 39756 14664 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 10168 0.0 0.0 21474968780 13980 ? R 06:20 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfg_kXBef build 10175 0.0 0.0 4336 812 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 10177 0.0 0.0 4336 104 ? R 06:20 0:00 /bin/sh -c ps xua | grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/10117/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900300650] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900300651] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900300652] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 10117 0.4 0.0 39756 14664 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 10178 0.0 0.0 21474968780 13720 ? R 06:20 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 10185 0.0 0.0 4336 764 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 10187 0.0 0.0 4336 104 ? R 06:20 0:00 /bin/sh -c ps xua | grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgfzz_v3, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgfzz_v3' > ls -l /proc/10117/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900300650] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900300651] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900300652] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 10117 0.4 0.0 39756 14664 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 10188 2.0 0.0 21474968780 13300 ? R 06:20 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgfzz_v3 build 10195 0.0 0.0 4336 812 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 10197 0.0 0.0 11128 992 ? S 06:20 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgfzz_v3, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgfzz_v3' > ls -l /proc/10117/fd total 0 lr-x------ 1 build build 64 Dec 23 06:19 0 -> pipe:[1900300650] l-wx------ 1 build build 64 Dec 23 06:19 1 -> pipe:[1900300651] lr-x------ 1 build build 64 Dec 23 06:19 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:19 2 -> pipe:[1900300652] l-wx------ 1 build build 64 Dec 23 06:19 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 10117 0.4 0.0 39756 14664 ? S 06:19 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 10198 0.0 0.0 21474968780 13740 ? R 06:20 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgfzz_v3 build 10205 0.0 0.0 4336 712 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 10207 0.0 0.0 11128 956 ? S 06:20 0:00 grep osmo ERRORS: 3 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) make[7]: *** [vty-python-test] Error 3 Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:743: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:20:40 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:20:40 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4610?= In-Reply-To: <40694436.186.1545540094932.JavaMail.jenkins@jenkins.osmocom.org> References: <40694436.186.1545540094932.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <437780665.200.1545546040436.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 919.69 KB...] Terminating took 2.679s Launch: ./src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg from /build Launching: PWD=/build './src/osmo-bsc/osmo-bsc' '-c' '/build/doc/examples/osmo-bsc/osmo-bsc.cfg' > ls -l /proc/1059/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170362648] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170362649] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170362650] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1059 0.7 0.0 39460 14240 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestvty.py -p /build -w /build -v build 1080 0.0 0.0 21474965720 13368 ? R 06:20 0:00 ./src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg build 1087 0.0 0.0 4336 768 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 1089 0.0 0.0 11128 960 ? S 06:20 0:00 grep osmo ok ---------------------------------------------------------------------- Ran 3 tests in 10.460s OK Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Socket: closing 127.0.0.1:4242 (0 sockets open) Terminating took 2.679s osmotestconfig.py -p /build -w /build -v Warning: doc/examples/osmo-bsc/osmo-bsc-minimal.cfg is not being tested Verifying src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg, test verify_doc Opening /dev/null Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/doc/examples/osmo-bsc/osmo-bsc.cfg' > ls -l /proc/1090/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170362648] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170362649] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170362650] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1090 3.0 0.0 39464 14092 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1091 0.0 0.0 21474965720 15224 ? R 06:20 0:00 src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg build 1098 0.0 0.0 4336 768 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 1100 0.0 0.0 11128 960 ? S 06:20 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc.cfgNOPkMA, test write_config Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/writtenconfig/osmo-bsc.cfgNOPkMA' > ls -l /proc/1090/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170362648] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170362649] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170362650] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1090 1.5 0.0 39548 14492 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1101 0.0 0.0 21474965720 17848 ? R 06:20 0:00 src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc.cfgNOPkMA build 1108 0.0 0.0 4336 736 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 1110 0.0 0.0 11128 936 ? S 06:20 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc.cfgNOPkMA, test token_vty_command Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/writtenconfig/osmo-bsc.cfgNOPkMA' > ls -l /proc/1090/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170362648] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170362649] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170362650] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1090 0.7 0.0 39548 14492 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1111 0.0 0.0 21474965720 16080 ? R 06:20 0:00 src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc.cfgNOPkMA build 1118 0.0 0.0 4336 808 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 1120 0.0 0.0 11128 1044 ? S 06:20 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg' > ls -l /proc/1090/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170362648] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170362649] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170362650] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1090 0.5 0.0 39548 14492 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1121 0.0 0.0 21474965720 16564 ? R 06:20 0:00 src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg build 1128 0.0 0.0 4336 804 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 1130 0.0 0.0 11128 992 ? S 06:20 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc_custom-sccp.cfgprp_01, test write_config Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/writtenconfig/osmo-bsc_custom-sccp.cfgprp_01' > ls -l /proc/1090/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170362648] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170362649] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170362650] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1090 0.5 0.0 39980 14812 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1131 0.0 0.0 21474965720 16196 ? R 06:20 0:00 src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc_custom-sccp.cfgprp_01 build 1138 0.0 0.0 4336 720 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 1140 0.0 0.0 11128 996 ? S 06:20 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc_custom-sccp.cfgprp_01, test token_vty_command Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/writtenconfig/osmo-bsc_custom-sccp.cfgprp_01' > ls -l /proc/1090/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170362648] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170362649] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170362650] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1090 0.4 0.0 39980 14812 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1141 0.0 0.0 21474965720 14576 ? R 06:20 0:00 src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc_custom-sccp.cfgprp_01 build 1148 0.0 0.0 4336 744 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 1150 0.0 0.0 4336 104 ? R 06:20 0:00 /bin/sh -c ps xua | grep osmo ERRORS: 2 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) make[5]: *** [python-tests] Error 2 Makefile:684: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:703: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:546: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:398: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:435: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:726: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:20:45 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:20:45 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7674?= In-Reply-To: <504549275.194.1545540473716.JavaMail.jenkins@jenkins.osmocom.org> References: <504549275.194.1545540473716.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1626123418.201.1545546045529.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.13 MB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7407 1.0 0.0 39608 14500 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7448 0.0 0.0 21474958492 11288 ? S 06:20 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgFzJfyf build 7455 0.0 0.0 4336 732 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 7457 0.0 0.0 11128 1028 ? S 06:20 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgFzJfyf, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgFzJfyf' > ls -l /proc/7407/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[238013447] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[238013448] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[238013449] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7407 0.8 0.0 39608 14500 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7458 0.0 0.0 21474958492 11400 ? S 06:20 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgFzJfyf build 7465 0.0 0.0 4336 732 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 7467 0.0 0.0 11128 1028 ? S 06:20 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/7407/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[238013447] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[238013448] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[238013449] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7407 0.7 0.0 39608 14500 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7468 0.0 0.0 21474978552 13228 ? R 06:20 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 7475 0.0 0.0 4336 732 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 7477 0.0 0.0 11128 1028 ? S 06:20 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg_0PYSC, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg_0PYSC' > ls -l /proc/7407/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[238013447] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[238013448] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[238013449] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7407 0.7 0.0 39764 14656 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7478 0.0 0.0 21474978552 13916 ? R 06:20 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg_0PYSC build 7485 0.0 0.0 4336 732 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 7487 0.0 0.0 11128 1028 ? S 06:20 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg_0PYSC, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg_0PYSC' > ls -l /proc/7407/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[238013447] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[238013448] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[238013449] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7407 0.6 0.0 39764 14656 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7488 0.0 0.0 21474978552 12812 ? R 06:20 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg_0PYSC build 7495 0.0 0.0 4336 732 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 7497 0.0 0.0 11128 1028 ? S 06:20 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/7407/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[238013447] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[238013448] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[238013449] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7407 0.6 0.0 39764 14656 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7498 0.0 0.0 21474962696 10756 ? S 06:20 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 7505 0.0 0.0 4336 732 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 7507 0.0 0.0 11128 1028 ? S 06:20 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg_Lyq7A, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg_Lyq7A' > ls -l /proc/7407/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[238013447] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[238013448] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[238013449] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7407 0.6 0.0 39764 14656 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7508 0.0 0.0 21474962696 10816 ? S 06:20 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg_Lyq7A build 7515 0.0 0.0 4336 732 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 7517 0.0 0.0 11128 1028 ? S 06:20 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg_Lyq7A, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfg_Lyq7A' > ls -l /proc/7407/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[238013447] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[238013448] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[238013449] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 7407 0.5 0.0 39764 14656 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7518 0.0 0.0 21474962696 10856 ? S 06:20 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfg_Lyq7A build 7525 0.0 0.0 4336 732 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 7527 0.0 0.0 11128 1028 ? S 06:20 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:732: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:20:53 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:20:53 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-o?= =?UTF-8?Q?penbsc_=C2=BB_--disable-iu,--disable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3480?= In-Reply-To: <1478628211.190.1545540157562.JavaMail.jenkins@jenkins.osmocom.org> References: <1478628211.190.1545540157562.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <531218570.202.1545546053720.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 821.96 KB...] l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170368126] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 4933 0.9 0.0 39732 14784 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5014 0.0 0.0 43540 4796 ? S 06:20 0:00 src/osmo-bsc_mgcp/osmo-bsc_mgcp -c /build/openbsc/writtenconfig/osmo-bsc-mgcp.cfgYUQLXq build 5021 0.0 0.0 4336 744 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5023 0.0 0.0 11128 1036 ? S 06:20 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg, test verify_doc Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg' > ls -l /proc/4933/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170368124] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170368125] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170368126] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 4933 0.9 0.0 39732 14784 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5024 0.0 0.0 57964 7500 ? D 06:20 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg build 5031 0.0 0.0 4336 728 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5033 0.0 0.0 4336 108 ? R 06:20 0:00 /bin/sh -c ps xua | grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfg4r9kUL, test write_config Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/openbsc-multitrx.cfg4r9kUL' > ls -l /proc/4933/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170368124] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170368125] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170368126] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 4933 0.8 0.0 39716 14840 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5034 0.0 0.0 57964 7192 ? D 06:20 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfg4r9kUL build 5041 0.0 0.0 4336 764 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5043 0.0 0.0 11128 972 ? S 06:20 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfg4r9kUL, test token_vty_command Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/openbsc-multitrx.cfg4r9kUL' > ls -l /proc/4933/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170368124] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170368125] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170368126] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 4933 0.6 0.0 39716 14840 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5044 0.0 0.0 57964 7320 ? D 06:20 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfg4r9kUL build 5051 0.0 0.0 4336 820 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5053 0.0 0.0 11128 1032 ? S 06:20 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg, test verify_doc Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg' > ls -l /proc/4933/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170368124] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170368125] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170368126] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 4933 0.5 0.0 39716 14840 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5054 0.0 0.0 57812 7136 ? D 06:20 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg build 5061 0.0 0.0 4336 748 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5063 0.0 0.0 11128 988 ? S 06:20 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfgl_mY29, test write_config Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/osmo-nitb.cfgl_mY29' > ls -l /proc/4933/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170368124] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170368125] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170368126] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 4933 0.5 0.0 39716 14840 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5064 0.0 0.0 57812 7116 ? D 06:20 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfgl_mY29 build 5071 0.0 0.0 4336 760 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5073 0.0 0.0 11128 956 ? S 06:20 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfgl_mY29, test token_vty_command Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/osmo-nitb.cfgl_mY29' > ls -l /proc/4933/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170368124] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170368125] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170368126] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 4933 0.4 0.0 39716 14840 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5074 0.0 0.0 57812 7180 ? D 06:20 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfgl_mY29 build 5081 0.0 0.0 4336 760 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5083 0.0 0.0 11128 964 ? S 06:20 0:00 grep osmo ERRORS: 5 Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Makefile:714: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/openbsc/tests' make[5]: *** [python-tests] Error 5 make[4]: *** [check-local] Error 2 Makefile:724: recipe for target 'check-local' failed make[4]: Leaving directory '/build/openbsc/tests' make[3]: *** [check-am] Error 2 Makefile:576: recipe for target 'check-am' failed make[3]: Leaving directory '/build/openbsc/tests' make[2]: *** [check-recursive] Error 1 Makefile:428: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/openbsc/tests' Makefile:514: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [check-recursive] Error 1 Makefile:805: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:20:58 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:20:58 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-?= =?UTF-8?Q?openbsc_=C2=BB_--disable-iu,--enable-m?= =?UTF-8?Q?gcp-transcoding,--enable-smpp,def?= =?UTF-8?Q?ault,osmocom-master-debian9_#3480?= In-Reply-To: <1513911491.191.1545540170062.JavaMail.jenkins@jenkins.osmocom.org> References: <1513911491.191.1545540170062.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <101356326.203.1545546058165.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 811.38 KB...] State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 5064 0.6 0.0 39732 14724 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5145 0.0 0.0 45648 4844 ? S 06:20 0:00 src/osmo-bsc_mgcp/osmo-bsc_mgcp -c /build/openbsc/writtenconfig/osmo-bsc-mgcp.cfgs6XVnL build 5152 0.0 0.0 4336 732 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5154 0.0 0.0 11128 1048 ? S 06:20 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg, test verify_doc Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg' > ls -l /proc/5064/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170364577] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170364578] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170364579] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5064 0.7 0.0 39732 14724 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5155 0.0 0.0 57964 7316 ? D 06:20 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg build 5162 0.0 0.0 4336 712 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5164 0.0 0.0 4336 104 ? R 06:20 0:00 /bin/sh -c ps xua | grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfg1xGPAU, test write_config Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/openbsc-multitrx.cfg1xGPAU' > ls -l /proc/5064/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170364577] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170364578] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170364579] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5064 0.6 0.0 39716 14780 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5165 0.0 0.0 57964 7436 ? S 06:20 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfg1xGPAU build 5172 0.0 0.0 4336 768 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5174 0.0 0.0 4336 104 ? R 06:20 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfg1xGPAU, test token_vty_command Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/openbsc-multitrx.cfg1xGPAU' > ls -l /proc/5064/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170364577] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170364578] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170364579] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5064 0.5 0.0 39716 14780 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5175 0.0 0.0 57964 7392 ? D 06:20 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/openbsc-multitrx.cfg1xGPAU build 5182 0.0 0.0 4336 732 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5184 0.0 0.0 11128 1044 ? S 06:20 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg, test verify_doc Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg' > ls -l /proc/5064/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170364577] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170364578] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170364579] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5064 0.4 0.0 39716 14780 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5185 0.0 0.0 57812 7068 ? D 06:20 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg build 5192 0.0 0.0 4336 764 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5194 0.0 0.0 11128 984 ? S 06:20 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfgBOF10q, test write_config Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/osmo-nitb.cfgBOF10q' > ls -l /proc/5064/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170364577] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170364578] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170364579] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5064 0.4 0.0 39716 14780 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5195 0.0 0.0 57812 6972 ? R 06:20 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfgBOF10q build 5202 0.0 0.0 4336 816 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5204 0.0 0.0 11128 920 ? S 06:20 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfgBOF10q, test token_vty_command Launching: PWD=/build/openbsc 'src/osmo-nitb/osmo-nitb' '-c' '/build/openbsc/writtenconfig/osmo-nitb.cfgBOF10q' > ls -l /proc/5064/fd total 0 lr-x------ 1 build build 64 Dec 23 06:20 0 -> pipe:[2170364577] l-wx------ 1 build build 64 Dec 23 06:20 1 -> pipe:[2170364578] lr-x------ 1 build build 64 Dec 23 06:20 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:20 2 -> pipe:[2170364579] l-wx------ 1 build build 64 Dec 23 06:20 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5064 0.4 0.0 39716 14780 ? S 06:20 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build/openbsc -w /build/openbsc -v build 5205 0.0 0.0 57812 7068 ? D 06:20 0:00 src/osmo-nitb/osmo-nitb -c /build/openbsc/writtenconfig/osmo-nitb.cfgBOF10q build 5212 0.0 0.0 4336 764 ? S 06:20 0:00 /bin/sh -c ps xua | grep osmo build 5214 0.0 0.0 4336 108 ? R 06:20 0:00 /bin/sh -c ps xua | grep osmo ERRORS: 5 Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) make[5]: *** [python-tests] Error 5 Makefile:714: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/openbsc/tests' Makefile:724: recipe for target 'check-local' failed make[4]: Leaving directory '/build/openbsc/tests' Makefile:576: recipe for target 'check-am' failed make[3]: Leaving directory '/build/openbsc/tests' Makefile:428: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/openbsc/tests' Makefile:514: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build/openbsc' Makefile:805: recipe for target 'check' failed make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:21:39 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:21:39 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7657?= In-Reply-To: <1491181281.196.1545540542998.JavaMail.jenkins@jenkins.osmocom.org> References: <1491181281.196.1545540542998.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <179477366.204.1545546099284.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.08 MB...] build 11904 2.0 0.0 39752 14660 ? S 06:21 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11915 0.0 0.0 21474974644 9864 ? R 06:21 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgs_1eiX build 11922 0.0 0.0 4336 732 ? S 06:21 0:00 /bin/sh -c ps xua | grep osmo build 11924 0.0 0.0 11128 1028 ? S 06:21 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgs_1eiX, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfgs_1eiX' > ls -l /proc/11904/fd total 0 lr-x------ 1 build build 64 Dec 23 06:21 0 -> pipe:[238008952] l-wx------ 1 build build 64 Dec 23 06:21 1 -> pipe:[238008953] lr-x------ 1 build build 64 Dec 23 06:21 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:21 2 -> pipe:[238008954] l-wx------ 1 build build 64 Dec 23 06:21 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11904 1.0 0.0 39752 14660 ? S 06:21 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11925 0.0 0.0 21474974756 15240 ? R 06:21 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfgs_1eiX build 11932 0.0 0.0 4336 732 ? S 06:21 0:00 /bin/sh -c ps xua | grep osmo build 11934 0.0 0.0 11128 1028 ? S 06:21 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/11904/fd total 0 lr-x------ 1 build build 64 Dec 23 06:21 0 -> pipe:[238008952] l-wx------ 1 build build 64 Dec 23 06:21 1 -> pipe:[238008953] lr-x------ 1 build build 64 Dec 23 06:21 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:21 2 -> pipe:[238008954] l-wx------ 1 build build 64 Dec 23 06:21 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11904 0.6 0.0 39752 14660 ? S 06:21 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11935 0.0 0.0 21474974756 14148 ? R 06:21 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 11942 0.0 0.0 4336 732 ? S 06:21 0:00 /bin/sh -c ps xua | grep osmo build 11944 0.0 0.0 11128 1028 ? S 06:21 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfglNkmjf, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfglNkmjf' > ls -l /proc/11904/fd total 0 lr-x------ 1 build build 64 Dec 23 06:21 0 -> pipe:[238008952] l-wx------ 1 build build 64 Dec 23 06:21 1 -> pipe:[238008953] lr-x------ 1 build build 64 Dec 23 06:21 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:21 2 -> pipe:[238008954] l-wx------ 1 build build 64 Dec 23 06:21 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11904 0.5 0.0 39752 14676 ? S 06:21 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11945 0.0 0.0 21474974760 14936 ? R 06:21 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfglNkmjf build 11952 0.0 0.0 4336 732 ? S 06:21 0:00 /bin/sh -c ps xua | grep osmo build 11954 0.0 0.0 4336 104 ? R 06:21 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfglNkmjf, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfglNkmjf' > ls -l /proc/11904/fd total 0 lr-x------ 1 build build 64 Dec 23 06:21 0 -> pipe:[238008952] l-wx------ 1 build build 64 Dec 23 06:21 1 -> pipe:[238008953] lr-x------ 1 build build 64 Dec 23 06:21 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:21 2 -> pipe:[238008954] l-wx------ 1 build build 64 Dec 23 06:21 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11904 0.4 0.0 39752 14676 ? S 06:21 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11955 0.0 0.0 21474976880 15412 ? R 06:21 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfglNkmjf build 11962 0.0 0.0 4336 732 ? S 06:21 0:00 /bin/sh -c ps xua | grep osmo build 11964 0.0 0.0 11128 1028 ? S 06:21 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/11904/fd total 0 lr-x------ 1 build build 64 Dec 23 06:21 0 -> pipe:[238008952] l-wx------ 1 build build 64 Dec 23 06:21 1 -> pipe:[238008953] lr-x------ 1 build build 64 Dec 23 06:21 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:21 2 -> pipe:[238008954] l-wx------ 1 build build 64 Dec 23 06:21 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11904 0.3 0.0 39752 14676 ? S 06:21 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11965 0.0 0.0 21474979696 16472 ? D 06:21 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 11972 0.0 0.0 4336 732 ? S 06:21 0:00 /bin/sh -c ps xua | grep osmo build 11974 0.0 0.0 11128 1028 ? S 06:21 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfga5nU0p, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfga5nU0p' > ls -l /proc/11904/fd total 0 lr-x------ 1 build build 64 Dec 23 06:21 0 -> pipe:[238008952] l-wx------ 1 build build 64 Dec 23 06:21 1 -> pipe:[238008953] lr-x------ 1 build build 64 Dec 23 06:21 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:21 2 -> pipe:[238008954] l-wx------ 1 build build 64 Dec 23 06:21 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11904 0.4 0.0 39752 14676 ? S 06:21 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11975 0.0 0.0 21474974760 14936 ? R 06:21 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfga5nU0p build 11982 0.0 0.0 4336 732 ? S 06:21 0:00 /bin/sh -c ps xua | grep osmo build 11984 0.0 0.0 11128 1028 ? S 06:21 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfga5nU0p, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfga5nU0p' > ls -l /proc/11904/fd total 0 lr-x------ 1 build build 64 Dec 23 06:21 0 -> pipe:[238008952] l-wx------ 1 build build 64 Dec 23 06:21 1 -> pipe:[238008953] lr-x------ 1 build build 64 Dec 23 06:21 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:21 2 -> pipe:[238008954] l-wx------ 1 build build 64 Dec 23 06:21 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11904 0.3 0.0 39752 14676 ? S 06:21 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11985 0.0 0.0 21474974760 14936 ? R 06:21 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfga5nU0p build 11992 0.0 0.0 4336 732 ? S 06:21 0:00 /bin/sh -c ps xua | grep osmo build 11994 0.0 0.0 11128 1028 ? S 06:21 0:00 grep osmo ERRORS: 3 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-python-test] Error 3 make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:743: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:24:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:24:00 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7675?= In-Reply-To: <1142659744.198.1545545969443.JavaMail.jenkins@jenkins.osmocom.org> References: <1142659744.198.1545545969443.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <164546690.205.1545546240489.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 299.32 KB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32527 1.0 0.0 39608 14548 ? S 06:23 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32568 0.0 0.0 21474958492 11356 ? S 06:23 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgHO6UEy build 32575 0.0 0.0 4336 800 ? S 06:23 0:00 /bin/sh -c ps xua | grep osmo build 32577 0.0 0.0 11128 1008 ? S 06:23 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgHO6UEy, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgHO6UEy' > ls -l /proc/32527/fd total 0 lr-x------ 1 build build 64 Dec 23 06:23 0 -> pipe:[2170429439] l-wx------ 1 build build 64 Dec 23 06:23 1 -> pipe:[2170429440] lr-x------ 1 build build 64 Dec 23 06:23 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:23 2 -> pipe:[2170443777] l-wx------ 1 build build 64 Dec 23 06:23 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32527 0.7 0.0 39608 14548 ? S 06:23 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32578 0.0 0.0 21474958492 11624 ? S 06:23 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgHO6UEy build 32585 0.0 0.0 4336 748 ? S 06:23 0:00 /bin/sh -c ps xua | grep osmo build 32587 0.0 0.0 11128 992 ? S 06:23 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/32527/fd total 0 lr-x------ 1 build build 64 Dec 23 06:23 0 -> pipe:[2170429439] l-wx------ 1 build build 64 Dec 23 06:23 1 -> pipe:[2170429440] lr-x------ 1 build build 64 Dec 23 06:23 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:23 2 -> pipe:[2170443777] l-wx------ 1 build build 64 Dec 23 06:23 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32527 0.6 0.0 39608 14548 ? S 06:23 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32588 0.0 0.0 21474966128 13164 ? D 06:23 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 32595 0.0 0.0 4336 816 ? S 06:23 0:00 /bin/sh -c ps xua | grep osmo build 32597 0.0 0.0 11128 944 ? S 06:23 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgzYtQah, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgzYtQah' > ls -l /proc/32527/fd total 0 lr-x------ 1 build build 64 Dec 23 06:23 0 -> pipe:[2170429439] l-wx------ 1 build build 64 Dec 23 06:23 1 -> pipe:[2170429440] lr-x------ 1 build build 64 Dec 23 06:23 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:23 2 -> pipe:[2170443777] l-wx------ 1 build build 64 Dec 23 06:23 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32527 0.7 0.0 39764 14600 ? S 06:23 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32598 0.0 0.0 21474966124 12336 ? R 06:23 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgzYtQah build 32605 0.0 0.0 4336 764 ? S 06:23 0:00 /bin/sh -c ps xua | grep osmo build 32607 0.0 0.0 11128 952 ? S 06:23 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgzYtQah, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgzYtQah' > ls -l /proc/32527/fd total 0 lr-x------ 1 build build 64 Dec 23 06:23 0 -> pipe:[2170429439] l-wx------ 1 build build 64 Dec 23 06:23 1 -> pipe:[2170429440] lr-x------ 1 build build 64 Dec 23 06:23 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:23 2 -> pipe:[2170443777] l-wx------ 1 build build 64 Dec 23 06:23 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32527 0.5 0.0 39764 14600 ? S 06:23 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32608 0.0 0.0 21474966124 11448 ? R 06:23 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgzYtQah build 32615 0.0 0.0 4336 768 ? S 06:23 0:00 /bin/sh -c ps xua | grep osmo build 32617 0.0 0.0 11128 960 ? S 06:23 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/32527/fd total 0 lr-x------ 1 build build 64 Dec 23 06:23 0 -> pipe:[2170429439] l-wx------ 1 build build 64 Dec 23 06:23 1 -> pipe:[2170429440] lr-x------ 1 build build 64 Dec 23 06:23 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:23 2 -> pipe:[2170443777] l-wx------ 1 build build 64 Dec 23 06:23 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32527 0.5 0.0 39764 14600 ? S 06:23 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32618 0.0 0.0 21474956232 10756 ? S 06:23 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 32625 0.0 0.0 4336 716 ? S 06:23 0:00 /bin/sh -c ps xua | grep osmo build 32627 0.0 0.0 11128 972 ? S 06:23 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgFeL2We, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgFeL2We' > ls -l /proc/32527/fd total 0 lr-x------ 1 build build 64 Dec 23 06:23 0 -> pipe:[2170429439] l-wx------ 1 build build 64 Dec 23 06:23 1 -> pipe:[2170429440] lr-x------ 1 build build 64 Dec 23 06:23 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:23 2 -> pipe:[2170443777] l-wx------ 1 build build 64 Dec 23 06:23 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32527 0.5 0.0 39764 14600 ? S 06:23 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32628 0.0 0.0 21474956232 10848 ? S 06:23 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgFeL2We build 32635 0.0 0.0 4336 760 ? S 06:23 0:00 /bin/sh -c ps xua | grep osmo build 32637 0.0 0.0 11128 1020 ? S 06:23 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgFeL2We, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgFeL2We' > ls -l /proc/32527/fd total 0 lr-x------ 1 build build 64 Dec 23 06:23 0 -> pipe:[2170429439] l-wx------ 1 build build 64 Dec 23 06:23 1 -> pipe:[2170429440] lr-x------ 1 build build 64 Dec 23 06:23 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:23 2 -> pipe:[2170443777] l-wx------ 1 build build 64 Dec 23 06:23 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32527 0.5 0.0 39764 14600 ? S 06:23 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32638 0.0 0.0 21474956232 10972 ? S 06:23 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgFeL2We build 32645 0.0 0.0 4336 764 ? S 06:23 0:00 /bin/sh -c ps xua | grep osmo build 32647 0.0 0.0 11128 1032 ? S 06:23 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory '/build/tests' Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory '/build' Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:24:43 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:24:43 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7675?= In-Reply-To: <1626123418.201.1545546045529.JavaMail.jenkins@jenkins.osmocom.org> References: <1626123418.201.1545546045529.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <955547559.206.1545546283424.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.13 MB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7495 0.8 0.0 39608 14584 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7536 0.0 0.0 21474958492 11448 ? S 06:24 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg0hBEbT build 7543 0.0 0.0 4336 760 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 7545 0.0 0.0 11128 1040 ? S 06:24 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg0hBEbT, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfg0hBEbT' > ls -l /proc/7495/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[1900375371] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[1900375372] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[1900375373] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7495 0.8 0.0 39608 14584 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7546 0.0 0.0 21474958492 11444 ? S 06:24 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg0hBEbT build 7553 0.0 0.0 4336 728 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 7555 0.0 0.0 11128 1044 ? S 06:24 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/7495/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[1900375371] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[1900375372] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[1900375373] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7495 0.7 0.0 39608 14584 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7556 0.0 0.0 21474978552 12940 ? R 06:24 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 7563 0.0 0.0 4336 808 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 7565 0.0 0.0 11128 932 ? S 06:24 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgVKBgB5, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgVKBgB5' > ls -l /proc/7495/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[1900375371] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[1900375372] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[1900375373] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7495 0.7 0.0 39764 14776 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7566 0.0 0.0 21474978552 13124 ? R 06:24 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgVKBgB5 build 7573 0.0 0.0 4336 808 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 7575 0.0 0.0 11128 1040 ? S 06:24 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgVKBgB5, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgVKBgB5' > ls -l /proc/7495/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[1900375371] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[1900375372] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[1900375373] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7495 0.7 0.0 39764 14776 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7576 0.0 0.0 21474978552 13092 ? R 06:24 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgVKBgB5 build 7583 0.0 0.0 4336 768 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 7585 0.0 0.0 11128 984 ? S 06:24 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/7495/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[1900375371] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[1900375372] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[1900375373] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7495 0.6 0.0 39764 14776 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7586 0.0 0.0 21474962696 10956 ? S 06:24 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 7593 0.0 0.0 4336 760 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 7595 0.0 0.0 11128 1036 ? S 06:24 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgK_8GO4, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgK_8GO4' > ls -l /proc/7495/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[1900375371] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[1900375372] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[1900375373] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7495 0.6 0.0 39764 14776 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7596 0.0 0.0 21474962700 10988 ? D 06:24 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgK_8GO4 build 7603 0.0 0.0 4336 760 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 7605 0.0 0.0 11128 956 ? S 06:24 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgK_8GO4, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgK_8GO4' > ls -l /proc/7495/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[1900375371] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[1900375372] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[1900375373] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7495 0.6 0.0 39764 14776 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7606 0.0 0.0 21474962700 11136 ? D 06:24 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgK_8GO4 build 7613 0.0 0.0 4336 812 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 7615 0.0 0.0 11128 960 ? S 06:24 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:25:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:25:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7658?= In-Reply-To: <1611615108.199.1545546021390.JavaMail.jenkins@jenkins.osmocom.org> References: <1611615108.199.1545546021390.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <664863725.207.1545546307012.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 839.02 KB...] Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg9_lV1T, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfg9_lV1T' > ls -l /proc/9715/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[2170430079] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[2170430080] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[2170430081] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9715 0.7 0.0 39752 14644 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9736 0.0 0.0 21474968780 13628 ? R 06:24 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg9_lV1T build 9743 0.0 0.0 4336 772 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 9745 0.0 0.0 11128 964 ? S 06:24 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/9715/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[2170430079] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[2170430080] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[2170430081] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9715 0.5 0.0 39752 14644 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9746 0.0 0.0 21474968780 12540 ? R 06:24 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 9753 0.0 0.0 4336 732 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 9755 0.0 0.0 11128 1040 ? S 06:24 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgVo5gf4, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgVo5gf4' > ls -l /proc/9715/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[2170430079] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[2170430080] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[2170430081] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9715 0.4 0.0 39752 14660 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9756 0.0 0.0 21474968780 13076 ? R 06:24 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgVo5gf4 build 9763 0.0 0.0 4336 816 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 9765 0.0 0.0 11128 952 ? S 06:24 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgVo5gf4, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgVo5gf4' > ls -l /proc/9715/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[2170430079] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[2170430080] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[2170430081] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9715 0.4 0.0 39752 14660 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9766 0.0 0.0 21474968780 13928 ? R 06:24 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgVo5gf4 build 9773 0.0 0.0 4336 760 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 9775 0.0 0.0 11128 1032 ? S 06:24 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/9715/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[2170430079] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[2170430080] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[2170430081] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9715 0.3 0.0 39752 14660 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9776 0.0 0.0 21474968780 13484 ? R 06:24 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 9783 0.0 0.0 4336 772 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 9785 0.0 0.0 11128 996 ? S 06:24 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgQLr9Uo, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgQLr9Uo' > ls -l /proc/9715/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[2170430079] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[2170430080] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[2170430081] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9715 0.3 0.0 39752 14660 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9786 0.0 0.0 21474968780 13096 ? R 06:24 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgQLr9Uo build 9793 0.0 0.0 4336 760 ? S 06:24 0:00 /bin/sh -c ps xua | grep osmo build 9795 0.0 0.0 11128 1044 ? S 06:24 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgQLr9Uo, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgQLr9Uo' > ls -l /proc/9715/fd total 0 lr-x------ 1 build build 64 Dec 23 06:24 0 -> pipe:[2170430079] l-wx------ 1 build build 64 Dec 23 06:24 1 -> pipe:[2170430080] lr-x------ 1 build build 64 Dec 23 06:24 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:24 2 -> pipe:[2170430081] l-wx------ 1 build build 64 Dec 23 06:24 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9715 0.2 0.0 39752 14660 ? S 06:24 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9796 0.0 0.0 21474973720 14524 ? R 06:25 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgQLr9Uo build 9803 0.0 0.0 4336 712 ? S 06:25 0:00 /bin/sh -c ps xua | grep osmo build 9805 0.0 0.0 11128 984 ? S 06:25 0:00 grep osmo ERRORS: 3 Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-python-test] Error 3 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 make[4]: *** [check-local] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:25:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:25:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7658?= In-Reply-To: <179477366.204.1545546099284.JavaMail.jenkins@jenkins.osmocom.org> References: <179477366.204.1545546099284.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1555797625.209.1545546335552.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.18 MB...] build 11968 0.0 0.0 21474979696 16016 ? R 06:25 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg8J2q5B build 11975 0.0 0.0 4336 732 ? S 06:25 0:00 /bin/sh -c ps xua | grep osmo build 11977 0.0 0.0 11128 1028 ? S 06:25 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg8J2q5B, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfg8J2q5B' > ls -l /proc/11957/fd total 0 lr-x------ 1 build build 64 Dec 23 06:25 0 -> pipe:[238318401] l-wx------ 1 build build 64 Dec 23 06:25 1 -> pipe:[238318402] lr-x------ 1 build build 64 Dec 23 06:25 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:25 2 -> pipe:[238318403] l-wx------ 1 build build 64 Dec 23 06:25 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11957 0.8 0.0 39752 14660 ? S 06:25 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11978 0.0 0.0 21474974760 14936 ? R 06:25 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg8J2q5B build 11985 0.0 0.0 4336 732 ? S 06:25 0:00 /bin/sh -c ps xua | grep osmo build 11987 0.0 0.0 11128 1028 ? S 06:25 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/11957/fd total 0 lr-x------ 1 build build 64 Dec 23 06:25 0 -> pipe:[238318401] l-wx------ 1 build build 64 Dec 23 06:25 1 -> pipe:[238318402] lr-x------ 1 build build 64 Dec 23 06:25 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:25 2 -> pipe:[238318403] l-wx------ 1 build build 64 Dec 23 06:25 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11957 0.6 0.0 39752 14660 ? S 06:25 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11988 0.0 0.0 21474979696 16076 ? R 06:25 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 11995 0.0 0.0 4336 732 ? S 06:25 0:00 /bin/sh -c ps xua | grep osmo build 11997 0.0 0.0 11128 1028 ? S 06:25 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgrMepWr, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgrMepWr' > ls -l /proc/11957/fd total 0 lr-x------ 1 build build 64 Dec 23 06:25 0 -> pipe:[238318401] l-wx------ 1 build build 64 Dec 23 06:25 1 -> pipe:[238318402] lr-x------ 1 build build 64 Dec 23 06:25 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:25 2 -> pipe:[238318403] l-wx------ 1 build build 64 Dec 23 06:25 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11957 0.5 0.0 39752 14676 ? S 06:25 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11998 0.0 0.0 21474974756 13912 ? R 06:25 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgrMepWr build 12005 0.0 0.0 4336 732 ? S 06:25 0:00 /bin/sh -c ps xua | grep osmo build 12007 0.0 0.0 11128 1028 ? S 06:25 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgrMepWr, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfgrMepWr' > ls -l /proc/11957/fd total 0 lr-x------ 1 build build 64 Dec 23 06:25 0 -> pipe:[238318401] l-wx------ 1 build build 64 Dec 23 06:25 1 -> pipe:[238318402] lr-x------ 1 build build 64 Dec 23 06:25 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:25 2 -> pipe:[238318403] l-wx------ 1 build build 64 Dec 23 06:25 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11957 0.4 0.0 39752 14676 ? S 06:25 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12008 0.0 0.0 21474979732 15496 ? R 06:25 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfgrMepWr build 12015 0.0 0.0 4336 732 ? S 06:25 0:00 /bin/sh -c ps xua | grep osmo build 12017 0.0 0.0 11128 1028 ? S 06:25 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/11957/fd total 0 lr-x------ 1 build build 64 Dec 23 06:25 0 -> pipe:[238318401] l-wx------ 1 build build 64 Dec 23 06:25 1 -> pipe:[238318402] lr-x------ 1 build build 64 Dec 23 06:25 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:25 2 -> pipe:[238318403] l-wx------ 1 build build 64 Dec 23 06:25 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11957 0.3 0.0 39752 14676 ? S 06:25 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12018 0.0 0.0 21474979696 16472 ? D 06:25 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 12025 0.0 0.0 4336 732 ? S 06:25 0:00 /bin/sh -c ps xua | grep osmo build 12027 0.0 0.0 3032 260 ? R 06:25 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgUJdPdS, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgUJdPdS' > ls -l /proc/11957/fd total 0 lr-x------ 1 build build 64 Dec 23 06:25 0 -> pipe:[238318401] l-wx------ 1 build build 64 Dec 23 06:25 1 -> pipe:[238318402] lr-x------ 1 build build 64 Dec 23 06:25 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:25 2 -> pipe:[238318403] l-wx------ 1 build build 64 Dec 23 06:25 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11957 0.3 0.0 39752 14676 ? S 06:25 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12028 0.0 0.0 21474974756 14540 ? R 06:25 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgUJdPdS build 12035 0.0 0.0 4336 732 ? S 06:25 0:00 /bin/sh -c ps xua | grep osmo build 12037 0.0 0.0 11128 1028 ? S 06:25 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgUJdPdS, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgUJdPdS' > ls -l /proc/11957/fd total 0 lr-x------ 1 build build 64 Dec 23 06:25 0 -> pipe:[238318401] l-wx------ 1 build build 64 Dec 23 06:25 1 -> pipe:[238318402] lr-x------ 1 build build 64 Dec 23 06:25 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:25 2 -> pipe:[238318403] l-wx------ 1 build build 64 Dec 23 06:25 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11957 0.3 0.0 39752 14676 ? S 06:25 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 12038 0.0 0.0 21474974756 13752 ? R 06:25 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgUJdPdS build 12045 0.0 0.0 4336 732 ? S 06:25 0:00 /bin/sh -c ps xua | grep osmo build 12047 0.0 0.0 11128 1028 ? S 06:25 0:00 grep osmo ERRORS: 3 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' make[7]: *** [vty-python-test] Error 3 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 make[5]: *** [python-tests] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:30:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:30:30 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-bsc_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#4611?= In-Reply-To: <437780665.200.1545546040436.JavaMail.jenkins@jenkins.osmocom.org> References: <437780665.200.1545546040436.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1192383369.210.1545546630331.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 892.08 KB...] > ls -l /proc/1447/fd total 0 lr-x------ 1 build build 64 Dec 23 06:29 0 -> pipe:[1900618106] l-wx------ 1 build build 64 Dec 23 06:29 1 -> pipe:[1900618107] lr-x------ 1 build build 64 Dec 23 06:29 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:29 2 -> pipe:[1900618108] l-wx------ 1 build build 64 Dec 23 06:29 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1447 0.5 0.0 39456 14232 ? S 06:29 0:00 /usr/bin/python2 /usr/local/bin/osmotestvty.py -p /build -w /build -v build 1468 0.0 0.0 21474965720 15712 ? R 06:30 0:00 ./src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg build 1475 0.0 0.0 4336 760 ? S 06:30 0:00 /bin/sh -c ps xua | grep osmo build 1477 0.0 0.0 11128 1044 ? S 06:30 0:00 grep osmo ok ---------------------------------------------------------------------- Ran 3 tests in 10.547s OK Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Socket: closing 127.0.0.1:4242 (0 sockets open) Terminating took 2.679s osmotestconfig.py -p /build -w /build -v Warning: doc/examples/osmo-bsc/osmo-bsc-minimal.cfg is not being tested Verifying src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg, test verify_doc Opening /dev/null Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/doc/examples/osmo-bsc/osmo-bsc.cfg' > ls -l /proc/1478/fd total 0 lr-x------ 1 build build 64 Dec 23 06:30 0 -> pipe:[1900618106] l-wx------ 1 build build 64 Dec 23 06:30 1 -> pipe:[1900618107] lr-x------ 1 build build 64 Dec 23 06:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:30 2 -> pipe:[1900618108] l-wx------ 1 build build 64 Dec 23 06:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 1478 0.0 0.0 39468 14116 ? S 06:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1479 0.0 0.0 21474965876 20344 ? S 06:30 0:00 src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc.cfg build 1486 0.0 0.0 4336 728 ? S 06:30 0:00 /bin/sh -c ps xua | grep osmo build 1488 0.0 0.0 11128 960 ? S 06:30 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc.cfgcX0g69, test write_config Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/writtenconfig/osmo-bsc.cfgcX0g69' > ls -l /proc/1478/fd total 0 lr-x------ 1 build build 64 Dec 23 06:30 0 -> pipe:[1900618106] l-wx------ 1 build build 64 Dec 23 06:30 1 -> pipe:[1900618107] lr-x------ 1 build build 64 Dec 23 06:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:30 2 -> pipe:[1900618108] l-wx------ 1 build build 64 Dec 23 06:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1478 1.6 0.0 39532 14496 ? S 06:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1489 0.0 0.0 21474965720 16308 ? R 06:30 0:00 src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc.cfgcX0g69 build 1496 0.0 0.0 4336 712 ? S 06:30 0:00 /bin/sh -c ps xua | grep osmo build 1498 0.0 0.0 4336 104 ? R 06:30 0:00 /bin/sh -c ps xua | grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc.cfgcX0g69, test token_vty_command Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/writtenconfig/osmo-bsc.cfgcX0g69' > ls -l /proc/1478/fd total 0 lr-x------ 1 build build 64 Dec 23 06:30 0 -> pipe:[1900618106] l-wx------ 1 build build 64 Dec 23 06:30 1 -> pipe:[1900618107] lr-x------ 1 build build 64 Dec 23 06:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:30 2 -> pipe:[1900618108] l-wx------ 1 build build 64 Dec 23 06:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1478 0.7 0.0 39532 14496 ? S 06:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1499 0.0 0.0 21474965720 15664 ? R 06:30 0:00 src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc.cfgcX0g69 build 1506 0.0 0.0 4336 716 ? S 06:30 0:00 /bin/sh -c ps xua | grep osmo build 1508 0.0 0.0 11128 1040 ? S 06:30 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg' > ls -l /proc/1478/fd total 0 lr-x------ 1 build build 64 Dec 23 06:30 0 -> pipe:[1900618106] l-wx------ 1 build build 64 Dec 23 06:30 1 -> pipe:[1900618107] lr-x------ 1 build build 64 Dec 23 06:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:30 2 -> pipe:[1900618108] l-wx------ 1 build build 64 Dec 23 06:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1478 0.5 0.0 39532 14496 ? S 06:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1509 0.0 0.0 21474965720 16396 ? R 06:30 0:00 src/osmo-bsc/osmo-bsc -c /build/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg build 1516 0.0 0.0 4336 804 ? S 06:30 0:00 /bin/sh -c ps xua | grep osmo build 1518 0.0 0.0 11128 984 ? S 06:30 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc_custom-sccp.cfgScW01E, test write_config Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/writtenconfig/osmo-bsc_custom-sccp.cfgScW01E' > ls -l /proc/1478/fd total 0 lr-x------ 1 build build 64 Dec 23 06:30 0 -> pipe:[1900618106] l-wx------ 1 build build 64 Dec 23 06:30 1 -> pipe:[1900618107] lr-x------ 1 build build 64 Dec 23 06:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:30 2 -> pipe:[1900618108] l-wx------ 1 build build 64 Dec 23 06:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1478 0.4 0.0 39984 14836 ? S 06:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1519 0.0 0.0 21474965720 16600 ? R 06:30 0:00 src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc_custom-sccp.cfgScW01E build 1526 0.0 0.0 4336 680 ? S 06:30 0:00 /bin/sh -c ps xua | grep osmo build 1528 0.0 0.0 11128 928 ? S 06:30 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) Verifying src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc_custom-sccp.cfgScW01E, test token_vty_command Launching: PWD=/build 'src/osmo-bsc/osmo-bsc' '-c' '/build/writtenconfig/osmo-bsc_custom-sccp.cfgScW01E' > ls -l /proc/1478/fd total 0 lr-x------ 1 build build 64 Dec 23 06:30 0 -> pipe:[1900618106] l-wx------ 1 build build 64 Dec 23 06:30 1 -> pipe:[1900618107] lr-x------ 1 build build 64 Dec 23 06:30 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:30 2 -> pipe:[1900618108] l-wx------ 1 build build 64 Dec 23 06:30 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 1478 0.3 0.0 39984 14836 ? S 06:30 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 1529 0.0 0.0 21474965720 16256 ? R 06:30 0:00 src/osmo-bsc/osmo-bsc -c /build/writtenconfig/osmo-bsc_custom-sccp.cfgScW01E build 1536 0.0 0.0 4336 812 ? S 06:30 0:00 /bin/sh -c ps xua | grep osmo build 1538 0.0 0.0 11128 996 ? S 06:30 0:00 grep osmo ERRORS: 2 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4242 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4242 (0 sockets open) make[5]: *** [python-tests] Error 2 Makefile:684: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:703: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:546: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:398: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:435: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:726: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:32:36 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:32:36 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-i?= =?UTF-8?Q?u,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7659?= In-Reply-To: <664863725.207.1545546307012.JavaMail.jenkins@jenkins.osmocom.org> References: <664863725.207.1545546307012.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2013005265.211.1545546756935.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 839.00 KB...] Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg9XkDQB, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfg9XkDQB' > ls -l /proc/9668/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[1900646189] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[1900646190] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[1900646191] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9668 0.7 0.0 39756 14672 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9689 0.0 0.0 21474968780 12896 ? R 06:32 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg9XkDQB build 9696 0.0 0.0 4336 804 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 9698 0.0 0.0 11128 936 ? S 06:32 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/9668/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[1900646189] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[1900646190] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[1900646191] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9668 0.6 0.0 39756 14672 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9699 0.0 0.0 21474968780 13816 ? R 06:32 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 9706 0.0 0.0 4336 768 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 9708 0.0 0.0 11128 1032 ? S 06:32 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfg8h5RLU, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfg8h5RLU' > ls -l /proc/9668/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[1900646189] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[1900646190] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[1900646191] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9668 0.6 0.0 39756 14688 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9709 0.0 0.0 21474968780 13476 ? R 06:32 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfg8h5RLU build 9716 0.0 0.0 4336 732 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 9718 0.0 0.0 11128 1040 ? S 06:32 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfg8h5RLU, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfg8h5RLU' > ls -l /proc/9668/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[1900646189] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[1900646190] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[1900646191] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9668 0.5 0.0 39756 14688 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9719 0.0 0.0 21474968780 13704 ? R 06:32 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfg8h5RLU build 9726 0.0 0.0 4336 812 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 9728 0.0 0.0 11128 1016 ? S 06:32 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/9668/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[1900646189] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[1900646190] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[1900646191] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9668 0.4 0.0 39756 14688 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9729 0.0 0.0 21474968780 13644 ? R 06:32 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 9736 0.0 0.0 4336 768 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 9738 0.0 0.0 11128 1024 ? S 06:32 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgN0bXqe, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgN0bXqe' > ls -l /proc/9668/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[1900646189] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[1900646190] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[1900646191] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9668 0.4 0.0 39756 14692 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9739 0.0 0.0 21474968780 13804 ? R 06:32 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgN0bXqe build 9746 0.0 0.0 4336 812 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 9748 0.0 0.0 11128 996 ? S 06:32 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgN0bXqe, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgN0bXqe' > ls -l /proc/9668/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[1900646189] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[1900646190] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[1900646191] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 9668 0.4 0.0 39756 14692 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 9749 0.0 0.0 21474968780 13824 ? R 06:32 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgN0bXqe build 9756 0.0 0.0 4336 760 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 9758 0.0 0.0 11128 940 ? S 06:32 0:00 grep osmo ERRORS: 3 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) make[7]: *** [vty-python-test] Error 3 Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 2 Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:32:53 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:32:53 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7676?= In-Reply-To: <164546690.205.1545546240489.JavaMail.jenkins@jenkins.osmocom.org> References: <164546690.205.1545546240489.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1878238909.212.1545546773324.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 298.78 KB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4246 *:* LISTEN 0 10 127.0.0.1:4263 *:* > ps xua | grep osmo build 32095 0.2 0.0 39608 14548 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32136 0.0 0.0 21474958492 11340 ? S 06:32 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgVL4_Va build 32143 0.0 0.0 4336 764 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 32145 0.0 0.0 11128 976 ? S 06:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgVL4_Va, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgVL4_Va' > ls -l /proc/32095/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[2170495193] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[2170495194] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[2170495195] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32095 0.2 0.0 39608 14548 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32146 0.0 0.0 21474958492 11620 ? S 06:32 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgVL4_Va build 32153 0.0 0.0 4336 736 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 32155 0.0 0.0 11128 932 ? S 06:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/32095/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[2170495193] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[2170495194] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[2170495195] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32095 0.2 0.0 39608 14548 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32156 0.0 0.0 21475032288 20240 ? R 06:32 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 32163 0.0 0.0 4336 768 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 32165 0.0 0.0 11128 1000 ? S 06:32 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg3Eeicy, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg3Eeicy' > ls -l /proc/32095/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[2170495193] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[2170495194] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[2170495195] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32095 0.2 0.0 39764 14600 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32166 0.0 0.0 21475032288 15816 ? R 06:32 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg3Eeicy build 32173 0.0 0.0 4336 732 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 32175 0.0 0.0 11128 952 ? S 06:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg3Eeicy, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfg3Eeicy' > ls -l /proc/32095/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[2170495193] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[2170495194] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[2170495195] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32095 0.2 0.0 39764 14600 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32176 0.0 0.0 21475032288 21412 ? R 06:32 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfg3Eeicy build 32183 0.0 0.0 4336 760 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 32185 0.0 0.0 11128 944 ? S 06:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/32095/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[2170495193] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[2170495194] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[2170495195] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32095 0.2 0.0 39764 14600 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32186 0.0 0.0 21474956232 10812 ? S 06:32 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 32193 0.0 0.0 4336 812 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 32195 0.0 0.0 11128 988 ? S 06:32 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgKzmmbt, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgKzmmbt' > ls -l /proc/32095/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[2170495193] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[2170495194] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[2170495195] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4253 *:* > ps xua | grep osmo build 32095 0.2 0.0 39764 14600 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32196 0.0 0.0 21474956232 10808 ? S 06:32 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgKzmmbt build 32203 0.0 0.0 4336 808 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 32205 0.0 0.0 11128 1000 ? S 06:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgKzmmbt, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgKzmmbt' > ls -l /proc/32095/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[2170495193] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[2170495194] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[2170495195] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32095 0.1 0.0 39764 14600 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32206 0.0 0.0 21474956232 10848 ? S 06:32 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgKzmmbt build 32213 0.0 0.0 4336 736 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 32215 0.0 0.0 11128 996 ? S 06:32 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make: *** [check] Error 2 Makefile:732: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:32:57 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:32:57 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7676?= In-Reply-To: <955547559.206.1545546283424.JavaMail.jenkins@jenkins.osmocom.org> References: <955547559.206.1545546283424.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <841240889.213.1545546777515.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.13 MB...] > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7196 1.1 0.0 39608 14500 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7237 0.0 0.0 21474958492 11288 ? S 06:32 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfggqUGu3 build 7244 0.0 0.0 4336 732 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 7246 0.0 0.0 11128 1028 ? S 06:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfggqUGu3, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfggqUGu3' > ls -l /proc/7196/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[238835844] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[238835845] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[238835846] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7196 1.0 0.0 39608 14500 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7247 0.0 0.0 21474958492 11400 ? S 06:32 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfggqUGu3 build 7254 0.0 0.0 4336 732 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 7256 0.0 0.0 11128 1028 ? S 06:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/7196/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[238835844] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[238835845] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[238835846] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7196 0.7 0.0 39608 14500 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7257 0.0 0.0 21474978552 13916 ? R 06:32 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 7264 0.0 0.0 4336 732 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 7266 0.0 0.0 11128 1028 ? S 06:32 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgkU53Cx, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgkU53Cx' > ls -l /proc/7196/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[238835844] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[238835845] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[238835846] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7196 0.8 0.0 39764 14652 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7267 0.0 0.0 21474978556 14780 ? D 06:32 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgkU53Cx build 7274 0.0 0.0 4336 732 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 7276 0.0 0.0 11128 1024 ? S 06:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgkU53Cx, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgkU53Cx' > ls -l /proc/7196/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[238835844] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[238835845] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[238835846] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7196 0.7 0.0 39764 14652 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7277 0.0 0.0 21474978556 14676 ? R 06:32 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgkU53Cx build 7284 0.0 0.0 4336 732 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 7286 0.0 0.0 11128 1028 ? R 06:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/7196/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[238835844] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[238835845] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[238835846] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7196 0.6 0.0 39764 14652 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7287 0.0 0.0 21474962696 10756 ? S 06:32 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 7294 0.0 0.0 4336 732 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 7296 0.0 0.0 11128 1028 ? S 06:32 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgCZnUWm, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgCZnUWm' > ls -l /proc/7196/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[238835844] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[238835845] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[238835846] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7196 0.6 0.0 39764 14652 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7297 0.0 0.0 21474962700 10796 ? D 06:32 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgCZnUWm build 7304 0.0 0.0 4336 732 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 7306 0.0 0.0 11128 1028 ? S 06:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgCZnUWm, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgCZnUWm' > ls -l /proc/7196/fd total 0 lr-x------ 1 build build 64 Dec 23 06:32 0 -> pipe:[238835844] l-wx------ 1 build build 64 Dec 23 06:32 1 -> pipe:[238835845] lr-x------ 1 build build 64 Dec 23 06:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:32 2 -> pipe:[238835846] l-wx------ 1 build build 64 Dec 23 06:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7196 0.6 0.0 39764 14652 ? S 06:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7307 0.0 0.0 21474962700 10856 ? D 06:32 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgCZnUWm build 7314 0.0 0.0 4336 732 ? S 06:32 0:00 /bin/sh -c ps xua | grep osmo build 7316 0.0 0.0 11128 1028 ? S 06:32 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 4 Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 06:34:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 06:34:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7659?= In-Reply-To: <1555797625.209.1545546335552.JavaMail.jenkins@jenkins.osmocom.org> References: <1555797625.209.1545546335552.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1972626086.214.1545546856085.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.18 MB...] Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg7ZZjMn, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc.cfg7ZZjMn' > ls -l /proc/11906/fd total 0 lr-x------ 1 build build 64 Dec 23 06:33 0 -> pipe:[2170481445] l-wx------ 1 build build 64 Dec 23 06:33 1 -> pipe:[2170481446] lr-x------ 1 build build 64 Dec 23 06:33 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:33 2 -> pipe:[2170481447] l-wx------ 1 build build 64 Dec 23 06:33 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11906 0.4 0.0 39756 14656 ? S 06:33 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11927 0.0 0.0 21474974756 12520 ? R 06:33 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc.cfg7ZZjMn build 11934 0.0 0.0 4336 728 ? S 06:33 0:00 /bin/sh -c ps xua | grep osmo build 11936 0.0 0.0 11128 1004 ? S 06:33 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg' > ls -l /proc/11906/fd total 0 lr-x------ 1 build build 64 Dec 23 06:33 0 -> pipe:[2170481445] l-wx------ 1 build build 64 Dec 23 06:33 1 -> pipe:[2170481446] lr-x------ 1 build build 64 Dec 23 06:33 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:33 2 -> pipe:[2170481447] l-wx------ 1 build build 64 Dec 23 06:33 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11906 0.4 0.0 39756 14656 ? S 06:33 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11937 0.0 0.0 21474974616 9864 ? R 06:33 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg build 11944 0.0 0.0 4336 736 ? S 06:33 0:00 /bin/sh -c ps xua | grep osmo build 11946 0.0 0.0 11128 988 ? S 06:33 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfguf96b6, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfguf96b6' > ls -l /proc/11906/fd total 0 lr-x------ 1 build build 64 Dec 23 06:33 0 -> pipe:[2170481445] l-wx------ 1 build build 64 Dec 23 06:33 1 -> pipe:[2170481446] lr-x------ 1 build build 64 Dec 23 06:33 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:33 2 -> pipe:[2170481447] l-wx------ 1 build build 64 Dec 23 06:33 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 *:2775 *:* LISTEN 0 10 127.0.0.1:4254 *:* LISTEN 0 10 127.0.0.1:4255 *:* > ps xua | grep osmo build 11906 0.3 0.0 39756 14668 ? S 06:33 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11947 0.0 0.0 21474979696 16536 ? D 06:33 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfguf96b6 build 11954 0.0 0.0 4336 716 ? S 06:33 0:00 /bin/sh -c ps xua | grep osmo build 11956 0.0 0.0 11128 1044 ? S 06:33 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfguf96b6, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_custom-sccp.cfguf96b6' > ls -l /proc/11906/fd total 0 lr-x------ 1 build build 64 Dec 23 06:33 0 -> pipe:[2170481445] l-wx------ 1 build build 64 Dec 23 06:33 1 -> pipe:[2170481446] lr-x------ 1 build build 64 Dec 23 06:33 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:33 2 -> pipe:[2170481447] l-wx------ 1 build build 64 Dec 23 06:33 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11906 0.3 0.0 39756 14668 ? S 06:33 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11957 0.0 0.0 21474979696 16796 ? D 06:33 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_custom-sccp.cfguf96b6 build 11964 0.0 0.0 4336 760 ? S 06:33 0:00 /bin/sh -c ps xua | grep osmo build 11966 0.0 0.0 11128 964 ? S 06:33 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg, test verify_doc Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg' > ls -l /proc/11906/fd total 0 lr-x------ 1 build build 64 Dec 23 06:33 0 -> pipe:[2170481445] l-wx------ 1 build build 64 Dec 23 06:33 1 -> pipe:[2170481446] lr-x------ 1 build build 64 Dec 23 06:33 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:33 2 -> pipe:[2170481447] l-wx------ 1 build build 64 Dec 23 06:33 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11906 0.3 0.0 39756 14668 ? S 06:33 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11967 0.0 0.0 21474974756 13332 ? R 06:34 0:00 src/osmo-msc/osmo-msc -c /build/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg build 11974 0.0 0.0 4336 732 ? S 06:34 0:00 /bin/sh -c ps xua | grep osmo build 11976 0.0 0.0 11128 1004 ? S 06:34 0:00 grep osmo Documentation error (missing docs): Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgMw9_L6, test write_config Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgMw9_L6' > ls -l /proc/11906/fd total 0 lr-x------ 1 build build 64 Dec 23 06:33 0 -> pipe:[2170481445] l-wx------ 1 build build 64 Dec 23 06:33 1 -> pipe:[2170481446] lr-x------ 1 build build 64 Dec 23 06:33 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:33 2 -> pipe:[2170481447] l-wx------ 1 build build 64 Dec 23 06:33 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11906 0.2 0.0 39756 14668 ? S 06:33 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11977 0.0 0.0 21474974756 14168 ? R 06:34 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgMw9_L6 build 11984 0.0 0.0 4336 772 ? S 06:34 0:00 /bin/sh -c ps xua | grep osmo build 11986 0.0 0.0 4336 108 ? R 06:34 0:00 /bin/sh -c ps xua | grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) Verifying src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgMw9_L6, test token_vty_command Launching: PWD=/build 'src/osmo-msc/osmo-msc' '-c' '/build/writtenconfig/osmo-msc_multi-cs7.cfgMw9_L6' > ls -l /proc/11906/fd total 0 lr-x------ 1 build build 64 Dec 23 06:33 0 -> pipe:[2170481445] l-wx------ 1 build build 64 Dec 23 06:33 1 -> pipe:[2170481446] lr-x------ 1 build build 64 Dec 23 06:33 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 06:33 2 -> pipe:[2170481447] l-wx------ 1 build build 64 Dec 23 06:33 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 11906 0.2 0.0 39756 14668 ? S 06:33 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 11987 0.0 0.0 21474974756 14596 ? R 06:34 0:00 src/osmo-msc/osmo-msc -c /build/writtenconfig/osmo-msc_multi-cs7.cfgMw9_L6 build 11994 0.0 0.0 4336 764 ? S 06:34 0:00 /bin/sh -c ps xua | grep osmo build 11996 0.0 0.0 11128 976 ? S 06:34 0:00 grep osmo ERRORS: 3 Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4254 (1 sockets open) Terminating took 2.679s Socket: closing 127.0.0.1:4254 (0 sockets open) make[7]: *** [vty-python-test] Error 3 Makefile:706: recipe for target 'vty-python-test' failed make[7]: Leaving directory '/build/tests' Makefile:723: recipe for target 'vty-test' failed make[6]: Leaving directory '/build/tests' make[6]: *** [vty-test] Error 2 make[5]: *** [python-tests] Error 2 Makefile:698: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:746: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:559: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 make[3]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 Makefile:411: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:452: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:743: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 07:30:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 07:30:42 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_ma?= =?UTF-8?Q?ster,0,osmocom-master-debian9,sysmo,True_#1105?= In-Reply-To: <1754045820.175.1545539484154.JavaMail.jenkins@jenkins.osmocom.org> References: <1754045820.175.1545539484154.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2061689329.217.1545550242323.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 132.04 KB...] CXX csn1.lo CXX gsm_rlcmac.lo CXX gprs_bssgp_pcu.lo ../../../src/gprs_bssgp_pcu.cpp:982:2: warning: #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" [-Wcpp] #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" ^~~~~~~ CXX gprs_rlcmac.lo CXX gprs_rlcmac_sched.lo CXX gprs_rlcmac_meas.lo CXX gprs_rlcmac_ts_alloc.lo CXX gprs_ms.lo CXX gprs_ms_storage.lo CXX gsm_timer.lo CXX pcu_l1_if.lo CC pcu_vty.lo CXX pcu_vty_functions.lo CC mslot_class.lo CXX tbf.lo CXX tbf_ul.lo CXX tbf_dl.lo CXX bts.lo CXX pdch.lo CXX poll_controller.lo CXX encoding.lo CXX sba.lo CXX decoding.lo CXX llc.lo CXX rlc.lo CXX osmobts_sock.lo CC gprs_codel.lo CXX gprs_coding_scheme.lo CXX egprs_rlc_compression.lo CXXLD libgprs.la ar: `u' modifier ignored since `D' is the default (see `U') CXX pcu_main.o CC osmo-bts-sysmo/sysmo_l1_if.o CC osmo-bts-sysmo/sysmo_l1_hw.o CC osmo-bts-sysmo/femtobts.o CXXLD osmo-pcu CC osmo-bts-sysmo/sysmo_l1_fwd.o CXXLD osmo-pcu-remote make[2]: Leaving directory ' Making all in doc make[2]: Entering directory ' Making all in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' Making all in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' Making all in contrib make[2]: Entering directory ' Making all in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in doc make[2]: Entering directory ' Making dvi in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' Making dvi in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in contrib make[2]: Entering directory ' Making dvi in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in doc make[2]: Entering directory ' Making check in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## ---------------------------------- ## ## osmo-pcu 0.5.1.38-5b52 test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' osmotestvty.py -p -w -v test_history (__main__.TestVTY) ... ok test_terminal_length (__main__.TestVTY) ... ok test_unknown_command (__main__.TestVTY) ... ok ---------------------------------------------------------------------- Ran 3 tests in 0.809s OK confpath workdir Running tests for specific VTY commands Launch: src/osmo-pcu -c from Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' osmotestconfig.py -p -w -v Documentation error (missing docs): ERRORS: 1 Verifying src/osmo-pcu -c test verify_doc Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test write_config Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test token_vty_command Launching: PWD= 'src/osmo-pcu' '-c' ' Makefile:1256: recipe for target 'python-tests' failed make[4]: *** [python-tests] Error 1 make[4]: Leaving directory ' Makefile:1263: recipe for target 'check-local' failed make[3]: *** [check-local] Error 2 make[3]: Leaving directory ' Makefile:1097: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:466: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:671: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 07:32:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 07:32:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_ma?= =?UTF-8?Q?ster,0,osmocom-master-debian9,lc15,True_#1105?= In-Reply-To: <411474919.177.1545539787454.JavaMail.jenkins@jenkins.osmocom.org> References: <411474919.177.1545539787454.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <281689747.218.1545550343248.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 148.62 KB...] ^ In file included from ../../../src/gprs_debug.h:25:0, from ../../../src/osmo-bts-litecell15/lc15_l1_if.c:35: ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?handle_ph_data_ind?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :93:54: note: in definition of macro ?LOGPSRCC? logp2(ss, level, caller_file, caller_line, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :95:48: note: in definition of macro ?LOGPSRCC? logp2(ss, level, __FILE__, __LINE__, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?l1if_pdch_req?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:321:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] data_req->hLayer1 = (HANDLE)fl1h->hLayer1; ^ CC osmo-bts-litecell15/lc15_l1_hw.o CC osmo-bts-litecell15/lc15bts.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in doc make[2]: Entering directory ' Making all in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' Making all in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' Making all in contrib make[2]: Entering directory ' Making all in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in doc make[2]: Entering directory ' Making dvi in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' Making dvi in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in contrib make[2]: Entering directory ' Making dvi in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in doc make[2]: Entering directory ' Making check in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## ---------------------------------- ## ## osmo-pcu 0.5.1.38-5b52 test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' osmotestvty.py -p -w -v test_history (__main__.TestVTY) ... ok test_terminal_length (__main__.TestVTY) ... ok test_unknown_command (__main__.TestVTY) ... ok ---------------------------------------------------------------------- Ran 3 tests in 0.809s OK confpath workdir Running tests for specific VTY commands Launch: src/osmo-pcu -c from Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' osmotestconfig.py -p -w -v Documentation error (missing docs): ERRORS: 1 Verifying src/osmo-pcu -c test verify_doc Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test write_config Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test token_vty_command Launching: PWD= 'src/osmo-pcu' '-c' ' Makefile:1256: recipe for target 'python-tests' failed make[4]: *** [python-tests] Error 1 make[4]: Leaving directory ' Makefile:1263: recipe for target 'check-local' failed make[3]: *** [check-local] Error 2 make[3]: Leaving directory ' Makefile:1097: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:466: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:671: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 07:34:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 07:34:04 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_origin/nr?= =?UTF-8?Q?w/litecell15,0,osmocom-master-debian9,lc15,True_#1105?= In-Reply-To: <2073228724.183.1545539975995.JavaMail.jenkins@jenkins.osmocom.org> References: <2073228724.183.1545539975995.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <893390463.219.1545550444257.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 152.66 KB...] ^ In file included from ../../../src/gprs_debug.h:25:0, from ../../../src/osmo-bts-litecell15/lc15_l1_if.c:35: ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?handle_ph_data_ind?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :93:54: note: in definition of macro ?LOGPSRCC? logp2(ss, level, caller_file, caller_line, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :95:48: note: in definition of macro ?LOGPSRCC? logp2(ss, level, __FILE__, __LINE__, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?l1if_pdch_req?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:321:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] data_req->hLayer1 = (HANDLE)fl1h->hLayer1; ^ CC osmo-bts-litecell15/lc15_l1_hw.o CC osmo-bts-litecell15/lc15bts.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in doc make[2]: Entering directory ' Making all in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' Making all in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' Making all in contrib make[2]: Entering directory ' Making all in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in doc make[2]: Entering directory ' Making dvi in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' Making dvi in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in contrib make[2]: Entering directory ' Making dvi in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in doc make[2]: Entering directory ' Making check in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## ---------------------------------- ## ## osmo-pcu 0.5.1.38-5b52 test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' osmotestvty.py -p -w -v test_history (__main__.TestVTY) ... ok test_terminal_length (__main__.TestVTY) ... ok test_unknown_command (__main__.TestVTY) ... ok ---------------------------------------------------------------------- Ran 3 tests in 0.809s OK confpath workdir Running tests for specific VTY commands Launch: src/osmo-pcu -c from Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' osmotestconfig.py -p -w -v Documentation error (missing docs): ERRORS: 1 Verifying src/osmo-pcu -c test verify_doc Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test write_config Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test token_vty_command Launching: PWD= 'src/osmo-pcu' '-c' ' Makefile:1256: recipe for target 'python-tests' failed make[4]: *** [python-tests] Error 1 make[4]: Leaving directory ' Makefile:1263: recipe for target 'check-local' failed make[3]: *** [check-local] Error 2 make[3]: Leaving directory ' Makefile:1097: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:466: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:671: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 07:35:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 07:35:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_v20?= =?UTF-8?Q?17.01,0,osmocom-master-debian9,lc15,True_#1105?= In-Reply-To: <1224067308.189.1545540151690.JavaMail.jenkins@jenkins.osmocom.org> References: <1224067308.189.1545540151690.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1688715053.220.1545550547466.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 149.16 KB...] ^ In file included from ../../../src/gprs_debug.h:25:0, from ../../../src/osmo-bts-litecell15/lc15_l1_if.c:35: ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?handle_ph_data_ind?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :93:54: note: in definition of macro ?LOGPSRCC? logp2(ss, level, caller_file, caller_line, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:16: warning: format ?%x? expects argument of type ?unsigned int?, but argument 8 has type ?HANDLE {aka void *}? [-Wformat=] DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^ :95:48: note: in definition of macro ?LOGPSRCC? logp2(ss, level, __FILE__, __LINE__, cont, fmt, ##args); \ ^~~ :47:2: note: in expansion of macro ?LOGPSRC? LOGPSRC(ss, level, NULL, 0, fmt, ## args) ^~~~~~~ :27:34: note: in expansion of macro ?LOGP? #define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) ^~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c:191:2: note: in expansion of macro ?DEBUGP? DEBUGP(DL1IF, "Rx PH-DATA.ind %s (hL2 %08x): %s\n", ^~~~~~ ../../../src/osmo-bts-litecell15/lc15_l1_if.c: In function ?l1if_pdch_req?: ../../../src/osmo-bts-litecell15/lc15_l1_if.c:321:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] data_req->hLayer1 = (HANDLE)fl1h->hLayer1; ^ CC osmo-bts-litecell15/lc15_l1_hw.o CC osmo-bts-litecell15/lc15bts.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in doc make[2]: Entering directory ' Making all in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' Making all in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' Making all in contrib make[2]: Entering directory ' Making all in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in doc make[2]: Entering directory ' Making dvi in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' Making dvi in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in contrib make[2]: Entering directory ' Making dvi in systemd make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'dvi-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in doc make[2]: Entering directory ' Making check in examples make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in manuals make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## ---------------------------------- ## ## osmo-pcu 0.5.1.38-5b52 test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' osmotestvty.py -p -w -v test_history (__main__.TestVTY) ... ok test_terminal_length (__main__.TestVTY) ... ok test_unknown_command (__main__.TestVTY) ... ok ---------------------------------------------------------------------- Ran 3 tests in 0.811s OK confpath workdir Running tests for specific VTY commands Launch: src/osmo-pcu -c from Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' Launch: src/osmo-pcu -c from Launching: PWD= 'src/osmo-pcu' '-c' ' osmotestconfig.py -p -w -v Documentation error (missing docs): ERRORS: 1 Verifying src/osmo-pcu -c test verify_doc Opening /dev/null Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test write_config Launching: PWD= 'src/osmo-pcu' '-c' ' Verifying src/osmo-pcu -c test token_vty_command Launching: PWD= 'src/osmo-pcu' '-c' ' Makefile:1256: recipe for target 'python-tests' failed make[4]: *** [python-tests] Error 1 make[4]: Leaving directory ' Makefile:1263: recipe for target 'check-local' failed make[3]: *** [check-local] Error 2 make[3]: Leaving directory ' Makefile:1097: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:466: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:671: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 07:37:41 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 07:37:41 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7677?= In-Reply-To: <1878238909.212.1545546773324.JavaMail.jenkins@jenkins.osmocom.org> References: <1878238909.212.1545546773324.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2039774380.221.1545550661620.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 297.42 KB...] State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32123 0.8 0.0 39612 14496 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32164 0.0 0.0 21474958492 11428 ? S 07:37 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg9BEOwg build 32171 0.0 0.0 4336 808 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 32173 0.0 0.0 11128 976 ? S 07:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg9BEOwg, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfg9BEOwg' > ls -l /proc/32123/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[2170675556] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[2170675557] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[2170675558] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32123 0.7 0.0 39612 14496 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32174 0.0 0.0 21474958492 11436 ? S 07:37 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg9BEOwg build 32181 0.0 0.0 4336 716 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 32183 0.0 0.0 11128 996 ? S 07:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/32123/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[2170675556] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[2170675557] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[2170675558] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32123 0.6 0.0 39612 14496 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32184 0.0 0.0 21474966128 12948 ? D 07:37 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 32191 0.0 0.0 4336 768 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 32193 0.0 0.0 11128 1008 ? S 07:37 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgEINUyV, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgEINUyV' > ls -l /proc/32123/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[2170675556] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[2170675557] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[2170675558] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32123 0.6 0.0 39764 14544 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32194 0.0 0.0 21475032288 15768 ? R 07:37 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgEINUyV build 32201 0.0 0.0 4336 764 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 32203 0.0 0.0 11128 944 ? S 07:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgEINUyV, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgEINUyV' > ls -l /proc/32123/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[2170675556] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[2170675557] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[2170675558] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32123 0.6 0.0 39764 14544 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32204 0.0 0.0 21474966124 10784 ? R 07:37 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgEINUyV build 32211 0.0 0.0 4336 764 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 32213 0.0 0.0 11128 1044 ? S 07:37 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/32123/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[2170675556] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[2170675557] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[2170675558] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32123 0.5 0.0 39764 14544 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32214 0.0 0.0 21474956232 10840 ? S 07:37 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 32221 0.0 0.0 4336 768 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 32223 0.0 0.0 11128 992 ? S 07:37 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgRa1w14, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgRa1w14' > ls -l /proc/32123/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[2170675556] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[2170675557] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[2170675558] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32123 0.5 0.0 39764 14544 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32224 0.0 0.0 21474956232 10808 ? S 07:37 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgRa1w14 build 32231 0.0 0.0 4336 804 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 32233 0.0 0.0 11128 1000 ? S 07:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgRa1w14, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgRa1w14' > ls -l /proc/32123/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[2170675556] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[2170675557] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[2170675558] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32123 0.5 0.0 39764 14544 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32234 0.0 0.0 21474956232 10936 ? S 07:37 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgRa1w14 build 32241 0.0 0.0 4336 768 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 32243 0.0 0.0 11128 1032 ? S 07:37 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 4 Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:732: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 07:38:08 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 07:38:08 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7677?= In-Reply-To: <841240889.213.1545546777515.JavaMail.jenkins@jenkins.osmocom.org> References: <841240889.213.1545546777515.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <297634067.222.1545550689002.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.13 MB...] > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7237 1.1 0.0 39608 14500 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7278 0.0 0.0 21474958492 11288 ? S 07:37 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg_0nUpt build 7285 0.0 0.0 4336 732 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 7287 0.0 0.0 11032 528 ? R 07:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg_0nUpt, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfg_0nUpt' > ls -l /proc/7237/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[239924663] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[239924664] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[239924665] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7237 1.1 0.0 39608 14500 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7288 0.0 0.0 21474958492 11400 ? S 07:37 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfg_0nUpt build 7295 0.0 0.0 4336 732 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 7297 0.0 0.0 11128 1028 ? S 07:37 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/7237/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[239924663] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[239924664] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[239924665] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7237 0.8 0.0 39608 14500 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7298 0.0 0.0 21474978556 14780 ? D 07:37 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 7305 0.0 0.0 4336 732 ? S 07:37 0:00 /bin/sh -c ps xua | grep osmo build 7307 0.0 0.0 11128 1028 ? S 07:37 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgHAEmOj, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgHAEmOj' > ls -l /proc/7237/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[239924663] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[239924664] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[239924665] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7237 0.8 0.0 39764 14652 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7308 0.0 0.0 21475044716 21644 ? R 07:38 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgHAEmOj build 7315 0.0 0.0 4336 732 ? S 07:38 0:00 /bin/sh -c ps xua | grep osmo build 7317 0.0 0.0 11128 1028 ? S 07:38 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgHAEmOj, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgHAEmOj' > ls -l /proc/7237/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[239924663] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[239924664] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[239924665] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7237 0.7 0.0 39764 14652 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7318 0.0 0.0 21474978556 14924 ? D 07:38 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgHAEmOj build 7325 0.0 0.0 4336 732 ? S 07:38 0:00 /bin/sh -c ps xua | grep osmo build 7327 0.0 0.0 11128 1028 ? S 07:38 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/7237/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[239924663] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[239924664] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[239924665] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7237 0.6 0.0 39764 14652 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7328 0.0 0.0 21474962696 10756 ? S 07:38 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 7335 0.0 0.0 4336 732 ? S 07:38 0:00 /bin/sh -c ps xua | grep osmo build 7337 0.0 0.0 11128 1028 ? S 07:38 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgAutZDA, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgAutZDA' > ls -l /proc/7237/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[239924663] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[239924664] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[239924665] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7237 0.6 0.0 39764 14652 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7338 0.0 0.0 21474962700 10796 ? D 07:38 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgAutZDA build 7345 0.0 0.0 4336 732 ? S 07:38 0:00 /bin/sh -c ps xua | grep osmo build 7347 0.0 0.0 11128 1028 ? S 07:38 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgAutZDA, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgAutZDA' > ls -l /proc/7237/fd total 0 lr-x------ 1 build build 64 Dec 23 07:37 0 -> pipe:[239924663] l-wx------ 1 build build 64 Dec 23 07:37 1 -> pipe:[239924664] lr-x------ 1 build build 64 Dec 23 07:37 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:37 2 -> pipe:[239924665] l-wx------ 1 build build 64 Dec 23 07:37 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7237 0.6 0.0 39764 14652 ? S 07:37 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7348 0.0 0.0 21474962700 10856 ? R 07:38 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgAutZDA build 7355 0.0 0.0 4336 732 ? S 07:38 0:00 /bin/sh -c ps xua | grep osmo build 7357 0.0 0.0 11128 1028 ? S 07:38 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[1]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make: *** [check] Error 2 Makefile:732: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 07:40:41 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 07:40:41 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7678?= In-Reply-To: <2039774380.221.1545550661620.JavaMail.jenkins@jenkins.osmocom.org> References: <2039774380.221.1545550661620.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <277038170.223.1545550842005.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 298.66 KB...] State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32097 0.8 0.0 39612 14604 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32138 0.0 0.0 21474958492 11388 ? S 07:40 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgTp9EYt build 32145 0.0 0.0 4336 772 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 32147 0.0 0.0 11128 960 ? S 07:40 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgTp9EYt, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgTp9EYt' > ls -l /proc/32097/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[2170723163] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[2170723164] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[2170723165] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32097 0.7 0.0 39612 14604 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32148 0.0 0.0 21474958492 11648 ? S 07:40 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgTp9EYt build 32155 0.0 0.0 4336 800 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 32157 0.0 0.0 11128 952 ? S 07:40 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/32097/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[2170723163] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[2170723164] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[2170723165] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32097 0.6 0.0 39612 14604 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32158 0.0 0.0 21474966128 13224 ? D 07:40 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 32165 0.0 0.0 4336 768 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 32167 0.0 0.0 11128 956 ? S 07:40 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgnkcfJ4, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgnkcfJ4' > ls -l /proc/32097/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[2170723163] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[2170723164] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[2170723165] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32097 0.6 0.0 39764 14652 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32168 0.0 0.0 21474966128 12976 ? D 07:40 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgnkcfJ4 build 32175 0.0 0.0 4336 760 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 32177 0.0 0.0 11128 1028 ? S 07:40 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgnkcfJ4, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgnkcfJ4' > ls -l /proc/32097/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[2170723163] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[2170723164] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[2170723165] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32097 0.5 0.0 39764 14652 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32178 0.0 0.0 21474966128 12912 ? R 07:40 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgnkcfJ4 build 32185 0.0 0.0 4336 820 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 32187 0.0 0.0 11128 976 ? S 07:40 0:00 grep osmo Connecting socket failed, retrying... Socket: in 2 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/32097/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[2170723163] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[2170723164] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[2170723165] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32097 0.5 0.0 39764 14652 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32188 0.0 0.0 21474956232 10784 ? S 07:40 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 32195 0.0 0.0 4336 736 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 32197 0.0 0.0 11128 948 ? S 07:40 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgwwiKgn, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgwwiKgn' > ls -l /proc/32097/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[2170723163] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[2170723164] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[2170723165] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32097 0.5 0.0 39764 14652 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32198 0.0 0.0 21474956236 10836 ? D 07:40 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgwwiKgn build 32205 0.0 0.0 4336 724 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 32207 0.0 0.0 11128 996 ? S 07:40 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgwwiKgn, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgwwiKgn' > ls -l /proc/32097/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[2170723163] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[2170723164] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[2170723165] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 32097 0.4 0.0 39764 14652 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 32208 0.0 0.0 21474956236 10916 ? D 07:40 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgwwiKgn build 32215 0.0 0.0 4336 756 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 32217 0.0 0.0 4336 104 ? R 07:40 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) ERRORS: 4 make[5]: *** [python-tests] Error 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:699: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 07:41:11 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 07:41:11 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7678?= In-Reply-To: <297634067.222.1545550689002.JavaMail.jenkins@jenkins.osmocom.org> References: <297634067.222.1545550689002.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <364492156.224.1545550871983.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.13 MB...] > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4263 *:* LISTEN 0 10 127.0.0.1:4246 *:* > ps xua | grep osmo build 7223 1.1 0.0 39608 14500 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7264 0.0 0.0 21474958492 11288 ? S 07:40 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgPWlGnM build 7271 0.0 0.0 4336 732 ? S 07:40 0:00 /bin/sh -c ps xua | grep osmo build 7273 0.0 0.0 11128 1028 ? S 07:40 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgPWlGnM, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gbproxy' '-c' '/build/writtenconfig/osmo-gbproxy-legacy.cfgPWlGnM' > ls -l /proc/7223/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[240045763] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[240045764] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[240045765] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7223 1.0 0.0 39608 14500 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7274 0.0 0.0 21474958492 11400 ? S 07:41 0:00 src/gprs/osmo-gbproxy -c /build/writtenconfig/osmo-gbproxy-legacy.cfgPWlGnM build 7281 0.0 0.0 4336 732 ? S 07:41 0:00 /bin/sh -c ps xua | grep osmo build 7283 0.0 0.0 11128 1028 ? S 07:41 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4246 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4246 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/doc/examples/osmo-sgsn/osmo-sgsn.cfg' > ls -l /proc/7223/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[240045763] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[240045764] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[240045765] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7223 0.7 0.0 39608 14500 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7284 0.0 0.0 21474978552 13916 ? R 07:41 0:00 src/gprs/osmo-sgsn -c /build/doc/examples/osmo-sgsn/osmo-sgsn.cfg build 7291 0.0 0.0 4336 732 ? S 07:41 0:00 /bin/sh -c ps xua | grep osmo build 7293 0.0 0.0 11128 1028 ? S 07:41 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgmrfm9b, test write_config Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgmrfm9b' > ls -l /proc/7223/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[240045763] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[240045764] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[240045765] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7223 0.9 0.0 39764 14652 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7294 0.0 0.0 21474978556 14780 ? D 07:41 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgmrfm9b build 7301 0.0 0.0 4336 732 ? S 07:41 0:00 /bin/sh -c ps xua | grep osmo build 7303 0.0 0.0 11128 1028 ? S 07:41 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgmrfm9b, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-sgsn' '-c' '/build/writtenconfig/osmo-sgsn.cfgmrfm9b' > ls -l /proc/7223/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[240045763] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[240045764] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[240045765] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7223 0.7 0.0 39764 14652 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7304 0.0 0.0 21475044716 18352 ? R 07:41 0:00 src/gprs/osmo-sgsn -c /build/writtenconfig/osmo-sgsn.cfgmrfm9b build 7311 0.0 0.0 4336 732 ? S 07:41 0:00 /bin/sh -c ps xua | grep osmo build 7313 0.0 0.0 11128 1028 ? S 07:41 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4245 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4245 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg, test verify_doc Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg' > ls -l /proc/7223/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[240045763] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[240045764] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[240045765] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7223 0.6 0.0 39764 14652 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7314 0.0 0.0 21474962696 10756 ? S 07:41 0:00 src/gprs/osmo-gtphub -c /build/doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg build 7321 0.0 0.0 4336 732 ? S 07:41 0:00 /bin/sh -c ps xua | grep osmo build 7323 0.0 0.0 11128 1028 ? S 07:41 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgsIVzke, test write_config Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgsIVzke' > ls -l /proc/7223/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[240045763] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[240045764] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[240045765] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7223 0.6 0.0 39764 14652 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7324 0.0 0.0 21474962700 10796 ? D 07:41 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgsIVzke build 7331 0.0 0.0 4336 732 ? S 07:41 0:00 /bin/sh -c ps xua | grep osmo build 7333 0.0 0.0 11128 1028 ? S 07:41 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) Verifying src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgsIVzke, test token_vty_command Launching: PWD=/build 'src/gprs/osmo-gtphub' '-c' '/build/writtenconfig/osmo-gtphub-1iface.cfgsIVzke' > ls -l /proc/7223/fd total 0 lr-x------ 1 build build 64 Dec 23 07:40 0 -> pipe:[240045763] l-wx------ 1 build build 64 Dec 23 07:40 1 -> pipe:[240045764] lr-x------ 1 build build 64 Dec 23 07:40 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 07:40 2 -> pipe:[240045765] l-wx------ 1 build build 64 Dec 23 07:40 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port > ps xua | grep osmo build 7223 0.6 0.0 39764 14652 ? S 07:40 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 7334 0.0 0.0 21474962700 10856 ? D 07:41 0:00 src/gprs/osmo-gtphub -c /build/writtenconfig/osmo-gtphub-1iface.cfgsIVzke build 7341 0.0 0.0 4336 732 ? S 07:41 0:00 /bin/sh -c ps xua | grep osmo build 7343 0.0 0.0 11128 1028 ? S 07:41 0:00 grep osmo ERRORS: 4 Socket: in 1 tries, connected to 127.0.0.1:4253 (1 sockets open) Terminating took 0.897s Socket: closing 127.0.0.1:4253 (0 sockets open) make[5]: *** [python-tests] Error 4 Makefile:690: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' Makefile:699: recipe for target 'check-local' failed make[4]: *** [check-local] Error 2 make[4]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 Makefile:552: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' Makefile:404: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [check-recursive] Error 1 make[1]: *** [check-recursive] Error 1 Makefile:441: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' Makefile:732: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Dec 23 08:32:17 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 08:32:17 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mas?= =?UTF-8?Q?ter-osmo-mgw_=C2=BB_a1=3Ddefault,a2=3D?= =?UTF-8?Q?default,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#1981?= In-Reply-To: <1100041291.178.1545539807523.JavaMail.jenkins@jenkins.osmocom.org> References: <1100041291.178.1545539807523.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1560242872.225.1545553937438.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 215.12 KB...] make check-local make[4]: Entering directory '/build/tests' :;{ \ echo '# Signature of the current package.' && \ echo 'm4_define([AT_PACKAGE_NAME],' && \ echo ' [osmo-mgw])' && \ echo 'm4_define([AT_PACKAGE_TARNAME],' && \ echo ' [osmo-mgw])' && \ echo 'm4_define([AT_PACKAGE_VERSION],' && \ echo ' [1.4.0.88-0a403])' && \ echo 'm4_define([AT_PACKAGE_STRING],' && \ echo ' [osmo-mgw 1.4.0.88-0a403])' && \ echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ echo ' [openbsc at lists.osmocom.org])'; \ echo 'm4_define([AT_PACKAGE_URL],' && \ echo ' [])'; \ } >'./package.m4' /bin/bash ../missing --run autom4te --language=autotest -I '.' -o testsuite.tmp testsuite.at mv testsuite.tmp testsuite /bin/bash './testsuite' ## ----------------------------------- ## ## osmo-mgw 1.4.0.88-0a403 test suite. ## ## ----------------------------------- ## Regression tests. 1: mgcp_client ok 2: mgcp ok ## ------------- ## ## Test results. ## ## ------------- ## All 2 tests were successful. make python-tests make[5]: Entering directory '/build/tests' osmotestvty.py -p /build -w /build -v test_history (__main__.TestVTY) ... confpath /build, workdir /build Running tests for specific VTY commands Launch: ./src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg from /build Opening /dev/null Launching: PWD=/build './src/osmo-mgw/osmo-mgw' '-c' '/build/doc/examples/osmo-mgw/osmo-mgw.cfg' > ls -l /proc/22501/fd total 0 lr-x------ 1 build build 64 Dec 23 08:32 0 -> pipe:[240769166] l-wx------ 1 build build 64 Dec 23 08:32 1 -> pipe:[240769167] lr-x------ 1 build build 64 Dec 23 08:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 08:32 2 -> pipe:[240769168] l-wx------ 1 build build 64 Dec 23 08:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 22501 0.0 0.0 39460 14088 ? S 08:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestvty.py -p /build -w /build -v build 22502 0.0 0.0 41336 4604 ? S 08:32 0:00 ./src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg build 22509 0.0 0.0 4336 728 ? S 08:32 0:00 /bin/sh -c ps xua | grep osmo build 22511 0.0 0.0 11128 1028 ? S 08:32 0:00 grep osmo ok test_terminal_length (__main__.TestVTY) ... Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Launch: ./src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg from /build Launching: PWD=/build './src/osmo-mgw/osmo-mgw' '-c' '/build/doc/examples/osmo-mgw/osmo-mgw.cfg' > ls -l /proc/22501/fd total 0 lr-x------ 1 build build 64 Dec 23 08:32 0 -> pipe:[240769166] l-wx------ 1 build build 64 Dec 23 08:32 1 -> pipe:[240769167] lr-x------ 1 build build 64 Dec 23 08:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 08:32 2 -> pipe:[240769168] l-wx------ 1 build build 64 Dec 23 08:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 22501 0.0 0.0 39460 14156 ? S 08:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestvty.py -p /build -w /build -v build 22512 0.0 0.0 41336 4604 ? S 08:32 0:00 ./src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg build 22519 0.0 0.0 4336 728 ? S 08:32 0:00 /bin/sh -c ps xua | grep osmo build 22521 0.0 0.0 11128 1028 ? S 08:32 0:00 grep osmo ok test_unknown_command (__main__.TestVTY) ... Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Launch: ./src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg from /build Launching: PWD=/build './src/osmo-mgw/osmo-mgw' '-c' '/build/doc/examples/osmo-mgw/osmo-mgw.cfg' > ls -l /proc/22501/fd total 0 lr-x------ 1 build build 64 Dec 23 08:32 0 -> pipe:[240769166] l-wx------ 1 build build 64 Dec 23 08:32 1 -> pipe:[240769167] lr-x------ 1 build build 64 Dec 23 08:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 08:32 2 -> pipe:[240769168] l-wx------ 1 build build 64 Dec 23 08:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 22501 0.0 0.0 39460 14156 ? S 08:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestvty.py -p /build -w /build -v build 22522 0.0 0.0 41336 4604 ? S 08:32 0:00 ./src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg build 22529 0.0 0.0 4336 728 ? S 08:32 0:00 /bin/sh -c ps xua | grep osmo build 22531 0.0 0.0 11128 1028 ? S 08:32 0:00 grep osmo ok ---------------------------------------------------------------------- Ran 3 tests in 0.560s OK Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) osmotestconfig.py -p /build -w /build -v Verifying src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg, test verify_doc Opening /dev/null Launching: PWD=/build 'src/osmo-mgw/osmo-mgw' '-c' '/build/doc/examples/osmo-mgw/osmo-mgw.cfg' > ls -l /proc/22532/fd total 0 lr-x------ 1 build build 64 Dec 23 08:32 0 -> pipe:[240769166] l-wx------ 1 build build 64 Dec 23 08:32 1 -> pipe:[240769167] lr-x------ 1 build build 64 Dec 23 08:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 08:32 2 -> pipe:[240769168] l-wx------ 1 build build 64 Dec 23 08:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 22532 0.0 0.0 39464 14116 ? S 08:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 22533 0.0 0.0 41336 4604 ? S 08:32 0:00 src/osmo-mgw/osmo-mgw -c /build/doc/examples/osmo-mgw/osmo-mgw.cfg build 22540 0.0 0.0 4336 728 ? S 08:32 0:00 /bin/sh -c ps xua | grep osmo build 22542 0.0 0.0 11128 1028 ? S 08:32 0:00 grep osmo Documentation error (missing docs): Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Verifying src/osmo-mgw/osmo-mgw -c /build/writtenconfig/osmo-mgw.cfgb03NXe, test write_config Launching: PWD=/build 'src/osmo-mgw/osmo-mgw' '-c' '/build/writtenconfig/osmo-mgw.cfgb03NXe' > ls -l /proc/22532/fd total 0 lr-x------ 1 build build 64 Dec 23 08:32 0 -> pipe:[240769166] l-wx------ 1 build build 64 Dec 23 08:32 1 -> pipe:[240769167] lr-x------ 1 build build 64 Dec 23 08:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 08:32 2 -> pipe:[240769168] l-wx------ 1 build build 64 Dec 23 08:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 22532 0.0 0.0 39608 14496 ? S 08:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 22543 0.0 0.0 41336 4604 ? S 08:32 0:00 src/osmo-mgw/osmo-mgw -c /build/writtenconfig/osmo-mgw.cfgb03NXe build 22550 0.0 0.0 4336 728 ? S 08:32 0:00 /bin/sh -c ps xua | grep osmo build 22552 0.0 0.0 11128 1028 ? S 08:32 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Verifying src/osmo-mgw/osmo-mgw -c /build/writtenconfig/osmo-mgw.cfgb03NXe, test token_vty_command Launching: PWD=/build 'src/osmo-mgw/osmo-mgw' '-c' '/build/writtenconfig/osmo-mgw.cfgb03NXe' > ls -l /proc/22532/fd total 0 lr-x------ 1 build build 64 Dec 23 08:32 0 -> pipe:[240769166] l-wx------ 1 build build 64 Dec 23 08:32 1 -> pipe:[240769167] lr-x------ 1 build build 64 Dec 23 08:32 11 -> /dev/urandom l-wx------ 1 build build 64 Dec 23 08:32 2 -> pipe:[240769168] l-wx------ 1 build build 64 Dec 23 08:32 3 -> /dev/null > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4243 *:* > ps xua | grep osmo build 22532 6.0 0.0 39608 14496 ? S 08:32 0:00 /usr/bin/python2 /usr/local/bin/osmotestconfig.py -p /build -w /build -v build 22553 0.0 0.0 41336 4600 ? S 08:32 0:00 src/osmo-mgw/osmo-mgw -c /build/writtenconfig/osmo-mgw.cfgb03NXe build 22560 0.0 0.0 4336 728 ? S 08:32 0:00 /bin/sh -c ps xua | grep osmo build 22562 0.0 0.0 4336 100 ? R 08:32 0:00 /bin/sh -c ps xua | grep osmo ERRORS: 1 Socket: in 1 tries, connected to 127.0.0.1:4243 (1 sockets open) Socket: closing 127.0.0.1:4243 (0 sockets open) Makefile:671: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/tests' make[5]: *** [python-tests] Error 1 make[4]: *** [check-local] Error 2 Makefile:677: recipe for target 'check-local' failed make[4]: Leaving directory '/build/tests' Makefile:533: recipe for target 'check-am' failed make[3]: Leaving directory '/build/tests' make[3]: *** [check-am] Error 2 make[2]: *** [check-recursive] Error 1 Makefile:385: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:489: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [check-recursive] Error 1 make: *** [check] Error 2 Makefile:780: recipe for target 'check' failed + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:28:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:28:08 +0000 Subject: Change in libosmocore[master]: Fix VTY documentation error introduced in "bind" VTY port change Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12426 Change subject: Fix VTY documentation error introduced in "bind" VTY port change ...................................................................... Fix VTY documentation error introduced in "bind" VTY port change In 99ae401e490e60fc07bef7eacc478be7bdcc9f5a we introduced the ability to specify the TCP port to which the VTY should bind. However, the VTY dcumentation wasn't extended accordingly, causing virtually all master build jobs to fail. Change-Id: I54fb0ca0d3a884a64a349b22de70f3d9bd1a6d54 --- M src/vty/vty.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/12426/1 diff --git a/src/vty/vty.c b/src/vty/vty.c index 7f6c225..abce887 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -1616,7 +1616,8 @@ /* vty bind */ DEFUN(vty_bind, vty_bind_cmd, "bind A.B.C.D [<0-65535>]", "Accept VTY telnet connections on local interface\n" - "Local interface IP address (default: " VTY_BIND_ADDR_DEFAULT ")\n") + "Local interface IP address (default: " VTY_BIND_ADDR_DEFAULT ")\n" + "Local TCP port number\n") { talloc_free((void*)vty_bind_addr); vty_bind_addr = talloc_strdup(tall_vty_ctx, argv[0]); -- To view, visit https://gerrit.osmocom.org/12426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I54fb0ca0d3a884a64a349b22de70f3d9bd1a6d54 Gerrit-Change-Number: 12426 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:46:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:46:13 +0000 Subject: Change in libosmocore[master]: Fix VTY documentation error introduced in "bind" VTY port change In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12426 ) Change subject: Fix VTY documentation error introduced in "bind" VTY port change ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I54fb0ca0d3a884a64a349b22de70f3d9bd1a6d54 Gerrit-Change-Number: 12426 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 23 Dec 2018 09:46:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:46:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:46:18 +0000 Subject: Change in libosmocore[master]: Fix VTY documentation error introduced in "bind" VTY port change In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12426 ) Change subject: Fix VTY documentation error introduced in "bind" VTY port change ...................................................................... Fix VTY documentation error introduced in "bind" VTY port change In 99ae401e490e60fc07bef7eacc478be7bdcc9f5a we introduced the ability to specify the TCP port to which the VTY should bind. However, the VTY dcumentation wasn't extended accordingly, causing virtually all master build jobs to fail. Change-Id: I54fb0ca0d3a884a64a349b22de70f3d9bd1a6d54 --- M src/vty/vty.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/vty/vty.c b/src/vty/vty.c index 7f6c225..abce887 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -1616,7 +1616,8 @@ /* vty bind */ DEFUN(vty_bind, vty_bind_cmd, "bind A.B.C.D [<0-65535>]", "Accept VTY telnet connections on local interface\n" - "Local interface IP address (default: " VTY_BIND_ADDR_DEFAULT ")\n") + "Local interface IP address (default: " VTY_BIND_ADDR_DEFAULT ")\n" + "Local TCP port number\n") { talloc_free((void*)vty_bind_addr); vty_bind_addr = talloc_strdup(tall_vty_ctx, argv[0]); -- To view, visit https://gerrit.osmocom.org/12426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I54fb0ca0d3a884a64a349b22de70f3d9bd1a6d54 Gerrit-Change-Number: 12426 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:50:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:50:17 +0000 Subject: Change in osmo-bsc[master]: make sure early lchan act failure resets the lchan In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12388 ) Change subject: make sure early lchan act failure resets the lchan ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ide665b10fa3f4583059c55346db8da833959e3cc Gerrit-Change-Number: 12388 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 23 Dec 2018 09:50:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:50:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:50:46 +0000 Subject: Change in gr-gsm[master]: trx/txtime_setter: print error if reference fn is missing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12395 ) Change subject: trx/txtime_setter: print error if reference fn is missing ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2a6e3f41b6fe79b92d85ff98bc2cd9afd9bdc568 Gerrit-Change-Number: 12395 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Sun, 23 Dec 2018 09:50:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:51:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:51:00 +0000 Subject: Change in gr-gsm[master]: trx/txtime_setter: reduce code nesting in process_txtime_of_burst() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12394 ) Change subject: trx/txtime_setter: reduce code nesting in process_txtime_of_burst() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c334e16d6b28a5e32cd62a177ad56bfc8e748ee Gerrit-Change-Number: 12394 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 23 Dec 2018 09:51:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:51:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:51:40 +0000 Subject: Change in osmo-msc[master]: MNCC: use log wrapper for call processing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12329 ) Change subject: MNCC: use log wrapper for call processing ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sun, 23 Dec 2018 09:51:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:51:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:51:53 +0000 Subject: Change in osmo-msc[master]: MNCC: use log wrapper for call processing In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12329 ) Change subject: MNCC: use log wrapper for call processing ...................................................................... MNCC: use log wrapper for call processing Add log/debug wrappers to conveniently print local and remote call references. Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 --- M src/libmsc/mncc_builtin.c 1 file changed, 12 insertions(+), 13 deletions(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c index 135a5e4..fbdc5b4 100644 --- a/src/libmsc/mncc_builtin.c +++ b/src/libmsc/mncc_builtin.c @@ -35,6 +35,8 @@ #include #include +#define DEBUGCC(l, r, fmt, args...) DEBUGP(DMNCC, "(call %x, remote %x) " fmt, l->callref, r->callref, ##args) + void *tall_call_ctx; static LLIST_HEAD(call_list); @@ -105,8 +107,7 @@ llist_add_tail(&remote->entry, &call_list); remote->net = call->net; remote->callref = new_callref++; - DEBUGP(DMNCC, "(call %x) Creating new remote instance %x.\n", - call->callref, remote->callref); + DEBUGCC(call, remote, "Creating new remote instance.\n"); /* link remote call */ call->remote_ref = remote->callref; @@ -115,20 +116,20 @@ /* send call proceeding */ memset(&mncc, 0, sizeof(struct gsm_mncc)); mncc.callref = call->callref; - DEBUGP(DMNCC, "(call %x) Accepting call.\n", call->callref); + DEBUGCC(call, remote, "Accepting call.\n"); mncc_tx_to_cc(call->net, MNCC_CALL_PROC_REQ, &mncc); /* modify mode */ memset(&mncc, 0, sizeof(struct gsm_mncc)); mncc.callref = call->callref; - DEBUGP(DMNCC, "(call %x) Modify channel mode\n", call->callref); + DEBUGCC(call, remote, "Modify channel mode.\n"); mncc_tx_to_cc(call->net, MNCC_LCHAN_MODIFY, &mncc); /* send setup to remote */ // setup->fields |= MNCC_F_SIGNAL; // setup->signal = GSM48_SIGNAL_DIALTONE; setup->callref = remote->callref; - DEBUGP(DMNCC, "(call %x) Forwarding SETUP to remote.\n", call->callref); + DEBUGCC(call, remote, "Forwarding SETUP to remote.\n"); return mncc_tx_to_cc(remote->net, MNCC_SETUP_REQ, setup); out_reject: @@ -146,7 +147,7 @@ if (!(remote = get_call_ref(call->remote_ref))) return 0; alert->callref = remote->callref; - DEBUGP(DMNCC, "(call %x) Forwarding ALERT to remote.\n", call->callref); + DEBUGCC(call, remote, "Forwarding ALERT to remote.\n"); return mncc_tx_to_cc(remote->net, MNCC_ALERT_REQ, alert); } @@ -159,7 +160,7 @@ if (!(remote = get_call_ref(call->remote_ref))) return 0; notify->callref = remote->callref; - DEBUGP(DMNCC, "(call %x) Forwarding NOTIF to remote.\n", call->callref); + DEBUGCC(call, remote, "Forwarding NOTIF to remote.\n"); return mncc_tx_to_cc(remote->net, MNCC_NOTIFY_REQ, notify); } @@ -180,13 +181,13 @@ if (!(remote = get_call_ref(call->remote_ref))) return 0; connect->callref = remote->callref; - DEBUGP(DMNCC, "(call %x) Sending CONNECT to remote.\n", call->callref); + DEBUGCC(call, remote, "Sending CONNECT to remote.\n"); mncc_tx_to_cc(remote->net, MNCC_SETUP_RSP, connect); /* bridge tch */ bridge.callref[0] = call->callref; bridge.callref[1] = call->remote_ref; - DEBUGP(DMNCC, "(call %x) Bridging with remote.\n", call->callref); + DEBUGCC(call, remote, "Bridging with remote.\n"); return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge); } @@ -206,8 +207,7 @@ return 0; } disc->callref = remote->callref; - DEBUGP(DMNCC, "(call %x) Disconnecting remote with cause %d\n", - remote->callref, disc->cause.value); + DEBUGCC(call, remote, "Disconnecting remote with cause %d\n", disc->cause.value); return mncc_tx_to_cc(remote->net, MNCC_DISC_REQ, disc); } @@ -222,8 +222,7 @@ } rel->callref = remote->callref; - DEBUGP(DMNCC, "(call %x) Releasing remote with cause %d\n", - call->callref, rel->cause.value); + DEBUGCC(call, remote, "Releasing remote with cause %d\n", rel->cause.value); /* * Release this side of the call right now. Otherwise we end up -- To view, visit https://gerrit.osmocom.org/12329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916 Gerrit-Change-Number: 12329 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:53:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:53:02 +0000 Subject: Change in osmo-msc[master]: Log MI type on request failure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12365 ) Change subject: Log MI type on request failure ...................................................................... Patch Set 2: Code-Review+1 what exactly do we gaint from this? The format/encoding of IMSI/IMEI/TMSI makes it rather clear which of the three it is? -- To view, visit https://gerrit.osmocom.org/12365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I842a7471ea19a2c13ca1134c56991c0ed63cfb29 Gerrit-Change-Number: 12365 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Sun, 23 Dec 2018 09:53:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 23 09:54:18 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 09:54:18 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-osmo-sip-connector_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,a4=3Dde?= =?UTF-8?Q?fault,osmocom-master-debian9_#1001?= In-Reply-To: <1617871652.172.1545539375188.JavaMail.jenkins@jenkins.osmocom.org> References: <1617871652.172.1545539375188.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1268008415.226.1545558858418.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:54:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:54:43 +0000 Subject: Change in osmo-msc[master]: release RTP stream only for matching CC transaction In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12397 ) Change subject: release RTP stream only for matching CC transaction ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1f8746e7babfcd3028a4d2c0ba260c608c686c76 Gerrit-Change-Number: 12397 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 23 Dec 2018 09:54:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 23 09:55:13 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 09:55:13 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu_?= =?UTF-8?Q?=C2=BB_master,0,osmocom-master-debian9,sysmo,True_#1106?= In-Reply-To: <2061689329.217.1545550242323.JavaMail.jenkins@jenkins.osmocom.org> References: <2061689329.217.1545550242323.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <775879697.227.1545558913520.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:55:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:55:13 +0000 Subject: Change in osmo-msc[master]: cosmetics in msc_mgcp_call_release() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12396 ) Change subject: cosmetics in msc_mgcp_call_release() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99717b3b72a9d7cbc95455ea25b2018ec1755308 Gerrit-Change-Number: 12396 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 23 Dec 2018 09:55:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:57:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:57:35 +0000 Subject: Change in osmo-msc[master]: remove code dup: add msc_mgcp_try_call_assignment() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12398 ) Change subject: remove code dup: add msc_mgcp_try_call_assignment() ...................................................................... Patch Set 2: Code-Review+1 misc note: the existing naming is also already flawed. It's not a "call assignment" but a "channel assignment" or an "assingment of dedicated traffic channel" or the like. -- To view, visit https://gerrit.osmocom.org/12398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11c0b7dc3f1a747028629b48e522bb3b864884ba Gerrit-Change-Number: 12398 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 23 Dec 2018 09:57:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 09:59:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 09:59:11 +0000 Subject: Change in osmo-msc[master]: move trans->assignment_done to cc.assignment_started In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12399 ) Change subject: move trans->assignment_done to cc.assignment_started ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8dacf46141ba0b664e85b0867ade330c97d8495f Gerrit-Change-Number: 12399 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 23 Dec 2018 09:59:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 23 09:59:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 09:59:22 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu?= =?UTF-8?Q?_=C2=BB_master,0,osmocom-master-debian9,lc15,True_#1106?= In-Reply-To: <281689747.218.1545550343248.JavaMail.jenkins@jenkins.osmocom.org> References: <281689747.218.1545550343248.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2134664849.228.1545559162653.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Dec 23 09:59:39 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 09:59:39 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-mgw_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#1982?= In-Reply-To: <1560242872.225.1545553937438.JavaMail.jenkins@jenkins.osmocom.org> References: <1560242872.225.1545553937438.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1787712281.229.1545559179741.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:00:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:00:24 +0000 Subject: Change in osmo-msc[master]: fix: incoming call during ongoing call In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12400 ) Change subject: fix: incoming call during ongoing call ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12400/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12400/3//COMMIT_MSG at 26 PS3, Line 26: : I currently haven't tested yet what happens if there is *three* peers trying to : talk to the same number, running out of lab phones (not really, just not : bothering now) those kind of scenarios are what we have TTCN-3 tests for. No need to bother with cumbersome manual testing, but rather investing time once and get automatic regression testing for the eternity. -- To view, visit https://gerrit.osmocom.org/12400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0ba216b737909e92080a722db26e3577726c63cb Gerrit-Change-Number: 12400 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 23 Dec 2018 10:00:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 23 10:01:38 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 10:01:38 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norm?= =?UTF-8?Q?al_:_master-osmo-sgsn_=C2=BB_--disa?= =?UTF-8?Q?ble-iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7679?= In-Reply-To: <277038170.223.1545550842005.JavaMail.jenkins@jenkins.osmocom.org> References: <277038170.223.1545550842005.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2055715624.230.1545559298862.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Dec 23 10:01:44 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 10:01:44 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu_=C2=BB_origi?= =?UTF-8?Q?n/nrw/litecell15,0,osmocom-master-debian9,lc15,True_#1106?= In-Reply-To: <893390463.219.1545550444257.JavaMail.jenkins@jenkins.osmocom.org> References: <893390463.219.1545550444257.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <500091932.231.1545559304017.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Dec 23 10:02:26 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 10:02:26 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--ena?= =?UTF-8?Q?ble-iu,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7679?= In-Reply-To: <364492156.224.1545550871983.JavaMail.jenkins@jenkins.osmocom.org> References: <364492156.224.1545550871983.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <517223144.232.1545559346023.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:04:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:04:39 +0000 Subject: Change in osmo-msc[master]: enrich context for vlr_subscr_name and ran_conn fi name In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12402 ) Change subject: enrich context for vlr_subscr_name and ran_conn fi name ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/#/c/12402/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12402/1//COMMIT_MSG at 15 PS1, Line 15: 0x08bde4ec TMSIs are typically (in the telecom world) represented as uppercase hex digits. I know in Osmocom we're not aligning well with that, but we could start... https://gerrit.osmocom.org/#/c/12402/1//COMMIT_MSG at 29 PS1, Line 29: We usually write the conn_id in decimal ack https://gerrit.osmocom.org/#/c/12402/1//COMMIT_MSG at 30 PS1, Line 30: Leading zeros are clutter well, the only reson to use them would be to align log output of multiple lines at the same column, which of course only works if you don't pront file name / line numbers. So I'd say there are arguments either way. https://gerrit.osmocom.org/#/c/12402/1//COMMIT_MSG at 31 PS1, Line 31: Don't mix - and _ separators I would argue that the existing behavior is a feature. GERAN_A is the label/name/class/type of connection and the "-" is seprating it from the connection id -- To view, visit https://gerrit.osmocom.org/12402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834 Gerrit-Change-Number: 12402 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 23 Dec 2018 10:04:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 23 10:05:08 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 10:05:08 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--enab?= =?UTF-8?Q?le-iu,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7660?= In-Reply-To: <1972626086.214.1545546856085.JavaMail.jenkins@jenkins.osmocom.org> References: <1972626086.214.1545546856085.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1842623597.233.1545559508901.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:05:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:05:27 +0000 Subject: Change in osmo-msc[master]: tweak fsm_msc_mgcp FSM and FI name In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12403 ) Change subject: tweak fsm_msc_mgcp FSM and FI name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie5fc1ffb7eba0209fee4666a075655cd24d27473 Gerrit-Change-Number: 12403 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 23 Dec 2018 10:05:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 23 10:05:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 10:05:47 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--disa?= =?UTF-8?Q?ble-iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7660?= In-Reply-To: <2013005265.211.1545546756935.JavaMail.jenkins@jenkins.osmocom.org> References: <2013005265.211.1545546756935.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1040973697.234.1545559547504.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:05:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:05:48 +0000 Subject: Change in osmo-msc[master]: err log: fully log MS supported A5 algos on mismatch In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12404 ) Change subject: err log: fully log MS supported A5 algos on mismatch ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb18e0f0bb420de066e7eb8fc683f192ba2a7368 Gerrit-Change-Number: 12404 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 23 Dec 2018 10:05:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:06:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:06:03 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: tweak logging in verbose mode In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12405 ) Change subject: msc_vlr_tests: tweak logging in verbose mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia06245f3adc6cf4c483d9c12c387cd5169582353 Gerrit-Change-Number: 12405 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 23 Dec 2018 10:06:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:07:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:07:52 +0000 Subject: Change in osmo-msc[master]: abort assignment on Assignment Failure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12368 ) Change subject: abort assignment on Assignment Failure ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/12368/7/src/libmsc/msc_mgcp.c File src/libmsc/msc_mgcp.c: https://gerrit.osmocom.org/#/c/12368/7/src/libmsc/msc_mgcp.c at 1097 PS7, Line 1097: int msc_mgcp_ass_fail(struct ran_conn *conn) the functions before and after this new function all have nice documentation about what they do. I would argue at least a one line dsescription of when/how it is used and the return values should be documented. -- To view, visit https://gerrit.osmocom.org/12368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I358cfbaf0f44f25148e8b9bafcb9257b1952b35a Gerrit-Change-Number: 12368 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 23 Dec 2018 10:07:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:08:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:08:53 +0000 Subject: Change in libosmocore[master]: define LOGPFSM fmt only once, in LOGPFSMLSRC In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12383 ) Change subject: define LOGPFSM fmt only once, in LOGPFSMLSRC ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f23c57ebfdb5355919c06ac5ded7732e3b17a97 Gerrit-Change-Number: 12383 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 23 Dec 2018 10:08:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:08:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:08:55 +0000 Subject: Change in libosmocore[master]: define LOGPFSM fmt only once, in LOGPFSMLSRC In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12383 ) Change subject: define LOGPFSM fmt only once, in LOGPFSMLSRC ...................................................................... define LOGPFSM fmt only once, in LOGPFSMLSRC Instead of duplicating the fmt and args in LOGPFSML and LOGPFSMLSRC, rather make LOGPFSML invoke LOGPFSMLSRC with __FILE__ and __LINE__. This is a cosmetic preparation for more tweaks coming up. Change-Id: I2f23c57ebfdb5355919c06ac5ded7732e3b17a97 --- M include/osmocom/core/fsm.h 1 file changed, 4 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 54bbad5..ee71451 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -120,13 +120,7 @@ void osmo_fsm_log_addr(bool log_addr); #define LOGPFSML(fi, level, fmt, args...) \ - LOGP((fi)->fsm->log_subsys, OSMO_MAX(level, (fi)->log_level), \ - "%s{%s}: " fmt, \ - osmo_fsm_inst_name(fi), \ - osmo_fsm_state_name((fi)->fsm, (fi)->state), ## args) - -#define LOGPFSM(fi, fmt, args...) \ - LOGPFSML(fi, (fi)->log_level, fmt, ## args) + LOGPFSMLSRC(fi, level, __FILE__, __LINE__, fmt, ## args) #define LOGPFSMLSRC(fi, level, caller_file, caller_line, fmt, args...) \ LOGPSRC((fi)->fsm->log_subsys, level, \ @@ -136,6 +130,9 @@ osmo_fsm_state_name((fi)->fsm, (fi)->state), \ ## args) +#define LOGPFSM(fi, fmt, args...) \ + LOGPFSML(fi, (fi)->log_level, fmt, ## args) + #define LOGPFSMSRC(fi, caller_file, caller_line, fmt, args...) \ LOGPFSMLSRC(fi, (fi)->log_level, \ caller_file, caller_line, \ -- To view, visit https://gerrit.osmocom.org/12383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2f23c57ebfdb5355919c06ac5ded7732e3b17a97 Gerrit-Change-Number: 12383 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 23 10:09:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 10:09:42 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-bsc_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#4612?= In-Reply-To: <1192383369.210.1545546630331.JavaMail.jenkins@jenkins.osmocom.org> References: <1192383369.210.1545546630331.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1819160248.235.1545559782299.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Dec 23 10:10:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 10:10:04 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu_?= =?UTF-8?Q?=C2=BB_v2017.01,0,osmocom-master-debian9,lc15,True_#1106?= In-Reply-To: <1688715053.220.1545550547466.JavaMail.jenkins@jenkins.osmocom.org> References: <1688715053.220.1545550547466.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1350683668.236.1545559804867.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:10:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:10:14 +0000 Subject: Change in libosmocore[master]: add API doc for LOGPFSM* macros In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12384 ) Change subject: add API doc for LOGPFSM* macros ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12384/1/include/osmocom/core/fsm.h File include/osmocom/core/fsm.h: https://gerrit.osmocom.org/#/c/12384/1/include/osmocom/core/fsm.h at 123 PS1, Line 123: osmo_fsm_inst > I'm personally no fan of \ref or \a or such things in API doc. [?] I still think as long as we use asciidoc, we should use it properly ;) -- To view, visit https://gerrit.osmocom.org/12384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bf6500889aa58195f50a726dec0876c0c2baec3 Gerrit-Change-Number: 12384 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 23 Dec 2018 10:10:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:10:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:10:37 +0000 Subject: Change in libosmocore[master]: LOGPFSM*: guard against fi == NULL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12385 ) Change subject: LOGPFSM*: guard against fi == NULL ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9eaf8b7e2cf1e450ae626cb2fc928862008f6233 Gerrit-Change-Number: 12385 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 23 Dec 2018 10:10:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:11:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:11:28 +0000 Subject: Change in libosmocore[master]: add LOGPFSMSL(), LOGPFSMSLSRC() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12386 ) Change subject: add LOGPFSMSL(), LOGPFSMSLSRC() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11b182a03f5ecb6df7cd8f260757d3626c8e945d Gerrit-Change-Number: 12386 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 23 Dec 2018 10:11:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 23 10:11:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 10:11:49 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_m?= =?UTF-8?Q?aster-openbsc_=C2=BB_--disable-iu,--disa?= =?UTF-8?Q?ble-mgcp-transcoding,--enable-smpp,?= =?UTF-8?Q?default,osmocom-master-debian9_#3481?= In-Reply-To: <531218570.202.1545546053720.JavaMail.jenkins@jenkins.osmocom.org> References: <531218570.202.1545546053720.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <394700793.238.1545559909850.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Dec 23 10:12:11 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 23 Dec 2018 10:12:11 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_m?= =?UTF-8?Q?aster-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,d?= =?UTF-8?Q?efault,osmocom-master-debian9_#3481?= In-Reply-To: <101356326.203.1545546058165.JavaMail.jenkins@jenkins.osmocom.org> References: <101356326.203.1545546058165.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1895207883.239.1545559931715.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:14:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:14:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Tear down all RTP flows to avoid race condition on tear down In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12297 ) Change subject: mgw: Tear down all RTP flows to avoid race condition on tear down ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ied839596589609e75fa487046a85db48991e4c73 Gerrit-Change-Number: 12297 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Sun, 23 Dec 2018 10:14:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:14:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Tear down all RTP flows to avoid race condition on tear down In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12297 ) Change subject: mgw: Tear down all RTP flows to avoid race condition on tear down ...................................................................... mgw: Tear down all RTP flows to avoid race condition on tear down When stopping the test TC_two_crcx_and_unsolicited_rtp the unsolicited RTP stream is not stopped. As a result it could happen that between tearing down the other flows and stopping the test an unsolicited RTP packet is sent to a closed socket. The resulting ICMP destination unreachable packet translates to a "Connection refused" error on the sending socket and fails the test. Avoid this by making sure the unsolicited RTP sender is stopped before stopping the test. Change-Id: Ied839596589609e75fa487046a85db48991e4c73 --- M mgw/MGCP_Test.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index e1ebc26..9adeb2a 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1211,6 +1211,8 @@ f_sleep(0.5); + /* Stop transmitting packets and tear down the flows */ + f_rtpem_mode(RTPEM[2], RTPEM_MODE_NONE); f_flow_delete(RTPEM[0]); f_flow_delete(RTPEM[1], ep, call_id); -- To view, visit https://gerrit.osmocom.org/12297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ied839596589609e75fa487046a85db48991e4c73 Gerrit-Change-Number: 12297 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:20:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:20:00 +0000 Subject: Change in libosmocore[master]: LCLS: enc/dec entire parameter set instead of GCR In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12371 ) Change subject: LCLS: enc/dec entire parameter set instead of GCR ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icfbb2404e1a1d500243e2071173299b557369335 Gerrit-Change-Number: 12371 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 23 Dec 2018 10:20:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:20:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:20:06 +0000 Subject: Change in libosmocore[master]: LCLS: enc/dec entire parameter set instead of GCR In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12371 ) Change subject: LCLS: enc/dec entire parameter set instead of GCR ...................................................................... LCLS: enc/dec entire parameter set instead of GCR In 3GPP TS 48.008 the Global Call Reference IE is only used in HANDOVER REQUEST (?3.2.1.8) and ASSIGNMENT REQUEST (?3.2.1.1) messages which also include LCLS Config and CSC parameters. Hence, there's no point in using GCR encode/decode functions alone. Introduce gsm0808_dec_lcls() and gsm0808_enc_lcls() as trivial wrappers on top of GCR enc/dec routines which are made static. Adjust tests accordingly. Test output intentionally left unchanged. Change-Id: Icfbb2404e1a1d500243e2071173299b557369335 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c 5 files changed, 78 insertions(+), 36 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 22050b5..4a2233e 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -84,8 +84,8 @@ int gsm0808_dec_aoip_trasp_addr(struct sockaddr_storage *ss, const uint8_t *elem, uint8_t len); -uint8_t gsm0808_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g); -int gsm0808_dec_gcr(struct osmo_gcr_parsed *g, const struct tlv_parsed *tp); +uint8_t gsm0808_enc_lcls(struct msgb *msg, const struct osmo_lcls *lcls); +int gsm0808_dec_lcls(struct osmo_lcls *lcls, const struct tlv_parsed *tp); uint8_t gsm0808_enc_speech_codec(struct msgb *msg, const struct gsm0808_speech_codec *sc); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 69da57d..485e063 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -488,23 +488,8 @@ if (kc) msgb_tv_fixed_put(msg, GSM0808_IE_KC_128, 16, kc); - if (lcls) { - /* LCLS: ?3.2.2.115 Global Call Reference */ - if (lcls->gcr) - gsm0808_enc_gcr(msg, lcls->gcr); - - /* LCLS: ?3.2.2.116 Configuration */ - if (lcls->config != GSM0808_LCLS_CFG_NA) - msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, lcls->config); - - /* LCLS: ?3.2.2.117 Connection Status Control */ - if (lcls->control != GSM0808_LCLS_CSC_NA) - msgb_tv_put(msg, GSM0808_IE_LCLS_CONN_STATUS_CTRL, lcls->control); - - /* LCLS: ?3.2.2.118 Correlation-Not-Needed */ - if (!lcls->corr_needed) - msgb_v_put(msg, GSM0808_IE_LCLS_CORR_NOT_NEEDED); - } + if (lcls) + gsm0808_enc_lcls(msg, lcls); /* push the bssmap header */ msg->l3h = diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index aa0d3d7..2a458c3 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -512,7 +512,7 @@ * \param[out] msg Message Buffer for appending IE * \param[in] g Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1 * \returns number of bytes added to \a msg or 0 on error */ -uint8_t gsm0808_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g) +static uint8_t gsm0808_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g) { uint8_t enc, *len = msgb_tl_put(msg, GSM0808_IE_GLOBAL_CALL_REF); @@ -528,7 +528,7 @@ * \param[out] gcr Caller-provided memory to store Global Call Reference * \param[in] tp IE values to be decoded * \returns number of bytes parsed; negative on error */ -int gsm0808_dec_gcr(struct osmo_gcr_parsed *gcr, const struct tlv_parsed *tp) +static int gsm0808_dec_gcr(struct osmo_gcr_parsed *gcr, const struct tlv_parsed *tp) { int ret; const uint8_t *buf = TLVP_VAL_MINLEN(tp, GSM0808_IE_GLOBAL_CALL_REF, OSMO_GCR_MIN_LEN); @@ -542,6 +542,56 @@ return 2 + ret; } +/*! Add LCLS parameters to a given msgb, 3GPP TS 48.008 ?3.2.2.115 - 3.2.2.120. + * \param[out] msg Message Buffer for appending IE + * \param[in] lcls LCLS-related data + * \returns number of bytes added to \a msg or 0 on error */ +uint8_t gsm0808_enc_lcls(struct msgb *msg, const struct osmo_lcls *lcls) +{ + uint8_t enc = 0; + + /* LCLS: ?3.2.2.115 Global Call Reference */ + if (lcls->gcr) + enc = gsm0808_enc_gcr(msg, lcls->gcr); + + /* LCLS: ?3.2.2.116 Configuration */ + if (lcls->config != GSM0808_LCLS_CFG_NA) { + msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, lcls->config); + enc += 2; + } + + /* LCLS: ?3.2.2.117 Connection Status Control */ + if (lcls->control != GSM0808_LCLS_CSC_NA) { + msgb_tv_put(msg, GSM0808_IE_LCLS_CONN_STATUS_CTRL, lcls->control); + enc += 2; + } + + /* LCLS: ?3.2.2.118 Correlation-Not-Needed */ + if (!lcls->corr_needed) { + msgb_v_put(msg, GSM0808_IE_LCLS_CORR_NOT_NEEDED); + enc++; + } + + return enc; +} + +/*! Decode LCLS parameters to a given msgb, 3GPP TS 48.008 ?3.2.2.115 - 3.2.2.120. + * \param[out] lcls Caller-provided memory to store LCLS-related data + * \param[in] tp IE values to be decoded + * \returns GCR size or negative on error */ +int gsm0808_dec_lcls(struct osmo_lcls *lcls, const struct tlv_parsed *tp) +{ + int ret = gsm0808_dec_gcr(lcls->gcr, tp); + if (ret < 0) + return ret; + + lcls->config = tlvp_val8(tp, GSM0808_IE_LCLS_CONFIG, GSM0808_LCLS_CFG_NA); + lcls->control = tlvp_val8(tp, GSM0808_IE_LCLS_CONN_STATUS_CTRL, GSM0808_LCLS_CSC_NA); + lcls->corr_needed = TLVP_PRESENT(tp, GSM0808_IE_LCLS_CORR_NOT_NEEDED) ? false : true; + + return ret; +} + /*! Encode TS 08.08 Encryption Information IE * \param[out] msg Message Buffer to which IE is to be appended * \param[in] ei Encryption Information to be encoded diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 90c2195..76b3fd0 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -220,8 +220,8 @@ gsm0808_lcls_config_names; gsm0808_lcls_control_names; gsm0808_lcls_status_names; -gsm0808_enc_gcr; -gsm0808_dec_gcr; +gsm0808_enc_lcls; +gsm0808_dec_lcls; gsm29118_msgb_alloc; gsm29118_create_alert_req; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index ebdfc29..40e2b87 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -668,7 +668,7 @@ msgb_free(in_msg); } -static void test_enc_dec_gcr() +static void test_enc_dec_lcls() { static const uint8_t res[] = { GSM0808_IE_GLOBAL_CALL_REF, @@ -690,11 +690,18 @@ }; int rc; struct tlv_parsed tp; - msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "global call reference"); + struct osmo_lcls lcls_out = { .gcr = &p }, lcls_in = { + .gcr = &g, + .config = GSM0808_LCLS_CFG_NA, + .control = GSM0808_LCLS_CSC_NA, + .corr_needed = true, + }; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "LCLS IE"); if (!msg) return; - len = gsm0808_enc_gcr(msg, &g); + len = gsm0808_enc_lcls(msg, &lcls_in); printf("Testing Global Call Reference IE encoder...\n\t%d bytes added: %s\n", len, len == ARRAY_SIZE(res) ? "OK" : "FAIL"); @@ -707,29 +714,29 @@ abort(); } - rc = gsm0808_dec_gcr(&p, &tp); + rc = gsm0808_dec_lcls(&lcls_out, &tp); if (rc < 0) { printf("decoding failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); abort(); } - if (p.net_len != g.net_len) { - printf("Network ID length parsed wrong: %u != %u\n", p.net_len, g.net_len); + if (lcls_out.gcr->net_len != g.net_len) { + printf("Network ID length parsed wrong: %u != %u\n", lcls_out.gcr->net_len, g.net_len); abort(); } - if (p.node != g.node) { - printf("Node ID parsed wrong: 0x%X != 0x%X\n", p.node, g.node); + if (lcls_out.gcr->node != g.node) { + printf("Node ID parsed wrong: 0x%X != 0x%X\n", lcls_out.gcr->node, g.node); abort(); } - if (memcmp(p.net, g.net, g.net_len) != 0) { - printf("Network ID parsed wrong: %s\n", osmo_hexdump(p.net, p.net_len)); + if (memcmp(lcls_out.gcr->net, g.net, g.net_len) != 0) { + printf("Network ID parsed wrong: %s\n", osmo_hexdump(lcls_out.gcr->net, lcls_out.gcr->net_len)); abort(); } - if (memcmp(p.cr, g.cr, 5) != 0) { - printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(p.cr, 5)); + if (memcmp(lcls_out.gcr->cr, g.cr, 5) != 0) { + printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(lcls_out.gcr->cr, 5)); abort(); } @@ -1959,7 +1966,7 @@ test_create_dtap(); test_prepend_dtap(); - test_enc_dec_gcr(); + test_enc_dec_lcls(); test_enc_dec_aoip_trasp_addr_v4(); test_enc_dec_aoip_trasp_addr_v6(); -- To view, visit https://gerrit.osmocom.org/12371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icfbb2404e1a1d500243e2071173299b557369335 Gerrit-Change-Number: 12371 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:22:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:22:23 +0000 Subject: Change in osmo-bts[master]: rsl: Send PDCH ACT NACK if TCH chan is still active In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12180 ) Change subject: rsl: Send PDCH ACT NACK if TCH chan is still active ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d Gerrit-Change-Number: 12180 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 23 Dec 2018 10:22:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:22:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:22:25 +0000 Subject: Change in osmo-bts[master]: rsl: Send PDCH ACT NACK if TCH chan is still active In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12180 ) Change subject: rsl: Send PDCH ACT NACK if TCH chan is still active ...................................................................... rsl: Send PDCH ACT NACK if TCH chan is still active Fix recent commit which broke TTCN3 BTS_tests TC_dyn_ipa_pdch_tchf_act_pdch_act_nack. Prior to the breaking commit, logic was still not good, because 1- It didn't return after sending the NACK 2- It sent a NACK in all cases, while for PDCH DEACT we want to force its deactivation. Going through tests it can be seen that indeed it can deactivate it in that case: rsl.c:2206 (bts=0,trx=0,ts=3,pchan=TCH/F_PDCH as PDCH) Request to PDCH DEACT, but lchan is still in state ACTIVE ... rsl.c:2103 (bts=0,trx=0,ts=3,ss=0) Tx PDCH DEACT ACK Fixes: 133a3d96dc07ebda4dfc7899dab9c0d0c80c9fea ("rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK") Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d --- M src/common/rsl.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index 507e8aa..61bf6a1 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2204,6 +2204,12 @@ "%s Request to PDCH %s, but lchan is still in state %s\n", gsm_ts_and_pchan_name(ts), pdch_act? "ACT" : "DEACT", gsm_lchans_name(lchan->state)); + /* TCH takes preference over PDCH so allow forcing PDCH DEACT, + * but forbid forcing PDCH ACT if lchan still active */ + if (pdch_act) { + rsl_tx_dyn_pdch_nack(lchan, pdch_act, RSL_ERR_NORMAL_UNSPEC); + return; + } } ts->flags |= pdch_act? TS_F_PDCH_ACT_PENDING -- To view, visit https://gerrit.osmocom.org/12180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d Gerrit-Change-Number: 12180 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:23:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:23:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2) to the change originally created by dexter. ( https://gerrit.osmocom.org/12391 ) Change subject: BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL ...................................................................... BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL Usually the MS power is controlled by the BTS and there is no continous supervison by the BSC needed. However, a scheme where the BSC takes care of the power control loop exists. The power is then set via RSL using an RSL MS POWER CONTROL message. This tests establishes a dchan and then sends MS POWER CONTROL messages with differen power levels and then checks the presence of the power level set in the MS POWER LEVEL field of the SACCH L1 header. Change-Id: I82b04a3bf94d355175f7f6ff3fdc43672e8080a2 Related: OS#1622 --- M bts/BTS_Tests.ttcn M bts/expected-results.xml M library/RSL_Types.ttcn 3 files changed, 84 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/12391/2 -- To view, visit https://gerrit.osmocom.org/12391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82b04a3bf94d355175f7f6ff3fdc43672e8080a2 Gerrit-Change-Number: 12391 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:23:25 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 23 Dec 2018 10:23:25 +0000 Subject: Change in libosmocore[master]: Fix VTY documentation error introduced in "bind" VTY port change In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12426 ) Change subject: Fix VTY documentation error introduced in "bind" VTY port change ...................................................................... Patch Set 1: Code-Review+2 Argh. Shall we build reverse dependencies for libosmocore gerrit as well (or at least a single binary that uses the "most" of libosmocore) -- To view, visit https://gerrit.osmocom.org/12426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I54fb0ca0d3a884a64a349b22de70f3d9bd1a6d54 Gerrit-Change-Number: 12426 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 23 Dec 2018 10:23:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:24:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:24:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12391 ) Change subject: BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12391/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/12391/2/bts/BTS_Tests.ttcn at 4201 PS2, Line 4201: MS Power Control you could remove this todo line. Wait, I'll do it myself. -- To view, visit https://gerrit.osmocom.org/12391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82b04a3bf94d355175f7f6ff3fdc43672e8080a2 Gerrit-Change-Number: 12391 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 23 Dec 2018 10:24:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:25:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:25:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#3) to the change originally created by dexter. ( https://gerrit.osmocom.org/12391 ) Change subject: BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL ...................................................................... BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL Usually the MS power is controlled by the BTS and there is no continous supervison by the BSC needed. However, a scheme where the BSC takes care of the power control loop exists. The power is then set via RSL using an RSL MS POWER CONTROL message. This tests establishes a dchan and then sends MS POWER CONTROL messages with differen power levels and then checks the presence of the power level set in the MS POWER LEVEL field of the SACCH L1 header. Change-Id: I82b04a3bf94d355175f7f6ff3fdc43672e8080a2 Related: OS#1622 --- M bts/BTS_Tests.ttcn M bts/expected-results.xml M library/RSL_Types.ttcn 3 files changed, 84 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/12391/3 -- To view, visit https://gerrit.osmocom.org/12391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82b04a3bf94d355175f7f6ff3fdc43672e8080a2 Gerrit-Change-Number: 12391 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:25:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:25:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12391 ) Change subject: BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82b04a3bf94d355175f7f6ff3fdc43672e8080a2 Gerrit-Change-Number: 12391 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 23 Dec 2018 10:25:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:27:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:27:28 +0000 Subject: Change in libosmocore[master]: utils: drop redundant _SOURCES entries In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12392 ) Change subject: utils: drop redundant _SOURCES entries ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12392/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12392/1//COMMIT_MSG at 9 PS1, Line 9: Automake use the .c file corresponding to the program name : automatically, there's no need to use _SOURCES unless they have : multiple files in them. I had no idea of this automatism. You will probably find more MAkefile.am in Osmocom where it's stated explicitly. On the other hand, we don't loose anything from stating it explicitly, and one can argue it's easier to add more files later on. Hence I would (again) put this into the category "why are we [you] spending time on something like this?" -- To view, visit https://gerrit.osmocom.org/12392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0374e2d38e6bdc416eec182030af94b89d65ab7 Gerrit-Change-Number: 12392 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 23 Dec 2018 10:27:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:27:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:27:50 +0000 Subject: Change in osmo-sysmon[master]: Move shared libs into common LDADD In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12393 ) Change subject: Move shared libs into common LDADD ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8b2f2cd60426cf3b52dd463959a48fd7619cfcce Gerrit-Change-Number: 12393 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 23 Dec 2018 10:27:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:27:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:27:51 +0000 Subject: Change in osmo-sysmon[master]: Move shared libs into common LDADD In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12393 ) Change subject: Move shared libs into common LDADD ...................................................................... Move shared libs into common LDADD Change-Id: I8b2f2cd60426cf3b52dd463959a48fd7619cfcce --- M src/Makefile.am 1 file changed, 3 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/Makefile.am b/src/Makefile.am index 9ad5947..412337b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,5 @@ +LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + AM_CPPFLAGS = \ $(all_includes) \ -I$(top_srcdir) \ @@ -20,9 +22,7 @@ osmo-ctrl-client \ $(NULL) -osmo_sysmon_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ +osmo_sysmon_LDADD = $(LDADD) \ $(LIBOSMOVTY_LIBS) \ $(LIBMNL_LIBS) \ $(NULL) @@ -37,11 +37,6 @@ osysmon_main.c \ $(NULL) -osmo_ctrl_client_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - osmo_ctrl_client_SOURCES = \ simple_ctrl.c \ osmo-ctrl-client.c \ -- To view, visit https://gerrit.osmocom.org/12393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8b2f2cd60426cf3b52dd463959a48fd7619cfcce Gerrit-Change-Number: 12393 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:28:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:28:45 +0000 Subject: Change in osmo-sysmon[master]: ctrl: separate config structure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12316 ) Change subject: ctrl: separate config structure ...................................................................... Patch Set 2: Code-Review-1 agreeing with Pau. -- To view, visit https://gerrit.osmocom.org/12316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Gerrit-Change-Number: 12316 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sun, 23 Dec 2018 10:28:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:36:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:36:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12391 ) Change subject: BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL ...................................................................... BTS_Tests: Verify RSL MS POWER CONTROL and SACCH MS POWER LEVEL Usually the MS power is controlled by the BTS and there is no continous supervison by the BSC needed. However, a scheme where the BSC takes care of the power control loop exists. The power is then set via RSL using an RSL MS POWER CONTROL message. This tests establishes a dchan and then sends MS POWER CONTROL messages with differen power levels and then checks the presence of the power level set in the MS POWER LEVEL field of the SACCH L1 header. Change-Id: I82b04a3bf94d355175f7f6ff3fdc43672e8080a2 Related: OS#1622 --- M bts/BTS_Tests.ttcn M bts/expected-results.xml M library/RSL_Types.ttcn 3 files changed, 84 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 753d89b..0de787a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1502,6 +1502,76 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +/* establish DChan, and send MS POWER CONTROL messages via RSL, verify that + * the BTS is forwarding those values to the MS via the SACCH L1 header. */ +function f_tc_rsl_ms_pwr_ctrl(charstring id) runs on ConnHdlr { + var L1ctlDlMessage l1_dl; + var RSL_IE_MS_Power ms_power; + var RSL_Message rsl; + var uint5_t power_level := 0; + + f_l1_tune(L1CTL); + RSL.clear; + + f_est_dchan(); + + ms_power.reserved := 0; + ms_power.fpc_epc := false; + + /* Send the first power control command. This will disable any BTS/TRX + * internal power control and switch the MS (which is not in scope of + * this test) to a constant power level. We start with a power level + * of 0 */ + ms_power.power_level := power_level; + rsl := valueof(ts_RSL_MS_PWR_CTRL(g_chan_nr, ms_power)); + RSL.send(rsl); + + alt { + + /* Pick all SACCH blocks for checking */ + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { + + /* The first byte of the L1 header contains the power level. + * The reserved bits and the fpc bit is set to 0, so we may + * compare directly. */ + if (not (l1_dl.payload.data_ind.payload[0] == int2oct(power_level, 1))) { + setverdict(fail, "Power level in L1 header does not match the signaled (RSL) power level."); + } + + /* Signal a new power level via RSL for the next turn. */ + if (power_level < 31) { + power_level := power_level + 1; + ms_power.power_level := power_level; + rsl := valueof(ts_RSL_MS_PWR_CTRL(g_chan_nr, ms_power)); + RSL.send(rsl); + repeat; + } + + } + + /* Ignore all other blocks */ + [] L1CTL.receive { repeat; } + + } + + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + + setverdict(pass); +} + +testcase TC_rsl_ms_pwr_ctrl() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + f_init(testcasename()); + + for (var integer tn := 1; tn <= 4; tn := tn+1) { + pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN)); + vc_conn := f_start_handler(refers(f_tc_rsl_ms_pwr_ctrl), pars); + vc_conn.done; + } + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} /* Test if a channel without valid uplink bursts generates RSL CONN FAIL IND (TS 48.058 4.10) */ private function f_TC_conn_fail_crit(charstring id) runs on ConnHdlr { @@ -4128,7 +4198,6 @@ * check DEACTIVATE SACCH ** unsupported algorithm * handover detection -* MS Power Control * BS Power Control * Physical Context * CCCH Load Indication for RACH @@ -4164,6 +4233,7 @@ execute( TC_meas_res_sign_sdcch4() ); execute( TC_meas_res_sign_sdcch8() ); execute( TC_meas_res_sign_tchh_toa256() ); + execute( TC_rsl_ms_pwr_ctrl() ); execute( TC_conn_fail_crit() ); execute( TC_paging_imsi_80percent() ); execute( TC_paging_tmsi_80percent() ); diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 73de1fb..bad4d6f 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -17,6 +17,7 @@ + diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index cd4ba58..3b1a311 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -1318,6 +1318,18 @@ } } + /* 8.4.15: BTS <- BSC */ + template (value) RSL_Message ts_RSL_MS_PWR_CTRL(template (value) RslChannelNr chan_nr, + template (value) RSL_IE_MS_Power ms_power) := { + msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false), + msg_type := RSL_MT_MS_POWER_CONTROL, + ies := { + t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), + t_RSL_IE(RSL_IE_MS_POWER, RSL_IE_Body:{ms_power := ms_power}) + /* One optional IE: MS POWER PARAMETERS */ + } + } + /* 8.4.19 BTS -> BSC */ template (value) RSL_Message ts_RSL_RF_CHAN_REL_ACK(template (value) RslChannelNr chan_nr) := ts_RSL_MsgDiscType(ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false), -- To view, visit https://gerrit.osmocom.org/12391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I82b04a3bf94d355175f7f6ff3fdc43672e8080a2 Gerrit-Change-Number: 12391 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:38:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:38:24 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Add comments documenting TA + MS power control ... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12287 ) Change subject: osmo-bts-trx/loops.c: Add comments documenting TA + MS power control loop ...................................................................... osmo-bts-trx/loops.c: Add comments documenting TA + MS power control loop The loops.c code is not very easily understood, so let's add some comments to it. As can be seen, there are functions of integer type which always return 0, and whose callers don't check for the return value. This will be adressed in subsequent patches. Change-Id: Iafea07eb751ed85d29b214576bb0d31ea919cd72 Related: OS#1622, OS#1851 --- M src/osmo-bts-trx/loops.c 1 file changed, 30 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index 926b4c6..fc10c40 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -37,6 +37,11 @@ * MS Power loop */ +/*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan. + * \param lchan logical channel for which to compute (and in which to store) new power value. + * \param[in] chan_nr RSL channel number of the channel, only used for logging purpose. + * \param[in] diff input delta value (in dB) + * \returns 0 in all cases */ static int ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff) { struct gsm_bts_trx *trx = lchan->ts->trx; @@ -44,14 +49,17 @@ uint16_t arfcn = trx->arfcn; int8_t new_power; + /* compute new target MS output power level based on current value subtracted by 'diff/2' */ new_power = lchan->ms_power_ctrl.current - (diff >> 1); if (diff == 0) return 0; + /* ms transmit power level cannot become negative */ if (new_power < 0) new_power = 0; + /* saturate at the maximum possible power level for the given band */ // FIXME: to go above 1W, we need to know classmark of MS if (arfcn >= 512 && arfcn <= 885) { if (new_power > 15) @@ -61,6 +69,8 @@ new_power = 19; } + /* don't ever change more than MS_{LOWER,RAISE}_MAX during one loop iteration, i.e. + * reduce the speed at which the MS transmit power can change */ /* a higher value means a lower level (and vice versa) */ if (new_power > lchan->ms_power_ctrl.current + MS_LOWER_MAX) new_power = lchan->ms_power_ctrl.current + MS_LOWER_MAX; @@ -83,11 +93,16 @@ ms_pwr_dbm(band, lchan->ms_power_ctrl.current), new_power, ms_pwr_dbm(band, new_power)); + /* store the resulting new MS power level in the lchan */ lchan->ms_power_ctrl.current = new_power; return 0; } +/*! Input a new RSSI value into the MS power control loop for the given logical channel. + * \param chan_state L1 channel state of the logical channel. + * \param rssi Received Signal Strength Indication (in dBm) + * \return 0 in all cases */ static int ms_power_val(struct l1sched_chan_state *chan_state, int8_t rssi) { /* ignore inserted dummy frames, treat as lost frames */ @@ -110,6 +125,10 @@ return 0; } +/*! Process a single clock tick of the MS power control loop. + * \param lchan Logical channel to which the clock tick applies + * \param[in] chan_nr RSL channel number (for logging purpose) + * \returns 0 in all cases */ static int ms_power_clock(struct gsm_lchan *lchan, uint8_t chan_nr, struct l1sched_chan_state *chan_state) { @@ -213,6 +232,14 @@ return 0; } +/*! Process a SACCH event as input to the MS power control and TA loop. Function + * is called once every uplink SACCH block is received. + * \param l1t L1 TRX instance on which we operate + * \param chan_nr RSL channel number on which we operate + * \param chan_state L1 scheduler channel state of the channel on which we operate + * \param[in] rssi Receive Signal Strength Indication + * \param[in] toa256 Time of Arrival in 1/256 symbol periods + * \returns 0 in all cases */ int trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, int8_t rssi, int16_t toa256) { @@ -220,15 +247,18 @@ .lchan[l1sap_chan2ss(chan_nr)]; struct phy_instance *pinst = trx_phy_instance(l1t->trx); + /* if MS power control loop is enabled, handle it */ if (pinst->phy_link->u.osmotrx.trx_ms_power_loop) ms_power_val(chan_state, rssi); + /* if TA loop is enabled, handle it */ if (pinst->phy_link->u.osmotrx.trx_ta_loop) ta_val(lchan, chan_nr, chan_state, toa256); return 0; } +/*! Called once every downlink SACCH block needs to be sent. */ int trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state) { -- To view, visit https://gerrit.osmocom.org/12287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iafea07eb751ed85d29b214576bb0d31ea919cd72 Gerrit-Change-Number: 12287 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:38:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:38:25 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.[ch]: Make functions "void" if they always return 0 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12288 ) Change subject: osmo-bts-trx/loops.[ch]: Make functions "void" if they always return 0 ...................................................................... osmo-bts-trx/loops.[ch]: Make functions "void" if they always return 0 The concept of a return value only makes sense if there's actually ever something non-constant to return, and if the caller actually processes that return value. If we always "return 0" and ignore it on the caller side, functions should be of "void" type. Change-Id: I3575a2cef75f3fd4c3f95eddb40719d28a055b54 Related: OS#1622, OS#1851 --- M src/osmo-bts-trx/loops.c M src/osmo-bts-trx/loops.h 2 files changed, 35 insertions(+), 54 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index fc10c40..6337d87 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -40,9 +40,8 @@ /*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan. * \param lchan logical channel for which to compute (and in which to store) new power value. * \param[in] chan_nr RSL channel number of the channel, only used for logging purpose. - * \param[in] diff input delta value (in dB) - * \returns 0 in all cases */ -static int ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff) + * \param[in] diff input delta value (in dB) */ +static void ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff) { struct gsm_bts_trx *trx = lchan->ts->trx; enum gsm_band band = trx->bts->band; @@ -53,7 +52,7 @@ new_power = lchan->ms_power_ctrl.current - (diff >> 1); if (diff == 0) - return 0; + return; /* ms transmit power level cannot become negative */ if (new_power < 0) @@ -83,7 +82,7 @@ trx->nr, chan_nr, new_power, ms_pwr_dbm(band, new_power)); - return 0; + return; } LOGP(DLOOP, LOGL_INFO, "%s MS new_power of trx=%u chan_nr=0x%02x from " @@ -96,18 +95,17 @@ /* store the resulting new MS power level in the lchan */ lchan->ms_power_ctrl.current = new_power; - return 0; + return; } /*! Input a new RSSI value into the MS power control loop for the given logical channel. * \param chan_state L1 channel state of the logical channel. - * \param rssi Received Signal Strength Indication (in dBm) - * \return 0 in all cases */ -static int ms_power_val(struct l1sched_chan_state *chan_state, int8_t rssi) + * \param rssi Received Signal Strength Indication (in dBm) */ +static void ms_power_val(struct l1sched_chan_state *chan_state, int8_t rssi) { /* ignore inserted dummy frames, treat as lost frames */ if (rssi < -127) - return 0; + return; LOGP(DLOOP, LOGL_DEBUG, "Got RSSI value of %d\n", rssi); @@ -118,18 +116,15 @@ /* store and process RSSI */ if (chan_state->meas.rssi_valid_count == ARRAY_SIZE(chan_state->meas.rssi)) - return 0; + return; chan_state->meas.rssi[chan_state->meas.rssi_valid_count++] = rssi; chan_state->meas.rssi_valid_count++; - - return 0; } /*! Process a single clock tick of the MS power control loop. * \param lchan Logical channel to which the clock tick applies - * \param[in] chan_nr RSL channel number (for logging purpose) - * \returns 0 in all cases */ -static int ms_power_clock(struct gsm_lchan *lchan, + * \param[in] chan_nr RSL channel number (for logging purpose) */ +static void ms_power_clock(struct gsm_lchan *lchan, uint8_t chan_nr, struct l1sched_chan_state *chan_state) { struct gsm_bts_trx *trx = lchan->ts->trx; @@ -140,21 +135,22 @@ /* skip every second clock, to prevent oscillating due to roundtrip * delay */ if (!(chan_state->meas.clock & 1)) - return 0; + return; LOGP(DLOOP, LOGL_DEBUG, "Got SACCH master clock at RSSI count %d\n", chan_state->meas.rssi_count); /* wait for initial burst */ if (!chan_state->meas.rssi_got_burst) - return 0; + return; /* if no burst was received from MS at clock */ if (chan_state->meas.rssi_count == 0) { LOGP(DLOOP, LOGL_NOTICE, "LOST SACCH frame of trx=%u " "chan_nr=0x%02x, so we raise MS power\n", trx->nr, chan_nr); - return ms_power_diff(lchan, chan_nr, MS_RAISE_MAX); + ms_power_diff(lchan, chan_nr, MS_RAISE_MAX); + return; } /* reset total counter */ @@ -163,7 +159,7 @@ /* check the minimum level received after MS acknowledged the ordered * power level */ if (chan_state->meas.rssi_valid_count == 0) - return 0; + return; for (rssi = 999, i = 0; i < chan_state->meas.rssi_valid_count; i++) { if (rssi > chan_state->meas.rssi[i]) rssi = chan_state->meas.rssi[i]; @@ -179,8 +175,6 @@ ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current), trx->nr, chan_nr); ms_power_diff(lchan, chan_nr, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi); - - return 0; } @@ -191,19 +185,19 @@ * Timing Advance loop */ -int ta_val(struct gsm_lchan *lchan, uint8_t chan_nr, +void ta_val(struct gsm_lchan *lchan, uint8_t chan_nr, struct l1sched_chan_state *chan_state, int16_t toa256) { struct gsm_bts_trx *trx = lchan->ts->trx; /* check if the current L1 header acks to the current ordered TA */ if (lchan->meas.l1_info[1] != lchan->rqd_ta) - return 0; + return; /* sum measurement */ chan_state->meas.toa256_sum += toa256; if (++(chan_state->meas.toa_num) < 16) - return 0; + return; /* complete set */ toa256 = chan_state->meas.toa256_sum / chan_state->meas.toa_num; @@ -228,8 +222,6 @@ chan_state->meas.toa_num = 0; chan_state->meas.toa256_sum = 0; - - return 0; } /*! Process a SACCH event as input to the MS power control and TA loop. Function @@ -238,9 +230,8 @@ * \param chan_nr RSL channel number on which we operate * \param chan_state L1 scheduler channel state of the channel on which we operate * \param[in] rssi Receive Signal Strength Indication - * \param[in] toa256 Time of Arrival in 1/256 symbol periods - * \returns 0 in all cases */ -int trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, + * \param[in] toa256 Time of Arrival in 1/256 symbol periods */ +void trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, int8_t rssi, int16_t toa256) { struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)] @@ -254,12 +245,10 @@ /* if TA loop is enabled, handle it */ if (pinst->phy_link->u.osmotrx.trx_ta_loop) ta_val(lchan, chan_nr, chan_state, toa256); - - return 0; } /*! Called once every downlink SACCH block needs to be sent. */ -int trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr, +void trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state) { struct gsm_lchan *lchan = &l1t->trx->ts[L1SAP_CHAN2TS(chan_nr)] @@ -271,11 +260,9 @@ /* count the number of SACCH clocks */ chan_state->meas.clock++; - - return 0; } -int trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr, +void trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, float ber) { struct gsm_bts_trx *trx = l1t->trx; @@ -284,11 +271,11 @@ /* check if loop is enabled */ if (!chan_state->amr_loop) - return 0; + return; /* wait for MS to use the requested codec */ if (chan_state->ul_ft != chan_state->dl_cmr) - return 0; + return; /* count bit errors */ if (L1SAP_IS_CHAN_TCHH(chan_nr)) { @@ -301,7 +288,7 @@ /* count frames */ if (chan_state->ber_num < 48) - return 0; + return; /* calculate average (reuse ber variable) */ ber = chan_state->ber_sum / chan_state->ber_num; @@ -325,8 +312,7 @@ chan_state->dl_cmr - 1, trx->nr, chan_nr); chan_state->dl_cmr--; } - - return 0; + return; } /* upgrade */ @@ -342,18 +328,15 @@ chan_state->dl_cmr++; } - return 0; + return; } - - return 0; } -int trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop) +void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop) { if (chan_state->amr_loop && !loop) { chan_state->amr_loop = 0; - - return 0; + return; } if (!chan_state->amr_loop && loop) { @@ -363,8 +346,6 @@ chan_state->ber_num = 0; chan_state->ber_sum = 0; - return 0; + return; } - - return 0; } diff --git a/src/osmo-bts-trx/loops.h b/src/osmo-bts-trx/loops.h index f9e69c8..50a658d 100644 --- a/src/osmo-bts-trx/loops.h +++ b/src/osmo-bts-trx/loops.h @@ -13,15 +13,15 @@ * loops api */ -int trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, +void trx_loop_sacch_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, int8_t rssi, int16_t toa); -int trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr, +void trx_loop_sacch_clock(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state); -int trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr, +void trx_loop_amr_input(struct l1sched_trx *l1t, uint8_t chan_nr, struct l1sched_chan_state *chan_state, float ber); -int trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop); +void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop); #endif /* _TRX_LOOPS_H */ -- To view, visit https://gerrit.osmocom.org/12288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3575a2cef75f3fd4c3f95eddb40719d28a055b54 Gerrit-Change-Number: 12288 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:38:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:38:25 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Use lchan name based logging In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12289 ) Change subject: osmo-bts-trx/loops.c: Use lchan name based logging ...................................................................... osmo-bts-trx/loops.c: Use lchan name based logging The loops.c code dates back to ancient times when we printed the TRX number and the raw channel number to identify a logical channel. We meanwhile have gsm_lchan_name() and should use it to log messages related to this lchan in a common format. This commit introduces the LOGPLCHAN() helper macro [similar to osmo-bsc], and uses it from loops.c. As a result, some functions don't need a chan_nr argument anymore, while some need to add a new lchan argument. Change-Id: I6976dd7444c26b1f52741bc367b0311ebbef1718 Related: OS#1622, OS#1851 --- M include/osmo-bts/gsm_data.h M src/osmo-bts-trx/loops.c 2 files changed, 38 insertions(+), 56 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 9e62cdf..1de5edd 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -24,6 +24,8 @@ #define GSM_BTS_AGCH_QUEUE_LOW_LEVEL_DEFAULT 41 #define GSM_BTS_AGCH_QUEUE_HIGH_LEVEL_DEFAULT 91 +#define LOGPLCHAN(lchan, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_lchan_name(lchan), ## args) + struct gsm_network { struct llist_head bts_list; unsigned int num_bts; diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index 6337d87..8bb2139 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -39,9 +39,8 @@ /*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan. * \param lchan logical channel for which to compute (and in which to store) new power value. - * \param[in] chan_nr RSL channel number of the channel, only used for logging purpose. * \param[in] diff input delta value (in dB) */ -static void ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff) +static void ms_power_diff(struct gsm_lchan *lchan, int8_t diff) { struct gsm_bts_trx *trx = lchan->ts->trx; enum gsm_band band = trx->bts->band; @@ -77,20 +76,16 @@ new_power = lchan->ms_power_ctrl.current - MS_RAISE_MAX; if (lchan->ms_power_ctrl.current == new_power) { - LOGP(DLOOP, LOGL_INFO, "Keeping MS new_power of trx=%u " - "chan_nr=0x%02x at control level %d (%d dBm)\n", - trx->nr, chan_nr, new_power, - ms_pwr_dbm(band, new_power)); + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS new_power at control level %d (%d dBm)\n", + new_power, ms_pwr_dbm(band, new_power)); return; } - LOGP(DLOOP, LOGL_INFO, "%s MS new_power of trx=%u chan_nr=0x%02x from " - "control level %d (%d dBm) to %d (%d dBm)\n", + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS new_power from control level %d (%d dBm) to %d (%d dBm)\n", (diff > 0) ? "Raising" : "Lowering", - trx->nr, chan_nr, lchan->ms_power_ctrl.current, - ms_pwr_dbm(band, lchan->ms_power_ctrl.current), new_power, - ms_pwr_dbm(band, new_power)); + lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current), + new_power, ms_pwr_dbm(band, new_power)); /* store the resulting new MS power level in the lchan */ lchan->ms_power_ctrl.current = new_power; @@ -99,15 +94,16 @@ } /*! Input a new RSSI value into the MS power control loop for the given logical channel. + * \param lchan logical channel * \param chan_state L1 channel state of the logical channel. * \param rssi Received Signal Strength Indication (in dBm) */ -static void ms_power_val(struct l1sched_chan_state *chan_state, int8_t rssi) +static void ms_power_val(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state, int8_t rssi) { /* ignore inserted dummy frames, treat as lost frames */ if (rssi < -127) return; - LOGP(DLOOP, LOGL_DEBUG, "Got RSSI value of %d\n", rssi); + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Got RSSI value of %d\n", rssi); chan_state->meas.rssi_count++; @@ -122,10 +118,8 @@ } /*! Process a single clock tick of the MS power control loop. - * \param lchan Logical channel to which the clock tick applies - * \param[in] chan_nr RSL channel number (for logging purpose) */ -static void ms_power_clock(struct gsm_lchan *lchan, - uint8_t chan_nr, struct l1sched_chan_state *chan_state) + * \param lchan Logical channel to which the clock tick applies */ +static void ms_power_clock(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state) { struct gsm_bts_trx *trx = lchan->ts->trx; struct phy_instance *pinst = trx_phy_instance(trx); @@ -137,7 +131,7 @@ if (!(chan_state->meas.clock & 1)) return; - LOGP(DLOOP, LOGL_DEBUG, "Got SACCH master clock at RSSI count %d\n", + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Got SACCH master clock at RSSI count %d\n", chan_state->meas.rssi_count); /* wait for initial burst */ @@ -146,10 +140,8 @@ /* if no burst was received from MS at clock */ if (chan_state->meas.rssi_count == 0) { - LOGP(DLOOP, LOGL_NOTICE, "LOST SACCH frame of trx=%u " - "chan_nr=0x%02x, so we raise MS power\n", - trx->nr, chan_nr); - ms_power_diff(lchan, chan_nr, MS_RAISE_MAX); + LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE, "LOST SACCH frame, so we raise MS power\n"); + ms_power_diff(lchan, MS_RAISE_MAX); return; } @@ -169,12 +161,11 @@ chan_state->meas.rssi_valid_count = 0; /* change RSSI */ - LOGP(DLOOP, LOGL_DEBUG, "Lowest RSSI: %d Target RSSI: %d Current " - "MS power: %d (%d dBm) of trx=%u chan_nr=0x%02x\n", rssi, + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Lowest RSSI: %d Target RSSI: %d Current " + "MS power: %d (%d dBm)\n", rssi, pinst->phy_link->u.osmotrx.trx_target_rssi, lchan->ms_power_ctrl.current, - ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current), - trx->nr, chan_nr); - ms_power_diff(lchan, chan_nr, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi); + ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current)); + ms_power_diff(lchan, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi); } @@ -185,11 +176,8 @@ * Timing Advance loop */ -void ta_val(struct gsm_lchan *lchan, uint8_t chan_nr, - struct l1sched_chan_state *chan_state, int16_t toa256) +void ta_val(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state, int16_t toa256) { - struct gsm_bts_trx *trx = lchan->ts->trx; - /* check if the current L1 header acks to the current ordered TA */ if (lchan->meas.l1_info[1] != lchan->rqd_ta) return; @@ -204,21 +192,16 @@ /* check for change of TOA */ if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > 0) { - LOGP(DLOOP, LOGL_INFO, "TOA of trx=%u chan_nr=0x%02x is too " - "early (%d), now lowering TA from %d to %d\n", - trx->nr, chan_nr, toa256, lchan->rqd_ta, - lchan->rqd_ta - 1); + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too early (%d), now lowering TA from %d to %d\n", + toa256, lchan->rqd_ta, lchan->rqd_ta - 1); lchan->rqd_ta--; } else if (toa256 > TOA256_9OPERCENT && lchan->rqd_ta < 63) { - LOGP(DLOOP, LOGL_INFO, "TOA of trx=%u chan_nr=0x%02x is too " - "late (%d), now raising TA from %d to %d\n", - trx->nr, chan_nr, toa256, lchan->rqd_ta, - lchan->rqd_ta + 1); + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too late (%d), now raising TA from %d to %d\n", + toa256, lchan->rqd_ta, lchan->rqd_ta + 1); lchan->rqd_ta++; } else - LOGP(DLOOP, LOGL_INFO, "TOA of trx=%u chan_nr=0x%02x is " - "correct (%d), keeping current TA of %d\n", - trx->nr, chan_nr, toa256, lchan->rqd_ta); + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is correct (%d), keeping current TA of %d\n", + toa256, lchan->rqd_ta); chan_state->meas.toa_num = 0; chan_state->meas.toa256_sum = 0; @@ -240,11 +223,11 @@ /* if MS power control loop is enabled, handle it */ if (pinst->phy_link->u.osmotrx.trx_ms_power_loop) - ms_power_val(chan_state, rssi); + ms_power_val(lchan, chan_state, rssi); /* if TA loop is enabled, handle it */ if (pinst->phy_link->u.osmotrx.trx_ta_loop) - ta_val(lchan, chan_nr, chan_state, toa256); + ta_val(lchan, chan_state, toa256); } /*! Called once every downlink SACCH block needs to be sent. */ @@ -256,7 +239,7 @@ struct phy_instance *pinst = trx_phy_instance(l1t->trx); if (pinst->phy_link->u.osmotrx.trx_ms_power_loop) - ms_power_clock(lchan, chan_nr, chan_state); + ms_power_clock(lchan, chan_state); /* count the number of SACCH clocks */ chan_state->meas.clock++; @@ -297,19 +280,17 @@ chan_state->ber_num = 0; chan_state->ber_sum = 0; - LOGP(DLOOP, LOGL_DEBUG, "Current bit error rate (BER) %.6f " - "codec id %d of trx=%u chan_nr=0x%02x\n", ber, - chan_state->ul_ft, trx->nr, chan_nr); + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Current bit error rate (BER) %.6f " + "codec id %d\n", ber, chan_state->ul_ft); /* degrade */ if (chan_state->dl_cmr > 0) { /* degrade, if ber is above threshold FIXME: C/I */ if (ber > lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr-1].threshold) { - LOGP(DLOOP, LOGL_DEBUG, "Degrading due to BER %.6f " - "from codec id %d to %d of trx=%u " - "chan_nr=0x%02x\n", ber, chan_state->dl_cmr, - chan_state->dl_cmr - 1, trx->nr, chan_nr); + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Degrading due to BER %.6f " + "from codec id %d to %d\n", ber, chan_state->dl_cmr, + chan_state->dl_cmr - 1); chan_state->dl_cmr--; } return; @@ -321,10 +302,9 @@ if (ber < lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].threshold - lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].hysteresis) { - LOGP(DLOOP, LOGL_DEBUG, "Upgrading due to BER %.6f " - "from codec id %d to %d of trx=%u " - "chan_nr=0x%02x\n", ber, chan_state->dl_cmr, - chan_state->dl_cmr + 1, trx->nr, chan_nr); + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Upgrading due to BER %.6f " + "from codec id %d to %d\n", ber, chan_state->dl_cmr, + chan_state->dl_cmr + 1); chan_state->dl_cmr++; } -- To view, visit https://gerrit.osmocom.org/12289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6976dd7444c26b1f52741bc367b0311ebbef1718 Gerrit-Change-Number: 12289 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 10:38:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 23 Dec 2018 10:38:25 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/loops.c: Make code control flow more readable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12290 ) Change subject: osmo-bts-trx/loops.c: Make code control flow more readable ...................................................................... osmo-bts-trx/loops.c: Make code control flow more readable Use the 'else' construct where applicable to avoid too many return paths from functions Change-Id: I819f0c80e90855e8b3252795c837f8e3053b6e87 Related: OS#1622, OS#1851 --- M src/osmo-bts-trx/loops.c 1 file changed, 9 insertions(+), 20 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index 8bb2139..c17f548 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -78,19 +78,15 @@ if (lchan->ms_power_ctrl.current == new_power) { LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS new_power at control level %d (%d dBm)\n", new_power, ms_pwr_dbm(band, new_power)); + } else { + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS new_power from control level %d (%d dBm) to %d (%d dBm)\n", + (diff > 0) ? "Raising" : "Lowering", + lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current), + new_power, ms_pwr_dbm(band, new_power)); - return; + /* store the resulting new MS power level in the lchan */ + lchan->ms_power_ctrl.current = new_power; } - - LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS new_power from control level %d (%d dBm) to %d (%d dBm)\n", - (diff > 0) ? "Raising" : "Lowering", - lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current), - new_power, ms_pwr_dbm(band, new_power)); - - /* store the resulting new MS power level in the lchan */ - lchan->ms_power_ctrl.current = new_power; - - return; } /*! Input a new RSSI value into the MS power control loop for the given logical channel. @@ -110,8 +106,7 @@ chan_state->meas.rssi_got_burst = 1; /* store and process RSSI */ - if (chan_state->meas.rssi_valid_count - == ARRAY_SIZE(chan_state->meas.rssi)) + if (chan_state->meas.rssi_valid_count == ARRAY_SIZE(chan_state->meas.rssi)) return; chan_state->meas.rssi[chan_state->meas.rssi_valid_count++] = rssi; chan_state->meas.rssi_valid_count++; @@ -293,11 +288,7 @@ chan_state->dl_cmr - 1); chan_state->dl_cmr--; } - return; - } - - /* upgrade */ - if (chan_state->dl_cmr < chan_state->codecs - 1) { + } else if (chan_state->dl_cmr < chan_state->codecs - 1) { /* degrade, if ber is above threshold FIXME: C/I*/ if (ber < lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].threshold @@ -307,8 +298,6 @@ chan_state->dl_cmr + 1); chan_state->dl_cmr++; } - - return; } } -- To view, visit https://gerrit.osmocom.org/12290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I819f0c80e90855e8b3252795c837f8e3053b6e87 Gerrit-Change-Number: 12290 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 23 12:45:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 23 Dec 2018 12:45:38 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: explicitly ignore unrelated TRAPs In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12421 ) Change subject: ctrl2cgi: explicitly ignore unrelated TRAPs ...................................................................... ctrl2cgi: explicitly ignore unrelated TRAPs Previously we've tried to determine the type of TRAP and handle as many as possible via generic method dispatcher similar to parent class. Let's make code simpler by explicitly ignoring all but 'location-state' TRAPs. This should also reduce debug log output because we'll only log the TRAP variable for ignored messages instead of entire content. Change-Id: I42b715cb82eb309950ff387649726504b6c7cf61 Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 6 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 2cf386c..bb5c93e 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.0.9" # bump this on every non-trivial change +__version__ = "0.1.0" # bump this on every non-trivial change import argparse, os, logging, logging.handlers, datetime import hashlib @@ -89,11 +89,11 @@ """ Parse CTRL TRAP and dispatch to appropriate handler after normalization """ - self.factory.log.debug('TRAP %s' % v) - t_type = get_type(v) - p = p_h(v) - method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) - method(p(1), p(3), p(5), p(7), get_r(v)) + if get_type(v) == 'location-state': + p = p_h(v) + self.handle_locationstate(p(1), p(3), p(5), p(7), get_r(v)) + else: + self.factory.log.debug('Ignoring TRAP %s' % (v.split()[0])) def ctrl_SET_REPLY(self, data, _, v): """ @@ -126,12 +126,6 @@ # Ensure that we run only limited number of requests in parallel: self.factory.semaphore.run(make_async_req, t, self.factory.location, params, self.transport.write, self.factory.log, self.factory.timeout) - def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): - """ - Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled - """ - self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) - class TrapFactory(IPAFactory): """ -- To view, visit https://gerrit.osmocom.org/12421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I42b715cb82eb309950ff387649726504b6c7cf61 Gerrit-Change-Number: 12421 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 24 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 24 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#349?= Message-ID: <120276379.253.1545664207382.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.10 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:19 +0000 Subject: Change in osmocom-bb[master]: layer23/common/sim.c: don't ignore rc of sim_apdu_send() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12427 Change subject: layer23/common/sim.c: don't ignore rc of sim_apdu_send() ...................................................................... layer23/common/sim.c: don't ignore rc of sim_apdu_send() Change-Id: I8cab7cc72f026947859cc607f65d925803424cf7 --- M src/host/layer23/src/common/sim.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/27/12427/1 diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c index 7f5240d..9d14cd3 100644 --- a/src/host/layer23/src/common/sim.c +++ b/src/host/layer23/src/common/sim.c @@ -186,6 +186,8 @@ /* send APDU to card reader */ static int sim_apdu_send(struct osmocom_ms *ms, uint8_t *data, uint16_t length) { + int rc; + LOGP(DSIM, LOGL_INFO, "sending APDU (class 0x%02x, ins 0x%02x)\n", data[0], data[1]); @@ -203,13 +205,13 @@ * it makes more sense to do it here then in L1CTL */ if (ms->subscr.sim_type == GSM_SIM_TYPE_SAP) { LOGP(DSIM, LOGL_INFO, "Using SAP backend\n"); - osmosap_send_apdu(ms, data, length); + rc = osmosap_send_apdu(ms, data, length); } else { LOGP(DSIM, LOGL_INFO, "Using built-in SIM reader\n"); - l1ctl_tx_sim_req(ms, data, length); + rc = l1ctl_tx_sim_req(ms, data, length); } - return 0; + return rc; } /* dequeue messages (RSL-SAP) */ -- To view, visit https://gerrit.osmocom.org/12427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8cab7cc72f026947859cc607f65d925803424cf7 Gerrit-Change-Number: 12427 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:19 +0000 Subject: Change in osmocom-bb[master]: host/layer23: rename GSM_SIM_TYPE_READER to GSM_SIM_TYPE_L1PHY Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12428 Change subject: host/layer23: rename GSM_SIM_TYPE_READER to GSM_SIM_TYPE_L1PHY ...................................................................... host/layer23: rename GSM_SIM_TYPE_READER to GSM_SIM_TYPE_L1PHY Since we have two ways to interact with a physical SIM: - using built-in SIM reader of the L1 PHY (via L1CTL), - using remote reader via (BT)SAP protocol, name 'GSM_SIM_TYPE_READER' looks quite confusing. Let's rename it in order to explicitly indicate the role of L1 PHY. Change-Id: I0f83f365ed50cfd658fdd3a9d6866ed76c8c4009 --- M src/host/layer23/include/osmocom/bb/mobile/subscriber.h M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/subscriber.c M src/host/layer23/src/mobile/vty_interface.c 5 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/28/12428/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h index ac785d4..958700a 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h @@ -22,7 +22,7 @@ enum { GSM_SIM_TYPE_NONE = 0, - GSM_SIM_TYPE_READER, + GSM_SIM_TYPE_L1PHY, GSM_SIM_TYPE_TEST, GSM_SIM_TYPE_SAP }; diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 84dec86..17c0c76 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -110,7 +110,7 @@ /* insert test card, if enabled */ switch (set->sim_type) { - case GSM_SIM_TYPE_READER: + case GSM_SIM_TYPE_L1PHY: /* trigger sim card reader process */ gsm_subscr_simcard(ms); break; diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index a4bb4e3..388c754 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -49,7 +49,7 @@ sprintf(set->imeisv, "0000000000000000"); /* SIM type */ - set->sim_type = GSM_SIM_TYPE_READER; + set->sim_type = GSM_SIM_TYPE_L1PHY; /* test SIM */ strcpy(set->test_imsi, "001010000000000"); diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 7a01141..097f785 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -711,7 +711,7 @@ uint8_t job; /* skip, if no real valid SIM */ - if (subscr->sim_type != GSM_SIM_TYPE_READER) + if (subscr->sim_type != GSM_SIM_TYPE_L1PHY) return; switch (mode) { @@ -764,7 +764,7 @@ gsm_subscr_exit(ms); gsm_subscr_init(ms); - subscr->sim_type = GSM_SIM_TYPE_READER; + subscr->sim_type = GSM_SIM_TYPE_L1PHY; sprintf(subscr->sim_name, "sim"); subscr->sim_valid = 1; subscr->ustate = GSM_SIM_U2_NOT_UPDATED; @@ -790,7 +790,7 @@ #endif /* skip, if no real valid SIM */ - if (subscr->sim_type != GSM_SIM_TYPE_READER || !subscr->sim_valid) + if (subscr->sim_type != GSM_SIM_TYPE_L1PHY || !subscr->sim_valid) return 0; /* get tail list from "PLMN not allowed" */ @@ -844,7 +844,7 @@ struct gsm1111_ef_loci *loci; /* skip, if no real valid SIM */ - if (subscr->sim_type != GSM_SIM_TYPE_READER || !subscr->sim_valid) + if (subscr->sim_type != GSM_SIM_TYPE_L1PHY || !subscr->sim_valid) return 0; LOGP(DMM, LOGL_INFO, "Updating LOCI on SIM\n"); @@ -907,7 +907,7 @@ struct sim_hdr *nsh; /* not a SIM */ - if ((subscr->sim_type != GSM_SIM_TYPE_READER + if ((subscr->sim_type != GSM_SIM_TYPE_L1PHY && subscr->sim_type != GSM_SIM_TYPE_TEST) || !subscr->sim_valid || no_sim) { struct gsm48_mm_event *nmme; diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index a0ad993..2001b88 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1323,7 +1323,7 @@ case GSM_SIM_TYPE_NONE: vty_out(vty, " sim none%s", VTY_NEWLINE); break; - case GSM_SIM_TYPE_READER: + case GSM_SIM_TYPE_L1PHY: vty_out(vty, " sim reader%s", VTY_NEWLINE); break; case GSM_SIM_TYPE_TEST: @@ -1608,7 +1608,7 @@ set->sim_type = GSM_SIM_TYPE_NONE; break; case 'r': - set->sim_type = GSM_SIM_TYPE_READER; + set->sim_type = GSM_SIM_TYPE_L1PHY; break; case 't': set->sim_type = GSM_SIM_TYPE_TEST; -- To view, visit https://gerrit.osmocom.org/12428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0f83f365ed50cfd658fdd3a9d6866ed76c8c4009 Gerrit-Change-Number: 12428 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:20 +0000 Subject: Change in osmocom-bb[master]: mobile/subscriber.c: consider GSM_SIM_TYPE_SAP too Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12429 Change subject: mobile/subscriber.c: consider GSM_SIM_TYPE_SAP too ...................................................................... mobile/subscriber.c: consider GSM_SIM_TYPE_SAP too There are several SIM card interfaces, two of which: - GSM_SIM_TYPE_L1PHY (using built-in SIM reader of the L1 PHY), - GSM_SIM_TYPE_SAP (using remote reader via (BT)SAP protocol), can actually deal with a physical SIM card. But, for some reason, only GSM_SIM_TYPE_L1PHY was considered as such. Let's also get along with GSM_SIM_TYPE_SAP for the following procedures: - PIN management and verification, - FPLMN / LOCI updating, - A3 authentication. Change-Id: I4b3080fa7a5332467a449a314ba3cc3a07a9b7df --- M src/host/layer23/include/osmocom/bb/mobile/subscriber.h M src/host/layer23/src/mobile/subscriber.c 2 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/29/12429/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h index 958700a..c747af9 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h @@ -20,6 +20,9 @@ #define GSM_IMSI_LENGTH 16 +#define GSM_SIM_IS_READER(type) \ + (type == GSM_SIM_TYPE_L1PHY || type == GSM_SIM_TYPE_SAP) + enum { GSM_SIM_TYPE_NONE = 0, GSM_SIM_TYPE_L1PHY, diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 097f785..7f24d56 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -711,7 +711,7 @@ uint8_t job; /* skip, if no real valid SIM */ - if (subscr->sim_type != GSM_SIM_TYPE_L1PHY) + if (!GSM_SIM_IS_READER(subscr->sim_type)) return; switch (mode) { @@ -790,7 +790,7 @@ #endif /* skip, if no real valid SIM */ - if (subscr->sim_type != GSM_SIM_TYPE_L1PHY || !subscr->sim_valid) + if (!GSM_SIM_IS_READER(subscr->sim_type) || !subscr->sim_valid) return 0; /* get tail list from "PLMN not allowed" */ @@ -844,7 +844,7 @@ struct gsm1111_ef_loci *loci; /* skip, if no real valid SIM */ - if (subscr->sim_type != GSM_SIM_TYPE_L1PHY || !subscr->sim_valid) + if (!GSM_SIM_IS_READER(subscr->sim_type) || !subscr->sim_valid) return 0; LOGP(DMM, LOGL_INFO, "Updating LOCI on SIM\n"); @@ -907,8 +907,7 @@ struct sim_hdr *nsh; /* not a SIM */ - if ((subscr->sim_type != GSM_SIM_TYPE_L1PHY - && subscr->sim_type != GSM_SIM_TYPE_TEST) + if (!GSM_SIM_IS_READER(subscr->sim_type) || !subscr->sim_valid || no_sim) { struct gsm48_mm_event *nmme; -- To view, visit https://gerrit.osmocom.org/12429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4b3080fa7a5332467a449a314ba3cc3a07a9b7df Gerrit-Change-Number: 12429 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:20 +0000 Subject: Change in osmocom-bb[master]: layer23/include/sap_interface.h: use #pragma once Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12430 Change subject: layer23/include/sap_interface.h: use #pragma once ...................................................................... layer23/include/sap_interface.h: use #pragma once Change-Id: I98e407c2b6604438d2495700cb62753ad55369ea --- M src/host/layer23/include/osmocom/bb/common/sap_interface.h 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/30/12430/1 diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index e4e64ce..67e859b 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -1,5 +1,4 @@ -#ifndef _SAP_INTERFACE_H -#define _SAP_INTERFACE_H +#pragma once typedef int (*osmosap_cb_t)(struct msgb *msg, struct osmocom_ms *ms); @@ -70,6 +69,3 @@ uint8_t num_params; struct sap_param *params; }; - - -#endif /* _SAP_INTERFACE_H */ -- To view, visit https://gerrit.osmocom.org/12430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I98e407c2b6604438d2495700cb62753ad55369ea Gerrit-Change-Number: 12430 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:20 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: return rc from osmosap_send_apdu() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12431 Change subject: layer23/sap_interface.c: return rc from osmosap_send_apdu() ...................................................................... layer23/sap_interface.c: return rc from osmosap_send_apdu() Change-Id: I3965843c4d49e31b1b5156d9ee8439eef6ecaab1 --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 10 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/31/12431/1 diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index a32c3aa..23b482a 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -474,10 +474,11 @@ ms->sap_entity.sap_state = SAP_NOT_CONNECTED; } -static void sap_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t len) +static int sap_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t len) { struct msgb *msg; struct sap_param params[1]; + int rc; params[0].id = SAP_COMMAND_APDU; params[0].len = len; @@ -485,16 +486,20 @@ if(ms->sap_entity.sap_state != SAP_IDLE){ LOGP(DSAP, LOGL_ERROR, "Attempting to send APDU request while not being idle.\n"); - return; + return -EIO; } msg = sap_create_msg(SAP_TRANSFER_APDU_REQ, 1, params); if(!msg) - return; + return -ENOMEM; - osmosap_send(ms, msg); + rc = osmosap_send(ms, msg); + if (rc) + return rc; ms->sap_entity.sap_state = SAP_PROCESSING_APDU_REQUEST; + + return 0; } int sap_open(struct osmocom_ms *ms, const char *socket_path) @@ -538,9 +543,7 @@ { //LOGP(DSAP, LOGL_ERROR, "Received the following APDU from sim.c: %s\n" , // osmo_hexdump(data, length)); - sap_apdu(ms, data, length); - - return 0; + return sap_apdu(ms, data, length); } /* register message handler for messages that are sent from L2->L3 */ -- To view, visit https://gerrit.osmocom.org/12431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3965843c4d49e31b1b5156d9ee8439eef6ecaab1 Gerrit-Change-Number: 12431 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:20 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: drop unused osmosap_sapsocket() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12432 Change subject: layer23/sap_interface.c: drop unused osmosap_sapsocket() ...................................................................... layer23/sap_interface.c: drop unused osmosap_sapsocket() Change-Id: Ie3040c75bb61094b9b601aef9d699db603d292f4 --- M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c 2 files changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/32/12432/1 diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index 67e859b..e2aad3f 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -6,7 +6,6 @@ int sap_close(struct osmocom_ms *ms); int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb); -int osmosap_sapsocket(struct osmocom_ms *ms, const char *path); int osmosap_init(struct osmocom_ms *ms); enum osmosap_state { diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 23b482a..b436c75 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -554,15 +554,6 @@ return 0; } -int osmosap_sapsocket(struct osmocom_ms *ms, const char *path) -{ - struct gsm_settings *set = &ms->settings; - memset(set->sap_socket_path, 0, sizeof(set->sap_socket_path)); - osmo_strlcpy(set->sap_socket_path, path, sizeof(set->sap_socket_path) - 1); - - return 0; -} - /* init */ int osmosap_init(struct osmocom_ms *ms) { -- To view, visit https://gerrit.osmocom.org/12432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3040c75bb61094b9b601aef9d699db603d292f4 Gerrit-Change-Number: 12432 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:21 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: remove redundant socket_path argument Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12433 Change subject: layer23/sap_interface.c: remove redundant socket_path argument ...................................................................... layer23/sap_interface.c: remove redundant socket_path argument Change-Id: I408b3e1fa40e9b5daf88fa6ed5f3930b83dffe6f --- M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/mobile/subscriber.c 3 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/33/12433/1 diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index e2aad3f..e78320e 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -2,7 +2,7 @@ typedef int (*osmosap_cb_t)(struct msgb *msg, struct osmocom_ms *ms); -int sap_open(struct osmocom_ms *ms, const char *socket_path); +int sap_open(struct osmocom_ms *ms); int sap_close(struct osmocom_ms *ms); int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb); diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index b436c75..7a42233 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -502,14 +502,15 @@ return 0; } -int sap_open(struct osmocom_ms *ms, const char *socket_path) +int sap_open(struct osmocom_ms *ms) { ssize_t rc; - rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); + rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, + ms->settings.sap_socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { LOGP(DSAP, LOGL_ERROR, "Failed to create unix domain socket %s: %s\n", - socket_path, strerror(-rc)); + ms->settings.sap_socket_path, strerror(-rc)); ms->sap_entity.sap_state = SAP_SOCKET_ERROR; return rc; } diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 7f24d56..b2be554 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -1282,7 +1282,7 @@ /* Try to connect to the SAP interface */ vty_notify(ms, NULL); vty_notify(ms, "Connecting to the SAP interface...\n"); - rc = sap_open(ms, ms->settings.sap_socket_path); + rc = sap_open(ms); if (rc < 0) { LOGP(DSAP, LOGL_ERROR, "Failed during sap_open(), no SAP based SIM reader\n"); vty_notify(ms, "SAP connection error!\n"); -- To view, visit https://gerrit.osmocom.org/12433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I408b3e1fa40e9b5daf88fa6ed5f3930b83dffe6f Gerrit-Change-Number: 12433 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:21 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: use int for rc in sap_open() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12434 Change subject: layer23/sap_interface.c: use int for rc in sap_open() ...................................................................... layer23/sap_interface.c: use int for rc in sap_open() Change-Id: I683f87ae09393c45377c39317b08c613055ceb16 --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/34/12434/1 diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 7a42233..0d42209 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -504,7 +504,7 @@ int sap_open(struct osmocom_ms *ms) { - ssize_t rc; + int rc; rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, ms->settings.sap_socket_path, OSMO_SOCK_F_CONNECT); -- To view, visit https://gerrit.osmocom.org/12434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I683f87ae09393c45377c39317b08c613055ceb16 Gerrit-Change-Number: 12434 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:21 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: use LOGP() instead of fprintf() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12435 Change subject: layer23/sap_interface.c: use LOGP() instead of fprintf() ...................................................................... layer23/sap_interface.c: use LOGP() instead of fprintf() Change-Id: I054be24666fcd5eb8a70cfcac0e7ed566e909b90 --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/35/12435/1 diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 0d42209..dd7737a 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -380,19 +380,19 @@ sap_buffer = talloc_zero_size(NULL, ms->sap_entity.max_msg_size); if(!sap_buffer){ - fprintf(stderr, "Failed to allocate memory\n"); + LOGP(DSAP, LOGL_ERROR, "Failed to allocate memory\n"); return -ENOMEM; } rc = read(fd->fd, sap_buffer, ms->sap_entity.max_msg_size - 1); if (rc < 0) { - fprintf(stderr, "SAP socket failed\n"); + LOGP(DSAP, LOGL_ERROR,"SAP socket failed\n"); msgb_free(msg); sap_close(ms); return rc; } if(rc == 0) { - fprintf(stderr, "SAP socket closed by server\n"); + LOGP(DSAP, LOGL_NOTICE, "SAP socket closed by server\n"); msgb_free(msg); sap_close(ms); return -ECONNREFUSED; -- To view, visit https://gerrit.osmocom.org/12435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I054be24666fcd5eb8a70cfcac0e7ed566e909b90 Gerrit-Change-Number: 12435 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:21 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: drop redundant length check Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12436 Change subject: layer23/sap_interface.c: drop redundant length check ...................................................................... layer23/sap_interface.c: drop redundant length check In sap_read() we read() up to 'max_msg_size' bytes, so this check is redundant and doesn't make any sense. Change-Id: I3be5f0ea742c1ecd3df8c60db0d4de5691b14cfc --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/36/12436/1 diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index dd7737a..69de5bb 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -297,10 +297,6 @@ static void sap_parse_resp(struct osmocom_ms *ms, uint8_t *data, uint16_t len) { struct sap_msg *msg = NULL; - if(len > ms->sap_entity.max_msg_size){ - LOGP(DSAP, LOGL_ERROR, "Read more data than allowed by max_msg_size, ignoring.\n"); - return; - } msg = sap_parse_msg(data); if(!msg){ -- To view, visit https://gerrit.osmocom.org/12436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3be5f0ea742c1ecd3df8c60db0d4de5691b14cfc Gerrit-Change-Number: 12436 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:22 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: drop meaningless call to sap_msg_free() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12437 Change subject: layer23/sap_interface.c: drop meaningless call to sap_msg_free() ...................................................................... layer23/sap_interface.c: drop meaningless call to sap_msg_free() Passing NULL to sap_msg_free() is not only meaningless, but also would result in NULL pointer dereference. Let's fix this. Change-Id: Icf868c4299e292a17c4b7aad1f9e728ea3653494 --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/37/12437/1 diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 69de5bb..2fe7626 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -296,11 +296,11 @@ static void sap_parse_resp(struct osmocom_ms *ms, uint8_t *data, uint16_t len) { - struct sap_msg *msg = NULL; + struct sap_msg *msg; msg = sap_parse_msg(data); - if(!msg){ - sap_msg_free(msg); + if (!msg) { + LOGP(DSAP, LOGL_ERROR, "Failed to parse SAP message\n"); return; } -- To view, visit https://gerrit.osmocom.org/12437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icf868c4299e292a17c4b7aad1f9e728ea3653494 Gerrit-Change-Number: 12437 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:22 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: prettify value_string definitions Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12438 Change subject: layer23/sap_interface.c: prettify value_string definitions ...................................................................... layer23/sap_interface.c: prettify value_string definitions Change-Id: Ib3aa81986987027718e2a8b461afd28787bda4c2 --- M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c 2 files changed, 58 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/38/12438/1 diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index e78320e..b8a3420 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -17,7 +17,7 @@ SAP_PROCESSING_APDU_REQUEST }; -/* BTSAP 1.13 */ +/* Table 5.1: Message Overview */ enum osmosap_msg_type { SAP_CONNECT_REQ = 0x00, SAP_CONNECT_RESP = 0x01, @@ -42,7 +42,7 @@ SAP_SET_TRANSPORT_PROTOCOL_RESP = 0x14 }; -/* BTSAP 5.2 */ +/* Table 5.15: List of Parameter IDs */ enum osmosap_param_type { SAP_MAX_MSG_SIZE = 0x00, SAP_CONNECTION_STATUS = 0x01, diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 2fe7626..635b046 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -47,71 +47,75 @@ static void sap_connect(struct osmocom_ms *ms); +/* Table 5.15: List of Parameter IDs */ static const struct value_string sap_param_names[] = { - {SAP_MAX_MSG_SIZE, "MaxMsgSize"}, - {SAP_CONNECTION_STATUS, "ConnectionStatus"}, - {SAP_RESULT_CODE, "ResultCode"}, - {SAP_DISCONNECTION_TYPE, "DisconnectionType"}, - {SAP_COMMAND_APDU, "CommandAPDU"}, - {SAP_COMMAND_APDU_7816, "CommandAPDU7816"}, - {SAP_RESPONSE_APDU, "ResponseAPDU"}, - {SAP_ATR, "ATR"}, - {SAP_CARD_READER_STATUS, "CardReaderStatus"}, - {SAP_STATUS_CHANGE, "StatusChange"}, - {SAP_TRANSPORT_PROTOCOL, "TransportProtocol"} + { SAP_MAX_MSG_SIZE, "MaxMsgSize" }, + { SAP_CONNECTION_STATUS, "ConnectionStatus" }, + { SAP_RESULT_CODE, "ResultCode" }, + { SAP_DISCONNECTION_TYPE, "DisconnectionType" }, + { SAP_COMMAND_APDU, "CommandAPDU" }, + { SAP_COMMAND_APDU_7816, "CommandAPDU7816" }, + { SAP_RESPONSE_APDU, "ResponseAPDU" }, + { SAP_ATR, "ATR" }, + { SAP_CARD_READER_STATUS, "CardReaderStatus" }, + { SAP_STATUS_CHANGE, "StatusChange" }, + { SAP_TRANSPORT_PROTOCOL, "TransportProtocol" }, }; +/* Table 5.1: Message Overview */ static const struct value_string sap_msg_names[] = { - {SAP_CONNECT_REQ, "CONNECT_REQ"}, - {SAP_CONNECT_RESP, "CONNECT_RESP"}, - {SAP_DISCONNECT_REQ, "DISCONNECT_REQ"}, - {SAP_DISCONNECT_RESP, "DISCONNECT_RESP"}, - {SAP_DISCONNECT_IND, "DISCONNECT_IND"}, - {SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ"}, - {SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP"}, - {SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ"}, - {SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP"}, - {SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ"}, - {SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP"}, - {SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ"}, - {SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP"}, - {SAP_RESET_SIM_REQ, "RESET_SIM_REQ"}, - {SAP_RESET_SIM_RESP, "RESET_SIM_RESP"}, - {SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ"}, - {SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP"}, - {SAP_STATUS_IND, "STATUS_IND"}, - {SAP_ERROR_RESP, "ERROR_RESP"}, - {SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ"}, - {SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP"} + { SAP_CONNECT_REQ, "CONNECT_REQ" }, + { SAP_CONNECT_RESP, "CONNECT_RESP" }, + { SAP_DISCONNECT_REQ, "DISCONNECT_REQ" }, + { SAP_DISCONNECT_RESP, "DISCONNECT_RESP" }, + { SAP_DISCONNECT_IND, "DISCONNECT_IND" }, + { SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ" }, + { SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP" }, + { SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ" }, + { SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP" }, + { SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ" }, + { SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP" }, + { SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ" }, + { SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP" }, + { SAP_RESET_SIM_REQ, "RESET_SIM_REQ" }, + { SAP_RESET_SIM_RESP, "RESET_SIM_RESP" }, + { SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ" }, + { SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP" }, + { SAP_STATUS_IND, "STATUS_IND" }, + { SAP_ERROR_RESP, "ERROR_RESP" }, + { SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ" }, + { SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP" }, }; -/* BTSAP table 5.18 */ +/* Table 5.18: Possible values for ResultCode */ static const struct value_string sap_result_names[] = { - {0, "OK, request processed correctly"}, - {1, "Error, no reason defined"}, - {2, "Error, card not accessible"}, - {3, "Error, card (already) powered off"}, - {4, "Error, card removed"}, - {5, "Error, card already powered on"}, - {6, "Error, data not available"}, - {7, "Error, not supported"} + { 0, "OK, request processed correctly" }, + { 1, "Error, no reason defined" }, + { 2, "Error, card not accessible" }, + { 3, "Error, card (already) powered off" }, + { 4, "Error, card removed" }, + { 5, "Error, card already powered on" }, + { 6, "Error, data not available" }, + { 7, "Error, not supported "}, }; +/* Table 5.19: Possible values for StatusChange */ static const struct value_string sap_status_change_names[] = { - {0, "Unknown Error"}, - {1, "Card reset"}, - {2, "Card not accessible"}, - {3, "Card removed"}, - {4, "Card inserted"}, - {5, "Card recovered"}, + { 0, "Unknown Error" }, + { 1, "Card reset" }, + { 2, "Card not accessible" }, + { 3, "Card removed" }, + { 4, "Card inserted" }, + { 5, "Card recovered" }, }; +/* Table 5.16: Possible values for ConnectionStatus */ static const struct value_string sap_status_names[] = { - {0, "OK, Server can fulfill requirements"}, - {1, "Error, Server unable to establish connection"}, - {2, "Error, Server does not support maximum message size"}, - {3, "Error, maximum message size by Client is too small"}, - {4, "OK, ongoing call"} + { 0, "OK, Server can fulfill requirements" }, + { 1, "Error, Server unable to establish connection" }, + { 2, "Error, Server does not support maximum message size" }, + { 3, "Error, maximum message size by Client is too small" }, + { 4, "OK, ongoing call" }, }; static struct msgb *sap_create_msg(uint8_t id, uint8_t num_params, struct sap_param *params) -- To view, visit https://gerrit.osmocom.org/12438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3aa81986987027718e2a8b461afd28787bda4c2 Gerrit-Change-Number: 12438 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:23 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: define missing enums and use them Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12439 Change subject: layer23/sap_interface.c: define missing enums and use them ...................................................................... layer23/sap_interface.c: define missing enums and use them Change-Id: I4ba5a8a42bf25d04b152ac3f1f0e4d7eac7f068f --- M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c 2 files changed, 50 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/39/12439/1 diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index b8a3420..36aa145 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -57,6 +57,37 @@ SAP_TRANSPORT_PROTOCOL = 0x09 }; +/* Table 5.18: Possible values for ResultCode */ +enum sap_result_type { + SAP_RESULT_OK_REQ_PROC_CORR = 0x00, + SAP_RESULT_ERROR_NO_REASON = 0x01, + SAP_RESULT_ERROR_CARD_NOT_ACC = 0x02, + SAP_RESULT_ERROR_CARD_POWERED_OFF = 0x03, + SAP_RESULT_ERROR_CARD_REMOVED = 0x04, + SAP_RESULT_ERROR_CARD_POWERED_ON = 0x05, + SAP_RESULT_ERROR_DATA_UNAVAIL = 0x06, + SAP_RESULT_ERROR_NOT_SUPPORTED = 0x07, +}; + +/* Table 5.19: Possible values for StatusChange */ +enum sap_status_chg_type { + SAP_STATUS_CHG_UNKNOWN_ERROR = 0x00, + SAP_STATUS_CHG_CARD_RESET = 0x01, + SAP_STATUS_CHG_CARD_NOT_ACC = 0x02, + SAP_STATUS_CHG_CARD_REMOVED = 0x03, + SAP_STATUS_CHG_CARD_INSERTED = 0x04, + SAP_STATUS_CHG_CARD_RECOVERED = 0x05, +}; + +/* Table 5.16: Possible values for ConnectionStatus */ +enum sap_conn_status_type { + SAP_CONN_STATUS_OK_READY = 0x00, + SAP_CONN_STATUS_ERROR_CONN = 0x01, + SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE = 0x02, + SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE = 0x03, + SAP_CONN_STATUS_OK_CALL = 0x04, +}; + struct sap_param { uint8_t id; uint16_t len; diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 635b046..2875d55 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -89,33 +89,33 @@ /* Table 5.18: Possible values for ResultCode */ static const struct value_string sap_result_names[] = { - { 0, "OK, request processed correctly" }, - { 1, "Error, no reason defined" }, - { 2, "Error, card not accessible" }, - { 3, "Error, card (already) powered off" }, - { 4, "Error, card removed" }, - { 5, "Error, card already powered on" }, - { 6, "Error, data not available" }, - { 7, "Error, not supported "}, + { SAP_RESULT_OK_REQ_PROC_CORR, "OK, request processed correctly" }, + { SAP_RESULT_ERROR_NO_REASON, "Error, no reason defined" }, + { SAP_RESULT_ERROR_CARD_NOT_ACC, "Error, card not accessible" }, + { SAP_RESULT_ERROR_CARD_POWERED_OFF, "Error, card (already) powered off" }, + { SAP_RESULT_ERROR_CARD_REMOVED, "Error, card removed" }, + { SAP_RESULT_ERROR_CARD_POWERED_ON, "Error, card already powered on" }, + { SAP_RESULT_ERROR_DATA_UNAVAIL, "Error, data not available" }, + { SAP_RESULT_ERROR_NOT_SUPPORTED, "Error, not supported "} }; /* Table 5.19: Possible values for StatusChange */ static const struct value_string sap_status_change_names[] = { - { 0, "Unknown Error" }, - { 1, "Card reset" }, - { 2, "Card not accessible" }, - { 3, "Card removed" }, - { 4, "Card inserted" }, - { 5, "Card recovered" }, + { SAP_STATUS_CHG_UNKNOWN_ERROR, "Unknown Error" }, + { SAP_STATUS_CHG_CARD_RESET, "Card reset" }, + { SAP_STATUS_CHG_CARD_NOT_ACC, "Card not accessible" }, + { SAP_STATUS_CHG_CARD_REMOVED, "Card removed" }, + { SAP_STATUS_CHG_CARD_INSERTED, "Card inserted" }, + { SAP_STATUS_CHG_CARD_RECOVERED, "Card recovered" }, }; /* Table 5.16: Possible values for ConnectionStatus */ static const struct value_string sap_status_names[] = { - { 0, "OK, Server can fulfill requirements" }, - { 1, "Error, Server unable to establish connection" }, - { 2, "Error, Server does not support maximum message size" }, - { 3, "Error, maximum message size by Client is too small" }, - { 4, "OK, ongoing call" }, + { SAP_CONN_STATUS_OK_READY, "OK, Server can fulfill requirements" }, + { SAP_CONN_STATUS_ERROR_CONN, "Error, Server unable to establish connection" }, + { SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE, "Error, Server does not support maximum message size" }, + { SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE, "Error, maximum message size by Client is too small" }, + { SAP_CONN_STATUS_OK_CALL, "OK, ongoing call" }, }; static struct msgb *sap_create_msg(uint8_t id, uint8_t num_params, struct sap_param *params) -- To view, visit https://gerrit.osmocom.org/12439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4ba5a8a42bf25d04b152ac3f1f0e4d7eac7f068f Gerrit-Change-Number: 12439 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:23 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: drop optional SAP message handler Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12440 Change subject: layer23/sap_interface.c: drop optional SAP message handler ...................................................................... layer23/sap_interface.c: drop optional SAP message handler Change-Id: Ib5baa3785f478c762cbb0836d4f85b826b55c9ea --- M src/host/layer23/include/osmocom/bb/common/osmocom_data.h M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c 3 files changed, 0 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/40/12440/1 diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h index 486c36d..0399f5f 100644 --- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h +++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h @@ -23,7 +23,6 @@ #include struct osmosap_entity { - osmosap_cb_t msg_handler; uint8_t sap_state; uint16_t max_msg_size; }; diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index 36aa145..78e3846 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -1,11 +1,8 @@ #pragma once -typedef int (*osmosap_cb_t)(struct msgb *msg, struct osmocom_ms *ms); - int sap_open(struct osmocom_ms *ms); int sap_close(struct osmocom_ms *ms); int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); -int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb); int osmosap_init(struct osmocom_ms *ms); enum osmosap_state { diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 2875d55..c31d07b 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -405,9 +405,6 @@ talloc_free(sap_buffer); - if (ms->sap_entity.msg_handler){ - ms->sap_entity.msg_handler(msg, ms); - } return 0; } @@ -547,14 +544,6 @@ return sap_apdu(ms, data, length); } -/* register message handler for messages that are sent from L2->L3 */ -int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb) -{ - ms->sap_entity.msg_handler = cb; - - return 0; -} - /* init */ int osmosap_init(struct osmocom_ms *ms) { -- To view, visit https://gerrit.osmocom.org/12440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5baa3785f478c762cbb0836d4f85b826b55c9ea Gerrit-Change-Number: 12440 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 24 22:09:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 24 Dec 2018 22:09:23 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: reimplement SAP interface Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12441 Change subject: layer23/sap_interface.c: reimplement SAP interface ...................................................................... layer23/sap_interface.c: reimplement SAP interface Change-Id: I77bb108615bb2c94c441568f195b04e0a5421643 --- M src/host/layer23/include/osmocom/bb/common/Makefile.am M src/host/layer23/include/osmocom/bb/common/osmocom_data.h A src/host/layer23/include/osmocom/bb/common/sap_fsm.h M src/host/layer23/include/osmocom/bb/common/sap_interface.h A src/host/layer23/include/osmocom/bb/common/sap_proto.h M src/host/layer23/include/osmocom/bb/mobile/subscriber.h M src/host/layer23/src/common/Makefile.am A src/host/layer23/src/common/sap_fsm.c M src/host/layer23/src/common/sap_interface.c A src/host/layer23/src/common/sap_proto.c M src/host/layer23/src/common/sim.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/subscriber.c 13 files changed, 1,342 insertions(+), 562 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/41/12441/1 diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am index cd3437e..d66be98 100644 --- a/src/host/layer23/include/osmocom/bb/common/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -1,2 +1,3 @@ noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h logging.h \ - networks.h gps.h sysinfo.h osmocom_data.h utils.h + networks.h gps.h sysinfo.h osmocom_data.h utils.h \ + sap_proto.h sap_fsm.h sap_interface.h diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h index 0399f5f..9bbacd8 100644 --- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h +++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h @@ -23,8 +23,17 @@ #include struct osmosap_entity { - uint8_t sap_state; + struct osmo_fsm_inst *fi; uint16_t max_msg_size; + uint8_t card_status; + + /* Optional (connection state) event call-backs */ + sap_idle_cb_t idle_cb; + sap_rel_cb_t rel_cb; + + /* Optional (ATR, APDU) event call-backs */ + sap_apdu_cb_t apdu_cb; + sap_atr_cb_t atr_cb; }; struct osmol1_entity { diff --git a/src/host/layer23/include/osmocom/bb/common/sap_fsm.h b/src/host/layer23/include/osmocom/bb/common/sap_fsm.h new file mode 100644 index 0000000..797e023 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/common/sap_fsm.h @@ -0,0 +1,32 @@ +#pragma once + +#include + +/* How long should we wait for connection establishment */ +#define SAP_FSM_CONN_EST_TIMEOUT 5 +#define SAP_FSM_CONN_EST_T 0 + +/* How long should we wait for connection release */ +#define SAP_FSM_CONN_REL_TIMEOUT 3 +#define SAP_FSM_CONN_REL_T 1 + +/* How long should we wait for request to complete */ +#define SAP_FSM_PROC_REQ_TIMEOUT 5 +#define SAP_FSM_PROC_REQ_T 2 + +enum sap_fsm_state { + SAP_STATE_NOT_CONNECTED, + SAP_STATE_CONNECTING, + SAP_STATE_DISCONNECTING, /* Auxiliary state (not from specs) */ + SAP_STATE_WAIT_FOR_CARD, /* Auxiliary state (not from specs) */ + SAP_STATE_IDLE, + SAP_STATE_PROC_ATR_REQ, + SAP_STATE_PROC_APDU_REQ, + SAP_STATE_PROC_RESET_REQ, + SAP_STATE_PROC_STATUS_REQ, + SAP_STATE_PROC_SET_TP_REQ, + SAP_STATE_PROC_POWERON_REQ, + SAP_STATE_PROC_POWEROFF_REQ, +}; + +int sap_fsm_alloc(struct osmocom_ms *ms); diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index 78e3846..bde6822 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -1,98 +1,24 @@ #pragma once +#include + +#include +#include + +typedef int (*sap_idle_cb_t)(struct osmocom_ms *ms); +typedef int (*sap_rel_cb_t)(struct osmocom_ms *ms); + +typedef int (*sap_apdu_cb_t)(struct osmocom_ms *ms, struct msgb *msg); +typedef int (*sap_atr_cb_t)(struct osmocom_ms *ms, + const uint8_t *atr, uint16_t atr_len); + +void sap_init(struct osmocom_ms *ms); int sap_open(struct osmocom_ms *ms); int sap_close(struct osmocom_ms *ms); -int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); -int osmosap_init(struct osmocom_ms *ms); +int _sap_close_sock(struct osmocom_ms *ms); -enum osmosap_state { - SAP_SOCKET_ERROR, - SAP_NOT_CONNECTED, - SAP_IDLE, - SAP_CONNECTION_UNDER_NEGOTIATION, - SAP_PROCESSING_ATR_REQUEST, - SAP_PROCESSING_APDU_REQUEST -}; +int sap_send_poweron_req(struct osmocom_ms *ms); +int sap_send_poweroff_req(struct osmocom_ms *ms); -/* Table 5.1: Message Overview */ -enum osmosap_msg_type { - SAP_CONNECT_REQ = 0x00, - SAP_CONNECT_RESP = 0x01, - SAP_DISCONNECT_REQ = 0x02, - SAP_DISCONNECT_RESP = 0x03, - SAP_DISCONNECT_IND = 0x04, - SAP_TRANSFER_APDU_REQ = 0x05, - SAP_TRANSFER_APDU_RESP = 0x06, - SAP_TRANSFER_ATR_REQ = 0x07, - SAP_TRANSFER_ATR_RESP = 0x08, - SAP_POWER_SIM_OFF_REQ = 0x09, - SAP_POWER_SIM_OFF_RESP = 0x0A, - SAP_POWER_SIM_ON_REQ = 0x0B, - SAP_POWER_SIM_ON_RESP = 0x0C, - SAP_RESET_SIM_REQ = 0x0D, - SAP_RESET_SIM_RESP = 0x0E, - SAP_TRANSFER_CARD_READER_STATUS_REQ = 0x0F, - SAP_TRANSFER_CARD_READER_STATUS_RESP = 0x10, - SAP_STATUS_IND = 0x11, - SAP_ERROR_RESP = 0x12, - SAP_SET_TRANSPORT_PROTOCOL_REQ = 0x13, - SAP_SET_TRANSPORT_PROTOCOL_RESP = 0x14 -}; - -/* Table 5.15: List of Parameter IDs */ -enum osmosap_param_type { - SAP_MAX_MSG_SIZE = 0x00, - SAP_CONNECTION_STATUS = 0x01, - SAP_RESULT_CODE = 0x02, - SAP_DISCONNECTION_TYPE = 0x03, - SAP_COMMAND_APDU = 0x04, - SAP_COMMAND_APDU_7816 = 0x10, - SAP_RESPONSE_APDU = 0x05, - SAP_ATR = 0x06, - SAP_CARD_READER_STATUS = 0x07, - SAP_STATUS_CHANGE = 0x08, - SAP_TRANSPORT_PROTOCOL = 0x09 -}; - -/* Table 5.18: Possible values for ResultCode */ -enum sap_result_type { - SAP_RESULT_OK_REQ_PROC_CORR = 0x00, - SAP_RESULT_ERROR_NO_REASON = 0x01, - SAP_RESULT_ERROR_CARD_NOT_ACC = 0x02, - SAP_RESULT_ERROR_CARD_POWERED_OFF = 0x03, - SAP_RESULT_ERROR_CARD_REMOVED = 0x04, - SAP_RESULT_ERROR_CARD_POWERED_ON = 0x05, - SAP_RESULT_ERROR_DATA_UNAVAIL = 0x06, - SAP_RESULT_ERROR_NOT_SUPPORTED = 0x07, -}; - -/* Table 5.19: Possible values for StatusChange */ -enum sap_status_chg_type { - SAP_STATUS_CHG_UNKNOWN_ERROR = 0x00, - SAP_STATUS_CHG_CARD_RESET = 0x01, - SAP_STATUS_CHG_CARD_NOT_ACC = 0x02, - SAP_STATUS_CHG_CARD_REMOVED = 0x03, - SAP_STATUS_CHG_CARD_INSERTED = 0x04, - SAP_STATUS_CHG_CARD_RECOVERED = 0x05, -}; - -/* Table 5.16: Possible values for ConnectionStatus */ -enum sap_conn_status_type { - SAP_CONN_STATUS_OK_READY = 0x00, - SAP_CONN_STATUS_ERROR_CONN = 0x01, - SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE = 0x02, - SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE = 0x03, - SAP_CONN_STATUS_OK_CALL = 0x04, -}; - -struct sap_param { - uint8_t id; - uint16_t len; - uint8_t *value; -}; - -struct sap_msg { - uint8_t id; - uint8_t num_params; - struct sap_param *params; -}; +int sap_send_atr_req(struct osmocom_ms *ms); +int sap_send_apdu(struct osmocom_ms *ms, uint8_t *apdu, uint16_t apdu_len); diff --git a/src/host/layer23/include/osmocom/bb/common/sap_proto.h b/src/host/layer23/include/osmocom/bb/common/sap_proto.h new file mode 100644 index 0000000..1c3b2d5 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/common/sap_proto.h @@ -0,0 +1,121 @@ +#pragma once + +#include + +#include +#include + +/* Table 5.1: Message Overview + * NOTE: messages are used as events for SAP FSM */ +enum sap_msg_type { + SAP_CONNECT_REQ = 0x00, + SAP_CONNECT_RESP = 0x01, + SAP_DISCONNECT_REQ = 0x02, + SAP_DISCONNECT_RESP = 0x03, + SAP_DISCONNECT_IND = 0x04, + SAP_TRANSFER_APDU_REQ = 0x05, + SAP_TRANSFER_APDU_RESP = 0x06, + SAP_TRANSFER_ATR_REQ = 0x07, + SAP_TRANSFER_ATR_RESP = 0x08, + SAP_POWER_SIM_OFF_REQ = 0x09, + SAP_POWER_SIM_OFF_RESP = 0x0A, + SAP_POWER_SIM_ON_REQ = 0x0B, + SAP_POWER_SIM_ON_RESP = 0x0C, + SAP_RESET_SIM_REQ = 0x0D, + SAP_RESET_SIM_RESP = 0x0E, + SAP_TRANSFER_CARD_READER_STATUS_REQ = 0x0F, + SAP_TRANSFER_CARD_READER_STATUS_RESP = 0x10, + SAP_STATUS_IND = 0x11, + SAP_ERROR_RESP = 0x12, + SAP_SET_TRANSPORT_PROTOCOL_REQ = 0x13, + SAP_SET_TRANSPORT_PROTOCOL_RESP = 0x14 +}; + +/* Table 5.15: List of Parameter IDs */ +enum sap_param_type { + SAP_MAX_MSG_SIZE = 0x00, + SAP_CONNECTION_STATUS = 0x01, + SAP_RESULT_CODE = 0x02, + SAP_DISCONNECTION_TYPE = 0x03, + SAP_COMMAND_APDU = 0x04, + SAP_COMMAND_APDU_7816 = 0x10, + SAP_RESPONSE_APDU = 0x05, + SAP_ATR = 0x06, + SAP_CARD_READER_STATUS = 0x07, + SAP_STATUS_CHANGE = 0x08, + SAP_TRANSPORT_PROTOCOL = 0x09 +}; + +/* Table 5.18: Possible values for ResultCode */ +enum sap_result_type { + SAP_RESULT_OK_REQ_PROC_CORR = 0x00, + SAP_RESULT_ERROR_NO_REASON = 0x01, + SAP_RESULT_ERROR_CARD_NOT_ACC = 0x02, + SAP_RESULT_ERROR_CARD_POWERED_OFF = 0x03, + SAP_RESULT_ERROR_CARD_REMOVED = 0x04, + SAP_RESULT_ERROR_CARD_POWERED_ON = 0x05, + SAP_RESULT_ERROR_DATA_UNAVAIL = 0x06, + SAP_RESULT_ERROR_NOT_SUPPORTED = 0x07, +}; + +/* Table 5.19: Possible values for StatusChange */ +enum sap_card_status_type { + SAP_CARD_STATUS_UNKNOWN_ERROR = 0x00, + SAP_CARD_STATUS_CARD_RESET = 0x01, + SAP_CARD_STATUS_CARD_NOT_ACC = 0x02, + SAP_CARD_STATUS_CARD_REMOVED = 0x03, + SAP_CARD_STATUS_CARD_INSERTED = 0x04, + SAP_CARD_STATUS_CARD_RECOVERED = 0x05, +}; + +/* Table 5.16: Possible values for ConnectionStatus */ +enum sap_conn_status_type { + SAP_CONN_STATUS_OK_READY = 0x00, + SAP_CONN_STATUS_ERROR_CONN = 0x01, + SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE = 0x02, + SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE = 0x03, + SAP_CONN_STATUS_OK_CALL = 0x04, +}; + +extern const struct value_string sap_param_names[]; +extern const struct value_string sap_msg_names[]; +extern const struct value_string sap_result_names[]; +extern const struct value_string sap_card_status_names[]; +extern const struct value_string sap_conn_status_names[]; + +/* Figure 5.2: Payload Coding */ +struct sap_param { + /* Parameter ID, see \ref enum sap_param_type */ + uint8_t param_id; + /* Reserved for further use (shall be set to 0x00) */ + uint8_t reserved[1]; + /* Parameter length */ + uint16_t length; + /* Parameter value (and optional padding) */ + uint8_t value[0]; +} __attribute__((packed)); + +/* Figure 5.1 Message Format */ +struct sap_message { + /* Message ID, see \ref enum sap_msg_type */ + uint8_t msg_id; + /* Number of parameters */ + uint8_t num_params; + /* Reserved for further use (shall be set to 0x00) */ + uint8_t reserved[2]; + /* Payload, see \ref struct sap_param */ + uint8_t payload[0]; +} __attribute__((packed)); + +#define GSM_SAP_LENGTH 300 +#define GSM_SAP_HEADROOM 32 + +struct msgb *sap_msgb_alloc(uint8_t msg_id); +const struct sap_message *sap_msg_parse(const uint8_t *buf, size_t buf_len); +int sap_check_result_code(const struct sap_message *sap_msg); + +void sap_msgb_add_param(struct msgb *msg, + enum sap_param_type param_type, + uint16_t param_len, uint8_t *param_value); +struct sap_param *sap_get_param(const struct sap_message *sap_msg, + enum sap_param_type param_type, uint16_t *param_len); diff --git a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h index c747af9..37b6db7 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h @@ -93,6 +93,7 @@ int gsm_subscr_sapcard(struct osmocom_ms *ms); int gsm_subscr_remove_sapcard(struct osmocom_ms *ms); int gsm_subscr_simcard(struct osmocom_ms *ms); +int subscr_sim_request(struct osmocom_ms *ms); void gsm_subscr_sim_pin(struct osmocom_ms *ms, char *pin1, char *pin2, int8_t mode); int gsm_subscr_write_loci(struct osmocom_ms *ms); diff --git a/src/host/layer23/src/common/Makefile.am b/src/host/layer23/src/common/Makefile.am index b76094c..a8d9f7e 100644 --- a/src/host/layer23/src/common/Makefile.am +++ b/src/host/layer23/src/common/Makefile.am @@ -2,5 +2,5 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBGPS_CFLAGS) noinst_LIBRARIES = liblayer23.a -liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_interface.c \ +liblayer23_a_SOURCES = l1ctl.c l1l2_interface.c sap_fsm.c sap_proto.c sap_interface.c \ logging.c networks.c sim.c sysinfo.c gps.c l1ctl_lapdm_glue.c utils.c diff --git a/src/host/layer23/src/common/sap_fsm.c b/src/host/layer23/src/common/sap_fsm.c new file mode 100644 index 0000000..94a46a7 --- /dev/null +++ b/src/host/layer23/src/common/sap_fsm.c @@ -0,0 +1,679 @@ +/* + * SAP (SIM Access Profile) FSM definition + * based on Bluetooth SAP specification + * + * (C) 2018 by Vadim Yanitskiy + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include + +#include +#include +#include + +/*! Send encoded SAP message to the Server + * \param[in] ms MS instance with active SAP connection + * \param[in] msg encoded SAP message buffer + * \returns 0 in case of success, negative in case of error + */ +static int sap_send_msgb(struct osmocom_ms *ms, struct msgb *msg) +{ + int rc; + + rc = osmo_wqueue_enqueue(&ms->sap_wq, msg); + if (rc) { + LOGP(DSAP, LOGL_ERROR, "Failed to enqueue SAP message\n"); + msgb_free(msg); + return rc; + } + + return 0; +} + +static void sap_fsm_tear_down(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + + /* Flush buffers, close socket */ + _sap_close_sock(ms); + + /* Call release call-back (if present) */ + if (ms->sap_entity.rel_cb) + ms->sap_entity.rel_cb(ms); + + /* Trigger self-destruction :/ */ + osmo_fsm_inst_free(ms->sap_entity.fi); + ms->sap_entity.fi = NULL; +} + +static void sap_fsm_connect(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + struct msgb *msg; + uint16_t size; + + /* Section 5.1.1, CONNECT_REQ */ + msg = sap_msgb_alloc(SAP_CONNECT_REQ); + if (!msg) + return; + + /* Section 4.1.1, start MaxMsgSize negotiation */ + size = htons(ms->sap_entity.max_msg_size); + sap_msgb_add_param(msg, SAP_MAX_MSG_SIZE, + sizeof(size), (uint8_t *) &size); + + sap_send_msgb(ms, msg); +} + +static void sap_negotiate_msg_size(struct osmosap_entity *sap, + const struct sap_message *sap_msg) +{ + uint16_t size, param_len; + const char *cause = NULL; + struct sap_param *param; + + param = sap_get_param(sap_msg, SAP_MAX_MSG_SIZE, ¶m_len); + if (!param) { + cause = "missing expected MaxMsgSize parameter"; + goto error; + } + if (param_len != sizeof(size)) { + cause = "MaxMsgSize parameter has wrong length"; + goto error; + } + + /* Parse MaxMsgSize suggested by server */ + size = ntohs((uint16_t *) param->value); + if (size > SAP_MAX_MSG_SIZE) { + cause = "suggested MaxMsgSize is too big for us"; + goto error; + } + + /* Attempt to initiate connection again */ + sap->max_msg_size = size; + sap_fsm_connect(sap->fi, sap->fi->state); + return; + +error: + LOGP(DSAP, LOGL_ERROR, "MaxMsgSize negotiation failed: %s\n", cause); + osmo_fsm_inst_state_chg(sap->fi, SAP_STATE_NOT_CONNECTED, 0, 0); +} + +static void sap_fsm_conn_handler(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + const struct sap_message *sap_msg = (const struct sap_message *) data; + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + struct sap_param *param; + uint16_t param_len; + uint8_t status; + + /* Section 5.1.2, CONNECT_RESP */ + param = sap_get_param(sap_msg, SAP_CONNECTION_STATUS, ¶m_len); + if (!param || param_len != sizeof(status)) { + LOGP(DSAP, LOGL_ERROR, "Missing mandatory connection status\n"); + osmo_fsm_inst_state_chg(fi, SAP_STATE_NOT_CONNECTED, 0, 0); + return; + } + + /* Parse connection status */ + status = param->value[0]; + + LOGP(DSAP, LOGL_INFO, "SAP connection status (0x%02x): %s\n", + status, get_value_string(sap_conn_status_names, status)); + + switch (status) { + case SAP_CONN_STATUS_OK_CALL: + ms->sap_entity.card_status = SAP_CARD_STATUS_CARD_NOT_ACC; + /* fall-through */ + case SAP_CONN_STATUS_OK_READY: + osmo_fsm_inst_state_chg(fi, SAP_STATE_WAIT_FOR_CARD, 0, 0); + break; + + case SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE: + case SAP_CONN_STATUS_ERROR_CONN: + osmo_fsm_inst_state_chg(fi, SAP_STATE_NOT_CONNECTED, 0, 0); + break; + + /* Section 4.1.1, MaxMsgSize negotiation */ + case SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE: + sap_negotiate_msg_size(&ms->sap_entity, sap_msg); + break; + } +} + +static void sap_fsm_conn_release(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + struct msgb *msg; + + LOGP(DSAP, LOGL_DEBUG, "Client initiated connection release\n"); + + /* We don't care about possible allocating / sending errors */ + msg = sap_msgb_alloc(SAP_DISCONNECT_REQ); + if (msg != NULL) + sap_send_msgb(ms, msg); +} + +static void sap_fsm_release_handler(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + LOGP(DSAP, LOGL_DEBUG, "Client initiated release complete\n"); + osmo_fsm_inst_state_chg(fi, SAP_STATE_NOT_CONNECTED, 0, 0); +} + +static void sap_fsm_idle_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + switch (prev_state) { + case SAP_STATE_CONNECTING: + case SAP_STATE_WAIT_FOR_CARD: + /* Sent ATR request (required by the specs) */ + sap_send_atr_req((struct osmocom_ms *) fi->priv); + break; + default: + /* Do nothing */ + break; + } +} + +static void sap_fsm_idle_handler(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + struct msgb *msg = (struct msgb *) data; + enum sap_fsm_state state; + int rc; + + /* Map event to the corresponding state */ + switch (event) { + case SAP_TRANSFER_ATR_REQ: + state = SAP_STATE_PROC_ATR_REQ; + break; + case SAP_TRANSFER_APDU_REQ: + state = SAP_STATE_PROC_APDU_REQ; + break; + case SAP_RESET_SIM_REQ: + state = SAP_STATE_PROC_RESET_REQ; + break; + case SAP_TRANSFER_CARD_READER_STATUS_REQ: + state = SAP_STATE_PROC_STATUS_REQ; + break; + case SAP_SET_TRANSPORT_PROTOCOL_REQ: + state = SAP_STATE_PROC_SET_TP_REQ; + break; + case SAP_POWER_SIM_ON_REQ: + state = SAP_STATE_PROC_POWERON_REQ; + break; + case SAP_POWER_SIM_OFF_REQ: + state = SAP_STATE_PROC_POWEROFF_REQ; + break; + default: + /* Shall not happen */ + OSMO_ASSERT(0); + } + + rc = sap_send_msgb(ms, msg); + if (rc) + return; + + osmo_fsm_inst_state_chg(fi, state, + SAP_FSM_PROC_REQ_TIMEOUT, SAP_FSM_PROC_REQ_T); +} + +static void sap_fsm_proc_atr_handler(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + const struct sap_message *sap_msg = (const struct sap_message *) data; + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + struct sap_param *param; + uint16_t param_len; + int rc; + + if (event != SAP_TRANSFER_ATR_RESP) { + LOGP(DSAP, LOGL_ERROR, "Event unhandled (yet)\n"); + return; + } + + /* We're done with ATR request now */ + osmo_fsm_inst_state_chg(fi, SAP_STATE_IDLE, 0, 0); + + /* Check the ResultCode */ + rc = sap_check_result_code(sap_msg); + if (rc != SAP_RESULT_OK_REQ_PROC_CORR) { + LOGP(DSAP, LOGL_NOTICE, "Bad ResultCode: '%s'\n", + get_value_string(sap_result_names, rc)); + return; + } + + param = sap_get_param(sap_msg, SAP_ATR, ¶m_len); + if (!param) { + LOGP(DSAP, LOGL_ERROR, "Missing mandatory '%s' parameter\n", + get_value_string(sap_param_names, SAP_ATR)); + return; + } + + LOGP(DSAP, LOGL_DEBUG, "RX ATR response: %s\n", + osmo_hexdump(param->value, param_len)); + + /* Forward to ATR handler (if present) */ + if (ms->sap_entity.atr_cb) + ms->sap_entity.atr_cb(ms, param->value, param_len); + + /* We are ready to process APDU requests now */ + if (ms->sap_entity.idle_cb) + ms->sap_entity.idle_cb(ms); +} + +static void sap_fsm_proc_apdu_handler(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + const struct sap_message *sap_msg = (const struct sap_message *) data; + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + struct sap_param *param; + uint16_t param_len; + struct msgb *msg; + uint8_t *apdu; + int rc; + + if (event != SAP_TRANSFER_APDU_RESP) { + LOGP(DSAP, LOGL_ERROR, "Event unhandled (yet)\n"); + return; + } + + /* We're done with APDU request now */ + osmo_fsm_inst_state_chg(fi, SAP_STATE_IDLE, 0, 0); + + /* Check the ResultCode */ + rc = sap_check_result_code(sap_msg); + if (rc != SAP_RESULT_OK_REQ_PROC_CORR) { + LOGP(DSAP, LOGL_NOTICE, "Bad ResultCode: '%s'\n", + get_value_string(sap_result_names, rc)); + return; + } + + param = sap_get_param(sap_msg, SAP_RESPONSE_APDU, ¶m_len); + if (!param) { + LOGP(DSAP, LOGL_ERROR, "Missing mandatory '%s' parameter\n", + get_value_string(sap_param_names, SAP_RESPONSE_APDU)); + return; + } + + /* Forward to APDU handler (if present) */ + if (!ms->sap_entity.apdu_cb) { + LOGP(DSAP, LOGL_NOTICE, "No handler set, response APDU ignored\n"); + return; + } + + /* FIXME: why do we use this length?!? */ + msg = msgb_alloc(GSM_SAP_LENGTH, "sim_apdu"); + if (!msg) { + LOGP(DSAP, LOGL_ERROR, "Failed to allocate memory\n"); + return; + } + + apdu = msgb_put(msg, param_len); + memcpy(apdu, param->value, param_len); + + /* Forward to APDU handler (if present) */ + LOGP(DSAP, LOGL_DEBUG, "Forwarding APDU to the handler\n"); + ms->sap_entity.apdu_cb(ms, msg); +} + +/* Generates mask for a single state or event */ +#define S(x) (1 << x) + +/* Figure 4.13: Simplified State Machine */ +static const struct osmo_fsm_state sap_fsm_states[] = { + [SAP_STATE_NOT_CONNECTED] = { + .name = "NOT_CONNECTED", + .out_state_mask = S(SAP_STATE_CONNECTING), + .onenter = &sap_fsm_tear_down, + }, + [SAP_STATE_CONNECTING] = { + .name = "CONNECTING", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_WAIT_FOR_CARD), + .in_event_mask = S(SAP_CONNECT_RESP), + .onenter = &sap_fsm_connect, + .action = &sap_fsm_conn_handler, + }, + /* NOTE: this is a custom state (i.e. not defined by the specs). + * We need it in order to do release procedure correctly. */ + [SAP_STATE_DISCONNECTING] = { + .name = "DISCONNECTING", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED), + .in_event_mask = S(SAP_DISCONNECT_RESP), + .onenter = &sap_fsm_conn_release, + .action = &sap_fsm_release_handler, + }, + /* NOTE: this is a custom state (i.e. not defined by the specs). + * We need it in order to wait until SIM card becomes available. + * SAP_STATUS_IND event is handled by sap_fsm_allstate_action(). */ + [SAP_STATE_WAIT_FOR_CARD] = { + .name = "WAIT_FOR_CARD", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_IDLE), + }, + [SAP_STATE_IDLE] = { + .name = "IDLE", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_PROC_APDU_REQ) + | S(SAP_STATE_PROC_ATR_REQ) + | S(SAP_STATE_PROC_RESET_REQ) + | S(SAP_STATE_PROC_STATUS_REQ) + | S(SAP_STATE_PROC_SET_TP_REQ) + | S(SAP_STATE_PROC_POWERON_REQ) + | S(SAP_STATE_PROC_POWEROFF_REQ), + .in_event_mask = S(SAP_TRANSFER_ATR_REQ) + | S(SAP_TRANSFER_APDU_REQ) + | S(SAP_RESET_SIM_REQ) + | S(SAP_TRANSFER_CARD_READER_STATUS_REQ) + | S(SAP_SET_TRANSPORT_PROTOCOL_REQ) + | S(SAP_POWER_SIM_ON_REQ) + | S(SAP_POWER_SIM_OFF_REQ), + .onenter = &sap_fsm_idle_enter, + .action = &sap_fsm_idle_handler, + }, + [SAP_STATE_PROC_ATR_REQ] = { + .name = "PROC_ATR_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE) + | S(SAP_STATE_PROC_RESET_REQ) + | S(SAP_STATE_PROC_POWEROFF_REQ), + .in_event_mask = S(SAP_TRANSFER_ATR_RESP) + | S(SAP_RESET_SIM_REQ) + | S(SAP_POWER_SIM_OFF_REQ), + .action = &sap_fsm_proc_atr_handler, + }, + [SAP_STATE_PROC_APDU_REQ] = { + .name = "PROC_APDU_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE) + | S(SAP_STATE_PROC_RESET_REQ) + | S(SAP_STATE_PROC_POWEROFF_REQ), + .in_event_mask = S(SAP_TRANSFER_APDU_RESP) + | S(SAP_RESET_SIM_REQ) + | S(SAP_POWER_SIM_OFF_REQ), + .action = &sap_fsm_proc_apdu_handler, + }, + [SAP_STATE_PROC_RESET_REQ] = { + .name = "PROC_RESET_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE) + | S(SAP_STATE_PROC_POWEROFF_REQ), + .in_event_mask = S(SAP_RESET_SIM_RESP) + | S(SAP_POWER_SIM_OFF_REQ), + // .action = sap_fsm_proc_handler, + }, + [SAP_STATE_PROC_STATUS_REQ] = { + .name = "PROC_STATUS_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE) + | S(SAP_STATE_PROC_RESET_REQ) + | S(SAP_STATE_PROC_POWEROFF_REQ), + .in_event_mask = S(SAP_TRANSFER_CARD_READER_STATUS_RESP) + | S(SAP_RESET_SIM_REQ) + | S(SAP_POWER_SIM_OFF_REQ), + // .action = sap_fsm_proc_handler, + }, + [SAP_STATE_PROC_SET_TP_REQ] = { + .name = "PROC_SET_TP_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE), + .in_event_mask = S(SAP_SET_TRANSPORT_PROTOCOL_RESP), + // .action = sap_fsm_proc_handler, + }, + [SAP_STATE_PROC_POWERON_REQ] = { + .name = "PROC_POWERON_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE) + | S(SAP_STATE_PROC_POWEROFF_REQ), + .in_event_mask = S(SAP_POWER_SIM_ON_RESP) + | S(SAP_POWER_SIM_OFF_REQ), + // .action = sap_fsm_proc_handler, + }, + [SAP_STATE_PROC_POWEROFF_REQ] = { + .name = "PROC_POWEROFF_REQ", + .out_state_mask = S(SAP_STATE_NOT_CONNECTED) + | S(SAP_STATE_DISCONNECTING) + | S(SAP_STATE_WAIT_FOR_CARD) + | S(SAP_STATE_IDLE), + .in_event_mask = S(SAP_POWER_SIM_OFF_RESP), + // .action = sap_fsm_proc_handler, + }, +}; + +static void sap_fsm_handle_card_status_ind(struct osmo_fsm_inst *fi, + const struct sap_message *sap_msg) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) fi->priv; + struct sap_param *param; + uint16_t param_len; + uint8_t status; + + param = sap_get_param(sap_msg, SAP_STATUS_CHANGE, ¶m_len); + if (!param || param_len != sizeof(status)) { + LOGP(DSAP, LOGL_ERROR, "Missing mandatory '%s' parameter\n", + get_value_string(sap_param_names, SAP_STATUS_CHANGE)); + return; + } + + status = param->value[0]; + + if (ms->sap_entity.card_status != status) { + LOGP(DSAP, LOGL_NOTICE, "(SIM) card status change '%s' -> '%s'\n", + get_value_string(sap_card_status_names, ms->sap_entity.card_status), + get_value_string(sap_card_status_names, status)); + ms->sap_entity.card_status = status; + } + + switch (status) { + /* SIM card is ready */ + case SAP_CARD_STATUS_CARD_RESET: + if (fi->state != SAP_STATE_IDLE) + osmo_fsm_inst_state_chg(fi, SAP_STATE_IDLE, 0, 0); + break; + + /* SIM card has recovered after unaccessful state */ + case SAP_CARD_STATUS_CARD_RECOVERED: + if (fi->state != SAP_STATE_IDLE) + osmo_fsm_inst_state_chg(fi, SAP_STATE_IDLE, 0, 0); + break; + + /* SIM care inserted, we need to power it on */ + case SAP_CARD_STATUS_CARD_INSERTED: + if (fi->state != SAP_STATE_IDLE) + osmo_fsm_inst_state_chg(fi, SAP_STATE_IDLE, 0, 0); + sap_send_poweron_req(ms); + break; + + case SAP_CARD_STATUS_UNKNOWN_ERROR: + case SAP_CARD_STATUS_CARD_NOT_ACC: + case SAP_CARD_STATUS_CARD_REMOVED: + default: /* Unknown card status */ + if (fi->state != SAP_STATE_WAIT_FOR_CARD) + osmo_fsm_inst_state_chg(fi, SAP_STATE_WAIT_FOR_CARD, 0, 0); + break; + } +} + +static void sap_fsm_allstate_action(struct osmo_fsm_inst *fi, + uint32_t event, void *data) +{ + switch (event) { + /* Disconnect indication initiated by the Server. + * FIXME: at the moment, immediate release is always assumed, + * but ideally we should check type of release (using *data) */ + case SAP_DISCONNECT_IND: + /* This message may arrive in any of the sub-states of + * the "Connected" state (i.e. connection shall exist) */ + if (fi->state < SAP_STATE_WAIT_FOR_CARD) + goto not_peritted; + /* fall-through */ + + /* Disconnect initiated by the Client */ + case SAP_DISCONNECT_REQ: + /* If we have no active connection, tear-down immediately */ + if (fi->state < SAP_STATE_WAIT_FOR_CARD) { + osmo_fsm_inst_state_chg(fi, + SAP_STATE_NOT_CONNECTED, 0, 0); + return; + } + + /* Trigger Client-initiater connection release */ + osmo_fsm_inst_state_chg(fi, SAP_STATE_DISCONNECTING, + SAP_FSM_CONN_REL_TIMEOUT, SAP_FSM_CONN_REL_T); + break; + + /* SIM status indication (inserted or ejected) */ + case SAP_STATUS_IND: + /* This message may arrive in any of the sub-states of + * the "Connected" state (i.e. connection shall exist) */ + if (fi->state < SAP_STATE_WAIT_FOR_CARD) + goto not_peritted; + + sap_fsm_handle_card_status_ind(fi, + (const struct sap_message *) data); + break; + + case SAP_ERROR_RESP: + if (fi->state == SAP_STATE_CONNECTING) { + /* Connection establishment error */ + osmo_fsm_inst_state_chg(fi, + SAP_STATE_NOT_CONNECTED, 0, 0); + } else if (fi->state > SAP_STATE_IDLE) { + /* Error replaces any Request message */ + osmo_fsm_inst_state_chg(fi, + SAP_STATE_IDLE, 0, 0); + } else { + /* Should not happen in general */ + goto not_peritted; + } + break; + + default: + /* Shall not happen */ + OSMO_ASSERT(0); + } + + return; + +not_peritted: + LOGPFSML(fi, LOGL_NOTICE, "Event '%s' is not " + "permitted in state '%s', please fix!\n", + osmo_fsm_event_name(fi->fsm, event), + osmo_fsm_state_name(fi->fsm, fi->state)); +} + +static int sap_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + switch (fi->state) { + /* Connection establishment / release timeout */ + case SAP_STATE_DISCONNECTING: + case SAP_STATE_CONNECTING: + LOGP(DSAP, LOGL_NOTICE, "Connection timeout\n"); + osmo_fsm_inst_state_chg(fi, SAP_STATE_NOT_CONNECTED, 0, 0); + break; + + /* Request processing timeout */ + case SAP_STATE_PROC_ATR_REQ: + case SAP_STATE_PROC_APDU_REQ: + case SAP_STATE_PROC_RESET_REQ: + case SAP_STATE_PROC_STATUS_REQ: + case SAP_STATE_PROC_SET_TP_REQ: + case SAP_STATE_PROC_POWERON_REQ: + case SAP_STATE_PROC_POWEROFF_REQ: + LOGP(DSAP, LOGL_NOTICE, "Timeout waiting for '%s' to complete, " + "going back to IDLE\n", osmo_fsm_inst_state_name(fi)); + osmo_fsm_inst_state_chg(fi, SAP_STATE_IDLE, 0, 0); + break; + + default: + LOGP(DSAP, LOGL_ERROR, "Unhandled state '%s'\n", + osmo_fsm_inst_state_name(fi)); + } + + /* Do not tear-down FSM */ + return 0; +} + +static struct osmo_fsm sap_fsm_def = { + .name = "sap_fsm", + .log_subsys = DSAP, + .states = sap_fsm_states, + .num_states = ARRAY_SIZE(sap_fsm_states), + .event_names = sap_msg_names, + .timer_cb = &sap_fsm_timer_cb, + .allstate_action = &sap_fsm_allstate_action, + .allstate_event_mask = 0 + | S(SAP_DISCONNECT_REQ) + | S(SAP_DISCONNECT_IND) + | S(SAP_STATUS_IND) + | S(SAP_ERROR_RESP), +}; + +int sap_fsm_alloc(struct osmocom_ms *ms) +{ + struct osmosap_entity *sap; + + sap = &ms->sap_entity; + OSMO_ASSERT(sap->fi == NULL); + + /* Register our FSM (if required) */ + if (!osmo_fsm_find_by_name(sap_fsm_def.name)) + OSMO_ASSERT(osmo_fsm_register(&sap_fsm_def) == 0); + + /* Allocate an instance using ms as talloc context */ + sap->fi = osmo_fsm_inst_alloc(&sap_fsm_def, ms, + ms, LOGL_DEBUG, ms->name); + if (!sap->fi) { + LOGP(DSAP, LOGL_ERROR, "Failed to allocate SAP FSM\n"); + return -ENOMEM; + } + + return 0; +} diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index c31d07b..4ed457f 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -4,6 +4,7 @@ * (C) 2010,2018 by Harald Welte * (C) 2010 by Andreas Eversberg * (C) 2011 by Nico Golde + * (C) 2018 by Vadim Yanitskiy * * All Rights Reserved * @@ -23,536 +24,272 @@ * */ -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include - -#define _GNU_SOURCE #include #include -#include -#include -#define GSM_SAP_LENGTH 300 -#define GSM_SAP_HEADROOM 32 +#include -static void sap_connect(struct osmocom_ms *ms); +#include +#include +#include +#include +#include +#include -/* Table 5.15: List of Parameter IDs */ -static const struct value_string sap_param_names[] = { - { SAP_MAX_MSG_SIZE, "MaxMsgSize" }, - { SAP_CONNECTION_STATUS, "ConnectionStatus" }, - { SAP_RESULT_CODE, "ResultCode" }, - { SAP_DISCONNECTION_TYPE, "DisconnectionType" }, - { SAP_COMMAND_APDU, "CommandAPDU" }, - { SAP_COMMAND_APDU_7816, "CommandAPDU7816" }, - { SAP_RESPONSE_APDU, "ResponseAPDU" }, - { SAP_ATR, "ATR" }, - { SAP_CARD_READER_STATUS, "CardReaderStatus" }, - { SAP_STATUS_CHANGE, "StatusChange" }, - { SAP_TRANSPORT_PROTOCOL, "TransportProtocol" }, -}; +#include +#include -/* Table 5.1: Message Overview */ -static const struct value_string sap_msg_names[] = { - { SAP_CONNECT_REQ, "CONNECT_REQ" }, - { SAP_CONNECT_RESP, "CONNECT_RESP" }, - { SAP_DISCONNECT_REQ, "DISCONNECT_REQ" }, - { SAP_DISCONNECT_RESP, "DISCONNECT_RESP" }, - { SAP_DISCONNECT_IND, "DISCONNECT_IND" }, - { SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ" }, - { SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP" }, - { SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ" }, - { SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP" }, - { SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ" }, - { SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP" }, - { SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ" }, - { SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP" }, - { SAP_RESET_SIM_REQ, "RESET_SIM_REQ" }, - { SAP_RESET_SIM_RESP, "RESET_SIM_RESP" }, - { SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ" }, - { SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP" }, - { SAP_STATUS_IND, "STATUS_IND" }, - { SAP_ERROR_RESP, "ERROR_RESP" }, - { SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ" }, - { SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP" }, -}; +#include +#include +#include -/* Table 5.18: Possible values for ResultCode */ -static const struct value_string sap_result_names[] = { - { SAP_RESULT_OK_REQ_PROC_CORR, "OK, request processed correctly" }, - { SAP_RESULT_ERROR_NO_REASON, "Error, no reason defined" }, - { SAP_RESULT_ERROR_CARD_NOT_ACC, "Error, card not accessible" }, - { SAP_RESULT_ERROR_CARD_POWERED_OFF, "Error, card (already) powered off" }, - { SAP_RESULT_ERROR_CARD_REMOVED, "Error, card removed" }, - { SAP_RESULT_ERROR_CARD_POWERED_ON, "Error, card already powered on" }, - { SAP_RESULT_ERROR_DATA_UNAVAIL, "Error, data not available" }, - { SAP_RESULT_ERROR_NOT_SUPPORTED, "Error, not supported "} -}; - -/* Table 5.19: Possible values for StatusChange */ -static const struct value_string sap_status_change_names[] = { - { SAP_STATUS_CHG_UNKNOWN_ERROR, "Unknown Error" }, - { SAP_STATUS_CHG_CARD_RESET, "Card reset" }, - { SAP_STATUS_CHG_CARD_NOT_ACC, "Card not accessible" }, - { SAP_STATUS_CHG_CARD_REMOVED, "Card removed" }, - { SAP_STATUS_CHG_CARD_INSERTED, "Card inserted" }, - { SAP_STATUS_CHG_CARD_RECOVERED, "Card recovered" }, -}; - -/* Table 5.16: Possible values for ConnectionStatus */ -static const struct value_string sap_status_names[] = { - { SAP_CONN_STATUS_OK_READY, "OK, Server can fulfill requirements" }, - { SAP_CONN_STATUS_ERROR_CONN, "Error, Server unable to establish connection" }, - { SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE, "Error, Server does not support maximum message size" }, - { SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE, "Error, maximum message size by Client is too small" }, - { SAP_CONN_STATUS_OK_CALL, "OK, ongoing call" }, -}; - -static struct msgb *sap_create_msg(uint8_t id, uint8_t num_params, struct sap_param *params) +/*! Send ATR request to the Server. + * \param[in] ms MS instance with active SAP connection + * \returns 0 in case of success, negative in case of error + */ +int sap_send_atr_req(struct osmocom_ms *ms) { struct msgb *msg; - uint8_t *msgp; - uint8_t i, plen, padding = 0; + int rc; - msg = msgb_alloc(GSM_SAP_LENGTH, "osmosap"); - if (!msg) { - LOGP(DSAP, LOGL_ERROR, "Failed to allocate msg.\n"); - return NULL; - } - - /* BTSAP 5.1 */ - msgb_put_u8(msg, id); - msgb_put_u8(msg, num_params); - msgb_put_u16(msg, 0); - - for(i=0; isap_entity.sap_state == SAP_NOT_CONNECTED) - sap_connect(ms); - - if (ms->sap_wq.bfd.fd <= 0) - return -EINVAL; - - if (osmo_wqueue_enqueue(&ms->sap_wq, msg) != 0) { - LOGP(DSAP, LOGL_ERROR, "Failed to enqueue msg.\n"); - msgb_free(msg); - return -1; - } - - return 0; -} - -static int sap_parse_result(struct sap_param *param) -{ - if(param->id != SAP_RESULT_CODE){ - LOGP(DSAP, LOGL_INFO, "> Parameter id: %u no valid result type\n", param->id); - return -1; - } else { - LOGP(DSAP, LOGL_INFO, "> RESULT CODE: %s\n", - get_value_string(sap_result_names, param->value[0])); - } - - if(param->value[0] > ARRAY_SIZE(sap_result_names)){ - return -1; - } - - return 0; -} - -static uint8_t *sap_get_param(uint8_t *data, struct sap_param *param) -{ - uint8_t *dptr = data; - uint8_t padlen; - - param->id = *dptr++; - /* skip reserved byte */ - dptr++; - param->len = *dptr << 8; - dptr++; - param->len |= *dptr++; - param->value = talloc_zero_size(NULL, param->len); - memcpy(param->value, dptr, param->len); - - /* skip parameter and padding and return pointer to next parameter */ - dptr += param->len; - if(param->len % 4){ - padlen = (4 - param->len % 4); - } else { - padlen = 0; - } - dptr += padlen; - - return dptr; -} - -static void sap_msg_free(struct sap_msg *msg) -{ - uint8_t i; - for(i=0; inum_params; i++){ - talloc_free(msg->params[i].value); - talloc_free(msg->params); - } - talloc_free(msg); -} - -static struct sap_msg *sap_parse_msg(uint8_t *data) -{ - struct sap_msg *msg = talloc_zero(NULL, struct sap_msg); - uint8_t *ptr = data; - uint8_t i; - - if(!msg){ - return NULL; - } - - msg->id = *ptr++; - LOGP(DSAP, LOGL_INFO, "> %s \n", get_value_string(sap_msg_names, msg->id)); - - msg->num_params = *ptr++; - /* skip two reserved null bytes, BTSAP 5.1 */ - ptr += 2; - - msg->params = talloc_zero_size(NULL, sizeof(struct sap_param) * msg->num_params); - - for(i=0; inum_params; i++){ - ptr = sap_get_param(ptr, &msg->params[i]); - LOGP(DSAP, LOGL_INFO, "> %s %s\n", - get_value_string(sap_param_names, msg->params[i].id), - osmo_hexdump(msg->params[i].value, msg->params[i].len)); - } - - return msg; -} - -static void sap_apdu_resp(struct osmocom_ms *ms, uint8_t *data, uint16_t len) -{ - struct msgb *msg; - uint8_t *apdu; - msg = msgb_alloc(GSM_SAP_LENGTH, "osmosap"); - if(!msg){ - LOGP(DSAP, LOGL_ERROR, "Failed to allocate memory.\n"); - return; - } - - apdu = msgb_put(msg, len); - memcpy(apdu, data, len); - - LOGP(DSAP, LOGL_DEBUG, "Forwarding APDU to SIM handler.\n"); - sim_apdu_resp(ms, msg); -} - -static int sap_adapt_msg_size(struct osmocom_ms *ms, struct sap_param *param) -{ - uint16_t size; - size = (param->value[0] << 8) | param->value[1]; - if(size != ms->sap_entity.max_msg_size && size > 0){ - LOGP(DSAP, LOGL_NOTICE, "Server can not handle max_msg_size, adapting.\n"); - ms->sap_entity.max_msg_size = size; - return -1; - } - return 0; -} - -static void sap_atr(struct osmocom_ms *ms) -{ - struct msgb *msg; - if(ms->sap_entity.sap_state != SAP_IDLE){ - LOGP(DSAP, LOGL_ERROR, "Attempting to send ATR request while not being idle.\n"); - return; - } - - msg = sap_create_msg(SAP_TRANSFER_ATR_REQ, 0, NULL); - if(!msg) - return; - - osmosap_send(ms, msg); - ms->sap_entity.sap_state = SAP_PROCESSING_ATR_REQUEST; -} - -static void sap_parse_resp(struct osmocom_ms *ms, uint8_t *data, uint16_t len) -{ - struct sap_msg *msg; - - msg = sap_parse_msg(data); - if (!msg) { - LOGP(DSAP, LOGL_ERROR, "Failed to parse SAP message\n"); - return; - } - - switch(msg->id){ - case SAP_CONNECT_RESP: - LOGP(DSAP, LOGL_INFO, "Status: %s\n", get_value_string(sap_status_names, msg->params[0].value[0])); - if(msg->params[0].value[0] == 0){ - ms->sap_entity.sap_state = SAP_IDLE; - } - if(msg->num_params == 2 && msg->params[1].len == 2){ - if(sap_adapt_msg_size(ms, &msg->params[1]) < 0) { - ms->sap_entity.sap_state = SAP_NOT_CONNECTED; - } else { - sap_atr(ms); - } - } - break; - case SAP_DISCONNECT_RESP: - ms->sap_entity.sap_state = SAP_NOT_CONNECTED; - break; - case SAP_STATUS_IND: - LOGP(DSAP, LOGL_INFO, "New card state: %s\n", get_value_string(sap_status_change_names, - msg->params[0].value[0])); - if(msg->params[0].value[0] != 1){ - /* TODO: handle case in which the card is not ready yet */ - } - break; - case SAP_TRANSFER_ATR_RESP: - if(ms->sap_entity.sap_state != SAP_PROCESSING_ATR_REQUEST){ - LOGP(DSAP, LOGL_ERROR, "got ATR resp in state: %u\n", ms->sap_entity.sap_state); - return; - } - if(msg->num_params >= 2){ - LOGP(DSAP, LOGL_INFO, "ATR: %s\n", osmo_hexdump(msg->params[1].value, msg->params[1].len)); - } - ms->sap_entity.sap_state = SAP_IDLE; - break; - case SAP_TRANSFER_APDU_RESP: - if(ms->sap_entity.sap_state != SAP_PROCESSING_APDU_REQUEST){ - LOGP(DSAP, LOGL_ERROR, "got APDU resp in state: %u\n", ms->sap_entity.sap_state); - return; - } - if(msg->num_params != 2){ - LOGP(DSAP, LOGL_ERROR, "wrong number of parameters %u in APDU response\n", msg->num_params); - return; - } - ms->sap_entity.sap_state = SAP_IDLE; - if(sap_parse_result(&msg->params[0]) == 0){ - /* back apdu resp to layer23 */ - sap_apdu_resp(ms, msg->params[1].value, msg->params[1].len); - LOGP(DSAP, LOGL_INFO, "sap_apdu_resp called, sending data back to layer23\n"); - } - break; - case SAP_ERROR_RESP: - if(ms->sap_entity.sap_state == SAP_CONNECTION_UNDER_NEGOTIATION){ - ms->sap_entity.sap_state = SAP_NOT_CONNECTED; - } else { - ms->sap_entity.sap_state = SAP_IDLE; - } - break; - default: - LOGP(DSAP, LOGL_ERROR, "got unknown or not implemented SAP msgid: %u\n", msg->id); - break; - } -} - -static int sap_read(struct osmo_fd *fd) -{ - struct msgb *msg = NULL; - struct osmocom_ms *ms = (struct osmocom_ms *) fd->data; - uint8_t *sap_buffer; - ssize_t rc; - - sap_buffer = talloc_zero_size(NULL, ms->sap_entity.max_msg_size); - if(!sap_buffer){ - LOGP(DSAP, LOGL_ERROR, "Failed to allocate memory\n"); + msg = sap_msgb_alloc(SAP_TRANSFER_ATR_REQ); + if (!msg) return -ENOMEM; - } - rc = read(fd->fd, sap_buffer, ms->sap_entity.max_msg_size - 1); - if (rc < 0) { - LOGP(DSAP, LOGL_ERROR,"SAP socket failed\n"); + rc = osmo_fsm_inst_dispatch(ms->sap_entity.fi, + SAP_TRANSFER_ATR_REQ, msg); + if (rc) { msgb_free(msg); - sap_close(ms); return rc; } - if(rc == 0) { - LOGP(DSAP, LOGL_NOTICE, "SAP socket closed by server\n"); - msgb_free(msg); - sap_close(ms); - return -ECONNREFUSED; - } - - sap_buffer[rc] = 0; - LOGP(DSAP, LOGL_INFO, "Received %zd bytes: %s\n", rc, osmo_hexdump(sap_buffer, rc)); - - sap_parse_resp(ms, sap_buffer, rc); - - talloc_free(sap_buffer); return 0; } -static int sap_write(struct osmo_fd *fd, struct msgb *msg) +/*! Send APDU request to the Server. + * \param[in] ms MS instance with active SAP connection + * \param[in] apdu APDU to be send + * \param[in] apdu_len length of APDU + * \returns 0 in case of success, negative in case of error + */ +int sap_send_apdu(struct osmocom_ms *ms, uint8_t *apdu, uint16_t apdu_len) +{ + struct msgb *msg; + int rc; + + msg = sap_msgb_alloc(SAP_TRANSFER_APDU_REQ); + if (!msg) + return -ENOMEM; + + sap_msgb_add_param(msg, SAP_COMMAND_APDU, apdu_len, apdu); + + rc = osmo_fsm_inst_dispatch(ms->sap_entity.fi, + SAP_TRANSFER_APDU_REQ, msg); + if (rc) { + msgb_free(msg); + return rc; + } + + return 0; +} + +/*! Send (SIM) power on request to the Server. + * \param[in] ms MS instance with active SAP connection + * \returns 0 in case of success, negative in case of error + */ +int sap_send_poweron_req(struct osmocom_ms *ms) +{ + struct msgb *msg; + int rc; + + msg = sap_msgb_alloc(SAP_POWER_SIM_ON_REQ); + if (!msg) + return -ENOMEM; + + rc = osmo_fsm_inst_dispatch(ms->sap_entity.fi, + SAP_POWER_SIM_ON_REQ, msg); + if (rc) { + msgb_free(msg); + return rc; + } + + return 0; +} + +/*! Send (SIM) power off request to the Server. + * \param[in] ms MS instance with active SAP connection + * \returns 0 in case of success, negative in case of error + */ +int sap_send_poweroff_req(struct osmocom_ms *ms) +{ + struct msgb *msg; + int rc; + + msg = sap_msgb_alloc(SAP_POWER_SIM_OFF_REQ); + if (!msg) + return -ENOMEM; + + rc = osmo_fsm_inst_dispatch(ms->sap_entity.fi, + SAP_POWER_SIM_OFF_REQ, msg); + if (rc) { + msgb_free(msg); + return rc; + } + + return 0; +} + +static int sap_read_cb(struct osmo_fd *fd) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) fd->data; + struct osmosap_entity *sap = &ms->sap_entity; + const struct sap_message *sap_msg; + uint8_t buf[GSM_SAP_LENGTH]; + ssize_t rc; + + /* Prevent buffer overflow */ + OSMO_ASSERT(sap->max_msg_size <= GSM_SAP_LENGTH); + + rc = read(fd->fd, buf, sap->max_msg_size); + if (rc < 0) { + LOGP(DSAP, LOGL_ERROR, "SAP socket failed\n"); + rc = -EIO; + goto error; + } + if (rc == 0) { + LOGP(DSAP, LOGL_NOTICE, "SAP socket closed by server\n"); + rc = -ECONNREFUSED; + goto error; + } + + LOGP(DSAP, LOGL_DEBUG, "RX SAP message (len=%zd): %s\n", + rc, osmo_hexdump(buf, rc)); + + /* Parse SAP message */ + sap_msg = sap_msg_parse(buf, rc); + if (!sap_msg) { + LOGP(DSAP, LOGL_ERROR, "Failed to parse SAP message\n"); + return -EINVAL; + } + + /* Pass received message to our FSM using message + * type as the FSM event name */ + osmo_fsm_inst_dispatch(sap->fi, sap_msg->msg_id, sap_msg); + + return 0; + +error: + /* Immediately tear-down FSM */ + osmo_fsm_inst_state_chg(sap->fi, SAP_STATE_NOT_CONNECTED, 0, 0); + return rc; +} + +static int sap_write_cb(struct osmo_fd *fd, struct msgb *msg) { ssize_t rc; if (fd->fd <= 0) return -EINVAL; - LOGP(DSAP, LOGL_INFO, "< %s\n", osmo_hexdump(msg->data, msg->len)); rc = write(fd->fd, msg->data, msg->len); if (rc != msg->len) { - LOGP(DSAP, LOGL_ERROR, "Failed to write data: rc: %zd\n", rc); + LOGP(DSAP, LOGL_ERROR, "Failed to write data\n"); return rc; } + LOGP(DSAP, LOGL_DEBUG, "TX SAP message (len=%u): %s\n", + msg->len, osmo_hexdump(msg->data, msg->len)); + return 0; } -static void sap_connect(struct osmocom_ms *ms) -{ - uint8_t buffer[3]; - struct msgb *msg; - uint16_t size = ms->sap_entity.max_msg_size; - struct sap_param params[1]; - - params[0].id = SAP_MAX_MSG_SIZE; - params[0].len = 2; - - if(ms->sap_entity.sap_state != SAP_NOT_CONNECTED) { - LOGP(DSAP, LOGL_ERROR, "Attempting to connect while there is an active connection.\n"); - return; - } - - buffer[0] = (size >> 8) & 0xFF; - buffer[1] = size & 0xFF; - buffer[2] = 0; - params[0].value = buffer; - - msg = sap_create_msg(SAP_CONNECT_REQ, 1, params); - if(!msg) - return; - - osmosap_send(ms, msg); - - ms->sap_entity.sap_state = SAP_CONNECTION_UNDER_NEGOTIATION; -} - -static void sap_disconnect(struct osmocom_ms *ms) -{ - struct msgb *msg; - if(ms->sap_entity.sap_state != SAP_NOT_CONNECTED && ms->sap_entity.sap_state != SAP_CONNECTION_UNDER_NEGOTIATION){ - LOGP(DSAP, LOGL_ERROR, "Attempting to disconnect while no active connection.\n"); - return; - } - - msg = sap_create_msg(SAP_DISCONNECT_REQ, 0, NULL); - if(!msg) - return; - - osmosap_send(ms, msg); - - ms->sap_entity.sap_state = SAP_NOT_CONNECTED; -} - -static int sap_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t len) -{ - struct msgb *msg; - struct sap_param params[1]; - int rc; - - params[0].id = SAP_COMMAND_APDU; - params[0].len = len; - params[0].value = data; - - if(ms->sap_entity.sap_state != SAP_IDLE){ - LOGP(DSAP, LOGL_ERROR, "Attempting to send APDU request while not being idle.\n"); - return -EIO; - } - - msg = sap_create_msg(SAP_TRANSFER_APDU_REQ, 1, params); - if(!msg) - return -ENOMEM; - - rc = osmosap_send(ms, msg); - if (rc) - return rc; - - ms->sap_entity.sap_state = SAP_PROCESSING_APDU_REQUEST; - - return 0; -} - +/*! Establishes SAP connection to the Server, + * allocates SAP FSM, and triggers connection procedure. + * \param[in] ms MS instance with configured SAP socket path + * \returns 0 in case of success, negative in case of error + */ int sap_open(struct osmocom_ms *ms) { int rc; + LOGP(DSAP, LOGL_INFO, "Establishing SAP connection " + "(using socket '%s')\n", ms->settings.sap_socket_path); + rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, ms->settings.sap_socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { LOGP(DSAP, LOGL_ERROR, "Failed to create unix domain socket %s: %s\n", ms->settings.sap_socket_path, strerror(-rc)); - ms->sap_entity.sap_state = SAP_SOCKET_ERROR; return rc; } osmo_wqueue_init(&ms->sap_wq, 100); ms->sap_wq.bfd.data = ms; - ms->sap_wq.read_cb = sap_read; - ms->sap_wq.write_cb = sap_write; + ms->sap_wq.read_cb = &sap_read_cb; + ms->sap_wq.write_cb = &sap_write_cb; - sap_connect(ms); + /* Allocate a SAP FSM for a given ms */ + rc = sap_fsm_alloc(ms); + if (rc) { + _sap_close_sock(ms); + return rc; + } - return 0; + /* Initiate SAP connection with Server */ + LOGP(DSAP, LOGL_DEBUG, "Connecting to the Server...\n"); + return osmo_fsm_inst_state_chg(ms->sap_entity.fi, SAP_STATE_CONNECTING, + SAP_FSM_CONN_EST_TIMEOUT, SAP_FSM_CONN_EST_T); } +/*! Closes SAP connection with the Server. + * \param[in] ms MS instance with active SAP connection + * \returns 0 in case of success, negative in case of error + */ int sap_close(struct osmocom_ms *ms) { + if (ms->sap_entity.fi == NULL) { + LOGP(DSAP, LOGL_NOTICE, "No active SAP connection (no FSM)\n"); + return -EINVAL; + } + + LOGP(DSAP, LOGL_INFO, "Closing SAP connection\n"); + return osmo_fsm_inst_dispatch(ms->sap_entity.fi, + SAP_DISCONNECT_REQ, NULL); +} + +/*! Low-level function for closing SAP (socket) connection. + * \param[in] ms MS instance with active SAP connection + * \returns 0 in case of success, negative in case of error + */ +int _sap_close_sock(struct osmocom_ms *ms) +{ if (ms->sap_wq.bfd.fd <= 0) return -EINVAL; - sap_disconnect(ms); close(ms->sap_wq.bfd.fd); ms->sap_wq.bfd.fd = -1; + osmo_fd_unregister(&ms->sap_wq.bfd); osmo_wqueue_clear(&ms->sap_wq); return 0; } -/* same signature as in L1CTL, so it can be called from sim.c */ -int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length) -{ - //LOGP(DSAP, LOGL_ERROR, "Received the following APDU from sim.c: %s\n" , - // osmo_hexdump(data, length)); - return sap_apdu(ms, data, length); -} - -/* init */ -int osmosap_init(struct osmocom_ms *ms) +/*! Initiates SAP client state for a given MS. */ +void sap_init(struct osmocom_ms *ms) { struct osmosap_entity *sap = &ms->sap_entity; LOGP(DSAP, LOGL_INFO, "init SAP client\n"); - sap->sap_state = SAP_NOT_CONNECTED; + + /* Default MaxMsgSize (to be negotiated) */ sap->max_msg_size = GSM_SAP_LENGTH; + /* SIM card status is not known yet */ + sap->card_status = SAP_CARD_STATUS_CARD_NOT_ACC; - return 0; + /* Optional event call-backs */ + sap->idle_cb = NULL; + sap->rel_cb = NULL; + sap->apdu_cb = NULL; + sap->atr_cb = NULL; } - diff --git a/src/host/layer23/src/common/sap_proto.c b/src/host/layer23/src/common/sap_proto.c new file mode 100644 index 0000000..b170eb6 --- /dev/null +++ b/src/host/layer23/src/common/sap_proto.c @@ -0,0 +1,271 @@ +/* + * SAP (SIM Access Profile) protocol definition + * based on Bluetooth SAP specification + * + * (C) 2011 by Nico Golde + * (C) 2018 by Vadim Yanitskiy + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include +#include + +/* Table 5.15: List of Parameter IDs */ +const struct value_string sap_param_names[] = { + { SAP_MAX_MSG_SIZE, "MaxMsgSize" }, + { SAP_CONNECTION_STATUS, "ConnectionStatus" }, + { SAP_RESULT_CODE, "ResultCode" }, + { SAP_DISCONNECTION_TYPE, "DisconnectionType" }, + { SAP_COMMAND_APDU, "CommandAPDU" }, + { SAP_COMMAND_APDU_7816, "CommandAPDU7816" }, + { SAP_RESPONSE_APDU, "ResponseAPDU" }, + { SAP_ATR, "ATR" }, + { SAP_CARD_READER_STATUS, "CardReaderStatus" }, + { SAP_STATUS_CHANGE, "StatusChange" }, + { SAP_TRANSPORT_PROTOCOL, "TransportProtocol" }, +}; + +/* Table 5.1: Message Overview */ +const struct value_string sap_msg_names[] = { + { SAP_CONNECT_REQ, "CONNECT_REQ" }, + { SAP_CONNECT_RESP, "CONNECT_RESP" }, + { SAP_DISCONNECT_REQ, "DISCONNECT_REQ" }, + { SAP_DISCONNECT_RESP, "DISCONNECT_RESP" }, + { SAP_DISCONNECT_IND, "DISCONNECT_IND" }, + { SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ" }, + { SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP" }, + { SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ" }, + { SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP" }, + { SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ" }, + { SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP" }, + { SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ" }, + { SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP" }, + { SAP_RESET_SIM_REQ, "RESET_SIM_REQ" }, + { SAP_RESET_SIM_RESP, "RESET_SIM_RESP" }, + { SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ" }, + { SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP" }, + { SAP_STATUS_IND, "STATUS_IND" }, + { SAP_ERROR_RESP, "ERROR_RESP" }, + { SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ" }, + { SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP" }, +}; + +/* Table 5.18: Possible values for ResultCode */ +const struct value_string sap_result_names[] = { + { SAP_RESULT_OK_REQ_PROC_CORR, "OK, request processed correctly" }, + { SAP_RESULT_ERROR_NO_REASON, "Error, no reason defined" }, + { SAP_RESULT_ERROR_CARD_NOT_ACC, "Error, card not accessible" }, + { SAP_RESULT_ERROR_CARD_POWERED_OFF, "Error, card (already) powered off" }, + { SAP_RESULT_ERROR_CARD_REMOVED, "Error, card removed" }, + { SAP_RESULT_ERROR_CARD_POWERED_ON, "Error, card already powered on" }, + { SAP_RESULT_ERROR_DATA_UNAVAIL, "Error, data not available" }, + { SAP_RESULT_ERROR_NOT_SUPPORTED, "Error, not supported "} +}; + +/* Table 5.19: Possible values for StatusChange */ +const struct value_string sap_card_status_names[] = { + { SAP_CARD_STATUS_UNKNOWN_ERROR, "Unknown Error" }, + { SAP_CARD_STATUS_CARD_RESET, "Card reset" }, + { SAP_CARD_STATUS_CARD_NOT_ACC, "Card not accessible" }, + { SAP_CARD_STATUS_CARD_REMOVED, "Card removed" }, + { SAP_CARD_STATUS_CARD_INSERTED, "Card inserted" }, + { SAP_CARD_STATUS_CARD_RECOVERED, "Card recovered" }, +}; + +/* Table 5.16: Possible values for ConnectionStatus */ +const struct value_string sap_conn_status_names[] = { + { SAP_CONN_STATUS_OK_READY, "OK, Server can fulfill requirements" }, + { SAP_CONN_STATUS_ERROR_CONN, "Error, Server unable to establish connection" }, + { SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE, "Error, Server does not support maximum message size" }, + { SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE, "Error, maximum message size by Client is too small" }, + { SAP_CONN_STATUS_OK_CALL, "OK, ongoing call" }, +}; + +struct msgb *sap_msgb_alloc(uint8_t msg_id) +{ + struct sap_message *sap_msg; + struct msgb *msg; + + msg = msgb_alloc(GSM_SAP_LENGTH, "sap_msg"); + if (!msg) { + LOGP(DSAP, LOGL_ERROR, "Failed to allocate SAP message\n"); + return NULL; + } + + sap_msg = (struct sap_message *) msgb_put(msg, sizeof(*sap_msg)); + sap_msg->msg_id = msg_id; + + return msg; +} + +void sap_msgb_add_param(struct msgb *msg, + enum sap_param_type param_type, + uint16_t param_len, uint8_t *param_value) +{ + struct sap_message *sap_msg; + struct sap_param *param; + uint8_t padding; + uint8_t *buf; + + /* Update number of parameters */ + sap_msg = (struct sap_message *) msg->data; + sap_msg->num_params++; + + /* Allocate a new parameter */ + param = (struct sap_param *) msgb_put(msg, sizeof(*param)); + param->param_id = param_type; + param->reserved[0] = 0x00; + + /* Encode parameter value and length */ + param->length = htons(param_len); + buf = msgb_put(msg, param_len); + memcpy(buf, param_value, param_len); + + /* Optional padding */ + padding = 4 - (param_len % 4); + if (padding) { + buf = msgb_put(msg, padding); + memset(buf, 0x00, padding); + } +} + +struct sap_param *sap_get_param(const struct sap_message *sap_msg, + enum sap_param_type param_type, uint16_t *param_len) +{ + const uint8_t *ptr = sap_msg->payload; + struct sap_param *param = NULL; + uint16_t plen; + int i; + + /* We assume that message is parsed already, + * so we don't check for buffer overflows */ + for (i = 0; i < sap_msg->num_params; i++) { + /* Parse one parameter */ + param = (struct sap_param *) ptr; + plen = ntohs(param->length); + + /* Match against a given ID */ + if (param->param_id == param_type) { + if (param_len != NULL) + *param_len = plen; + return param; + } + + /* Shift pointer to the next parameter */ + ptr += sizeof(*param) + plen; + /* Optional padding */ + ptr += 4 - (plen % 4); + } + + return NULL; +} + +const struct sap_message *sap_msg_parse(const uint8_t *buf, size_t buf_len) +{ + const struct sap_message *sap_msg; + const uint8_t *ptr; + int i; + + /* Message header is mandatory */ + if (buf_len < sizeof(*sap_msg)) { + LOGP(DSAP, LOGL_ERROR, "Missing SAP message header\n"); + return NULL; + } + + sap_msg = (const struct sap_message *) buf; + buf_len -= sizeof(*sap_msg); + ptr = sap_msg->payload; + + LOGP(DSAP, LOGL_DEBUG, "SAP message '%s' has %u parameter(s)\n", + get_value_string(sap_msg_names, sap_msg->msg_id), + sap_msg->num_params); + + for (i = 0; i < sap_msg->num_params; i++) { + struct sap_param *param; + uint16_t param_len; + uint16_t offset; + + /* Prevent buffer overflow */ + if (buf_len < sizeof(*param)) + goto malformed; + + /* Parse one parameter */ + param = (struct sap_param *) ptr; + param_len = ntohs(param->length); + + LOGP(DSAP, LOGL_DEBUG, "SAP parameter '%s' (len=%u): %s\n", + get_value_string(sap_param_names, param->param_id), + param_len, osmo_hexdump(param->value, param_len)); + + /* Calculate relative offset */ + offset = sizeof(*param) + param_len; + offset += 4 - (param_len % 4); /* Optional padding */ + + /* Prevent buffer overflow */ + if (offset > buf_len) + goto malformed; + + buf_len -= offset; + ptr += offset; + } + + return sap_msg; + +malformed: + LOGP(DSAP, LOGL_ERROR, "Malformed SAP message " + "(parameter %i/%u)\n", i + 1, sap_msg->num_params); + return NULL; +} + +int sap_check_result_code(const struct sap_message *sap_msg) +{ + struct sap_param *param; + uint16_t param_len; + uint8_t res_code; + + param = sap_get_param(sap_msg, SAP_RESULT_CODE, ¶m_len); + if (!param || param_len != sizeof(res_code)) { + LOGP(DSAP, LOGL_ERROR, "Missing mandatory '%s' parameter\n", + get_value_string(sap_param_names, SAP_RESULT_CODE)); + return -EINVAL; + } + + res_code = param->value[0]; + if (res_code > ARRAY_SIZE(sap_result_names)) { + LOGP(DSAP, LOGL_ERROR, "Unknown SAP ResultCode=0x%02x\n", res_code); + return -EINVAL; + } + + LOGP(DSAP, LOGL_DEBUG, "SAP ResultCode is '%s'\n", + get_value_string(sap_result_names, res_code)); + + return res_code; +} diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c index 9d14cd3..a63ae2a 100644 --- a/src/host/layer23/src/common/sim.c +++ b/src/host/layer23/src/common/sim.c @@ -205,7 +205,7 @@ * it makes more sense to do it here then in L1CTL */ if (ms->subscr.sim_type == GSM_SIM_TYPE_SAP) { LOGP(DSIM, LOGL_INFO, "Using SAP backend\n"); - rc = osmosap_send_apdu(ms, data, length); + rc = sap_send_apdu(ms, data, length); } else { LOGP(DSIM, LOGL_INFO, "Using built-in SIM reader\n"); rc = l1ctl_tx_sim_req(ms, data, length); diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 17c0c76..1f473a7 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -200,7 +200,11 @@ lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms); /* init SAP client before SIM card starts up */ - osmosap_init(ms); + sap_init(ms); + + /* TODO: remove SIM card on sap_entity.rel_cb() */ + ms->sap_entity.idle_cb = &subscr_sim_request; + ms->sap_entity.apdu_cb = &sim_apdu_resp; gsm_sim_init(ms); gsm48_cc_init(ms); diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index b2be554..e8c0ae3 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -544,7 +544,7 @@ }; /* request file from SIM */ -static int subscr_sim_request(struct osmocom_ms *ms) +int subscr_sim_request(struct osmocom_ms *ms) { struct gsm_subscriber *subscr = &ms->subscr; struct subscr_sim_file *sf = &subscr_sim_files[subscr->sim_file_index]; @@ -1275,6 +1275,7 @@ gsm_subscr_exit(ms); gsm_subscr_init(ms); + subscr->ustate = GSM_SIM_U2_NOT_UPDATED; subscr->sim_type = GSM_SIM_TYPE_SAP; sprintf(subscr->sim_name, "sap"); subscr->sim_valid = 1; @@ -1297,8 +1298,6 @@ return rc; } - - return 0; } /* Deattach sapcard */ -- To view, visit https://gerrit.osmocom.org/12441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I77bb108615bb2c94c441568f195b04e0a5421643 Gerrit-Change-Number: 12441 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Dec 25 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 25 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#350?= In-Reply-To: <120276379.253.1545664207382.JavaMail.jenkins@jenkins.osmocom.org> References: <120276379.253.1545664207382.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1079468209.267.1545750607420.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.94 KB...] checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists mkdir: cannot create directory '.libs': File exists mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 26 11:35:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 11:35:01 +0000 Subject: Change in osmocom-bb[master]: layer23/common/sim.c: don't ignore rc of sim_apdu_send() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12427 ) Change subject: layer23/common/sim.c: don't ignore rc of sim_apdu_send() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8cab7cc72f026947859cc607f65d925803424cf7 Gerrit-Change-Number: 12427 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Dec 2018 11:35:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:06:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:06:35 +0000 Subject: Change in osmocom-bb[master]: host/layer23: rename GSM_SIM_TYPE_READER to GSM_SIM_TYPE_L1PHY In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12428 ) Change subject: host/layer23: rename GSM_SIM_TYPE_READER to GSM_SIM_TYPE_L1PHY ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0f83f365ed50cfd658fdd3a9d6866ed76c8c4009 Gerrit-Change-Number: 12428 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Dec 2018 12:06:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:07:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:07:37 +0000 Subject: Change in osmocom-bb[master]: mobile/subscriber.c: consider GSM_SIM_TYPE_SAP too In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12429 ) Change subject: mobile/subscriber.c: consider GSM_SIM_TYPE_SAP too ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b3080fa7a5332467a449a314ba3cc3a07a9b7df Gerrit-Change-Number: 12429 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Wed, 26 Dec 2018 12:07:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:07:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:07:47 +0000 Subject: Change in osmocom-bb[master]: layer23/include/sap_interface.h: use #pragma once In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12430 ) Change subject: layer23/include/sap_interface.h: use #pragma once ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I98e407c2b6604438d2495700cb62753ad55369ea Gerrit-Change-Number: 12430 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Dec 2018 12:07:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:08:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:08:17 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: return rc from osmosap_send_apdu() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12431 ) Change subject: layer23/sap_interface.c: return rc from osmosap_send_apdu() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3965843c4d49e31b1b5156d9ee8439eef6ecaab1 Gerrit-Change-Number: 12431 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Wed, 26 Dec 2018 12:08:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:08:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:08:39 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: drop unused osmosap_sapsocket() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12432 ) Change subject: layer23/sap_interface.c: drop unused osmosap_sapsocket() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3040c75bb61094b9b601aef9d699db603d292f4 Gerrit-Change-Number: 12432 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Wed, 26 Dec 2018 12:08:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:09:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:09:03 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: remove redundant socket_path argument In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12433 ) Change subject: layer23/sap_interface.c: remove redundant socket_path argument ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I408b3e1fa40e9b5daf88fa6ed5f3930b83dffe6f Gerrit-Change-Number: 12433 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Wed, 26 Dec 2018 12:09:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:09:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:09:15 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: use int for rc in sap_open() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12434 ) Change subject: layer23/sap_interface.c: use int for rc in sap_open() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I683f87ae09393c45377c39317b08c613055ceb16 Gerrit-Change-Number: 12434 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Dec 2018 12:09:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:09:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:09:31 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: use LOGP() instead of fprintf() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12435 ) Change subject: layer23/sap_interface.c: use LOGP() instead of fprintf() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I054be24666fcd5eb8a70cfcac0e7ed566e909b90 Gerrit-Change-Number: 12435 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Wed, 26 Dec 2018 12:09:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:10:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:10:42 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: drop redundant length check In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12436 ) Change subject: layer23/sap_interface.c: drop redundant length check ...................................................................... Patch Set 1: well, some future code change might call sap_parse_resp() from a different context. So I think it's good to have some input validation. However, OSMO_ASSERT() would be a better choice in this case to fail reliably if anyone ever calls the function with wrong input data -- To view, visit https://gerrit.osmocom.org/12436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3be5f0ea742c1ecd3df8c60db0d4de5691b14cfc Gerrit-Change-Number: 12436 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 26 Dec 2018 12:10:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:12:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:12:04 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: drop meaningless call to sap_msg_free() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12437 ) Change subject: layer23/sap_interface.c: drop meaningless call to sap_msg_free() ...................................................................... Patch Set 1: Code-Review+2 I agree with this patch. However, I think any function called _free() should behave like libc free() and accept NULL pointers. But that would be separate fix/patch -- To view, visit https://gerrit.osmocom.org/12437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf868c4299e292a17c4b7aad1f9e728ea3653494 Gerrit-Change-Number: 12437 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Wed, 26 Dec 2018 12:12:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:16:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:16:41 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: prettify value_string definitions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12438 ) Change subject: layer23/sap_interface.c: prettify value_string definitions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib3aa81986987027718e2a8b461afd28787bda4c2 Gerrit-Change-Number: 12438 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Dec 2018 12:16:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:16:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:16:58 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: define missing enums and use them In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12439 ) Change subject: layer23/sap_interface.c: define missing enums and use them ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ba5a8a42bf25d04b152ac3f1f0e4d7eac7f068f Gerrit-Change-Number: 12439 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 26 Dec 2018 12:16:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 12:17:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 26 Dec 2018 12:17:41 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: drop optional SAP message handler In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12440 ) Change subject: layer23/sap_interface.c: drop optional SAP message handler ...................................................................... Patch Set 1: why drop it? -- To view, visit https://gerrit.osmocom.org/12440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib5baa3785f478c762cbb0836d4f85b826b55c9ea Gerrit-Change-Number: 12440 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 26 Dec 2018 12:17:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Dec 26 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 26 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#351?= In-Reply-To: <1079468209.267.1545750607420.JavaMail.jenkins@jenkins.osmocom.org> References: <1079468209.267.1545750607420.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <348764013.280.1545837007379.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Dec 26 20:52:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 26 Dec 2018 20:52:19 +0000 Subject: Change in osmocom-bb[master]: layer23/common/sim.c: don't ignore rc of sim_apdu_send() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12427 ) Change subject: layer23/common/sim.c: don't ignore rc of sim_apdu_send() ...................................................................... layer23/common/sim.c: don't ignore rc of sim_apdu_send() Change-Id: I8cab7cc72f026947859cc607f65d925803424cf7 --- M src/host/layer23/src/common/sim.c 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c index 7f5240d..9d14cd3 100644 --- a/src/host/layer23/src/common/sim.c +++ b/src/host/layer23/src/common/sim.c @@ -186,6 +186,8 @@ /* send APDU to card reader */ static int sim_apdu_send(struct osmocom_ms *ms, uint8_t *data, uint16_t length) { + int rc; + LOGP(DSIM, LOGL_INFO, "sending APDU (class 0x%02x, ins 0x%02x)\n", data[0], data[1]); @@ -203,13 +205,13 @@ * it makes more sense to do it here then in L1CTL */ if (ms->subscr.sim_type == GSM_SIM_TYPE_SAP) { LOGP(DSIM, LOGL_INFO, "Using SAP backend\n"); - osmosap_send_apdu(ms, data, length); + rc = osmosap_send_apdu(ms, data, length); } else { LOGP(DSIM, LOGL_INFO, "Using built-in SIM reader\n"); - l1ctl_tx_sim_req(ms, data, length); + rc = l1ctl_tx_sim_req(ms, data, length); } - return 0; + return rc; } /* dequeue messages (RSL-SAP) */ -- To view, visit https://gerrit.osmocom.org/12427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8cab7cc72f026947859cc607f65d925803424cf7 Gerrit-Change-Number: 12427 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 20:52:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 26 Dec 2018 20:52:19 +0000 Subject: Change in osmocom-bb[master]: host/layer23: rename GSM_SIM_TYPE_READER to GSM_SIM_TYPE_L1PHY In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12428 ) Change subject: host/layer23: rename GSM_SIM_TYPE_READER to GSM_SIM_TYPE_L1PHY ...................................................................... host/layer23: rename GSM_SIM_TYPE_READER to GSM_SIM_TYPE_L1PHY Since we have two ways to interact with a physical SIM: - using built-in SIM reader of the L1 PHY (via L1CTL), - using remote reader via (BT)SAP protocol, name 'GSM_SIM_TYPE_READER' looks quite confusing. Let's rename it in order to explicitly indicate the role of L1 PHY. Change-Id: I0f83f365ed50cfd658fdd3a9d6866ed76c8c4009 --- M src/host/layer23/include/osmocom/bb/mobile/subscriber.h M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/subscriber.c M src/host/layer23/src/mobile/vty_interface.c 5 files changed, 10 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h index ac785d4..958700a 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h @@ -22,7 +22,7 @@ enum { GSM_SIM_TYPE_NONE = 0, - GSM_SIM_TYPE_READER, + GSM_SIM_TYPE_L1PHY, GSM_SIM_TYPE_TEST, GSM_SIM_TYPE_SAP }; diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 8b5fc91..a2c02c0 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -110,7 +110,7 @@ /* insert test card, if enabled */ switch (set->sim_type) { - case GSM_SIM_TYPE_READER: + case GSM_SIM_TYPE_L1PHY: /* trigger sim card reader process */ gsm_subscr_simcard(ms); break; diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index a4bb4e3..388c754 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -49,7 +49,7 @@ sprintf(set->imeisv, "0000000000000000"); /* SIM type */ - set->sim_type = GSM_SIM_TYPE_READER; + set->sim_type = GSM_SIM_TYPE_L1PHY; /* test SIM */ strcpy(set->test_imsi, "001010000000000"); diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 7a01141..097f785 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -711,7 +711,7 @@ uint8_t job; /* skip, if no real valid SIM */ - if (subscr->sim_type != GSM_SIM_TYPE_READER) + if (subscr->sim_type != GSM_SIM_TYPE_L1PHY) return; switch (mode) { @@ -764,7 +764,7 @@ gsm_subscr_exit(ms); gsm_subscr_init(ms); - subscr->sim_type = GSM_SIM_TYPE_READER; + subscr->sim_type = GSM_SIM_TYPE_L1PHY; sprintf(subscr->sim_name, "sim"); subscr->sim_valid = 1; subscr->ustate = GSM_SIM_U2_NOT_UPDATED; @@ -790,7 +790,7 @@ #endif /* skip, if no real valid SIM */ - if (subscr->sim_type != GSM_SIM_TYPE_READER || !subscr->sim_valid) + if (subscr->sim_type != GSM_SIM_TYPE_L1PHY || !subscr->sim_valid) return 0; /* get tail list from "PLMN not allowed" */ @@ -844,7 +844,7 @@ struct gsm1111_ef_loci *loci; /* skip, if no real valid SIM */ - if (subscr->sim_type != GSM_SIM_TYPE_READER || !subscr->sim_valid) + if (subscr->sim_type != GSM_SIM_TYPE_L1PHY || !subscr->sim_valid) return 0; LOGP(DMM, LOGL_INFO, "Updating LOCI on SIM\n"); @@ -907,7 +907,7 @@ struct sim_hdr *nsh; /* not a SIM */ - if ((subscr->sim_type != GSM_SIM_TYPE_READER + if ((subscr->sim_type != GSM_SIM_TYPE_L1PHY && subscr->sim_type != GSM_SIM_TYPE_TEST) || !subscr->sim_valid || no_sim) { struct gsm48_mm_event *nmme; diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index a0ad993..2001b88 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1323,7 +1323,7 @@ case GSM_SIM_TYPE_NONE: vty_out(vty, " sim none%s", VTY_NEWLINE); break; - case GSM_SIM_TYPE_READER: + case GSM_SIM_TYPE_L1PHY: vty_out(vty, " sim reader%s", VTY_NEWLINE); break; case GSM_SIM_TYPE_TEST: @@ -1608,7 +1608,7 @@ set->sim_type = GSM_SIM_TYPE_NONE; break; case 'r': - set->sim_type = GSM_SIM_TYPE_READER; + set->sim_type = GSM_SIM_TYPE_L1PHY; break; case 't': set->sim_type = GSM_SIM_TYPE_TEST; -- To view, visit https://gerrit.osmocom.org/12428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0f83f365ed50cfd658fdd3a9d6866ed76c8c4009 Gerrit-Change-Number: 12428 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 20:52:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 26 Dec 2018 20:52:20 +0000 Subject: Change in osmocom-bb[master]: mobile/subscriber.c: consider GSM_SIM_TYPE_SAP too In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12429 ) Change subject: mobile/subscriber.c: consider GSM_SIM_TYPE_SAP too ...................................................................... mobile/subscriber.c: consider GSM_SIM_TYPE_SAP too There are several SIM card interfaces, two of which: - GSM_SIM_TYPE_L1PHY (using built-in SIM reader of the L1 PHY), - GSM_SIM_TYPE_SAP (using remote reader via (BT)SAP protocol), can actually deal with a physical SIM card. But, for some reason, only GSM_SIM_TYPE_L1PHY was considered as such. Let's also get along with GSM_SIM_TYPE_SAP for the following procedures: - PIN management and verification, - FPLMN / LOCI updating, - A3 authentication. Change-Id: I4b3080fa7a5332467a449a314ba3cc3a07a9b7df --- M src/host/layer23/include/osmocom/bb/mobile/subscriber.h M src/host/layer23/src/mobile/subscriber.c 2 files changed, 7 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h index 958700a..c747af9 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h @@ -20,6 +20,9 @@ #define GSM_IMSI_LENGTH 16 +#define GSM_SIM_IS_READER(type) \ + (type == GSM_SIM_TYPE_L1PHY || type == GSM_SIM_TYPE_SAP) + enum { GSM_SIM_TYPE_NONE = 0, GSM_SIM_TYPE_L1PHY, diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 097f785..7f24d56 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -711,7 +711,7 @@ uint8_t job; /* skip, if no real valid SIM */ - if (subscr->sim_type != GSM_SIM_TYPE_L1PHY) + if (!GSM_SIM_IS_READER(subscr->sim_type)) return; switch (mode) { @@ -790,7 +790,7 @@ #endif /* skip, if no real valid SIM */ - if (subscr->sim_type != GSM_SIM_TYPE_L1PHY || !subscr->sim_valid) + if (!GSM_SIM_IS_READER(subscr->sim_type) || !subscr->sim_valid) return 0; /* get tail list from "PLMN not allowed" */ @@ -844,7 +844,7 @@ struct gsm1111_ef_loci *loci; /* skip, if no real valid SIM */ - if (subscr->sim_type != GSM_SIM_TYPE_L1PHY || !subscr->sim_valid) + if (!GSM_SIM_IS_READER(subscr->sim_type) || !subscr->sim_valid) return 0; LOGP(DMM, LOGL_INFO, "Updating LOCI on SIM\n"); @@ -907,8 +907,7 @@ struct sim_hdr *nsh; /* not a SIM */ - if ((subscr->sim_type != GSM_SIM_TYPE_L1PHY - && subscr->sim_type != GSM_SIM_TYPE_TEST) + if (!GSM_SIM_IS_READER(subscr->sim_type) || !subscr->sim_valid || no_sim) { struct gsm48_mm_event *nmme; -- To view, visit https://gerrit.osmocom.org/12429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4b3080fa7a5332467a449a314ba3cc3a07a9b7df Gerrit-Change-Number: 12429 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 20:52:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 26 Dec 2018 20:52:20 +0000 Subject: Change in osmocom-bb[master]: layer23/include/sap_interface.h: use #pragma once In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12430 ) Change subject: layer23/include/sap_interface.h: use #pragma once ...................................................................... layer23/include/sap_interface.h: use #pragma once Change-Id: I98e407c2b6604438d2495700cb62753ad55369ea --- M src/host/layer23/include/osmocom/bb/common/sap_interface.h 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index e4e64ce..67e859b 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -1,5 +1,4 @@ -#ifndef _SAP_INTERFACE_H -#define _SAP_INTERFACE_H +#pragma once typedef int (*osmosap_cb_t)(struct msgb *msg, struct osmocom_ms *ms); @@ -70,6 +69,3 @@ uint8_t num_params; struct sap_param *params; }; - - -#endif /* _SAP_INTERFACE_H */ -- To view, visit https://gerrit.osmocom.org/12430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I98e407c2b6604438d2495700cb62753ad55369ea Gerrit-Change-Number: 12430 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 20:52:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 26 Dec 2018 20:52:21 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: return rc from osmosap_send_apdu() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12431 ) Change subject: layer23/sap_interface.c: return rc from osmosap_send_apdu() ...................................................................... layer23/sap_interface.c: return rc from osmosap_send_apdu() Change-Id: I3965843c4d49e31b1b5156d9ee8439eef6ecaab1 --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 10 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index a32c3aa..23b482a 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -474,10 +474,11 @@ ms->sap_entity.sap_state = SAP_NOT_CONNECTED; } -static void sap_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t len) +static int sap_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t len) { struct msgb *msg; struct sap_param params[1]; + int rc; params[0].id = SAP_COMMAND_APDU; params[0].len = len; @@ -485,16 +486,20 @@ if(ms->sap_entity.sap_state != SAP_IDLE){ LOGP(DSAP, LOGL_ERROR, "Attempting to send APDU request while not being idle.\n"); - return; + return -EIO; } msg = sap_create_msg(SAP_TRANSFER_APDU_REQ, 1, params); if(!msg) - return; + return -ENOMEM; - osmosap_send(ms, msg); + rc = osmosap_send(ms, msg); + if (rc) + return rc; ms->sap_entity.sap_state = SAP_PROCESSING_APDU_REQUEST; + + return 0; } int sap_open(struct osmocom_ms *ms, const char *socket_path) @@ -538,9 +543,7 @@ { //LOGP(DSAP, LOGL_ERROR, "Received the following APDU from sim.c: %s\n" , // osmo_hexdump(data, length)); - sap_apdu(ms, data, length); - - return 0; + return sap_apdu(ms, data, length); } /* register message handler for messages that are sent from L2->L3 */ -- To view, visit https://gerrit.osmocom.org/12431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3965843c4d49e31b1b5156d9ee8439eef6ecaab1 Gerrit-Change-Number: 12431 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 20:52:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 26 Dec 2018 20:52:21 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: drop unused osmosap_sapsocket() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12432 ) Change subject: layer23/sap_interface.c: drop unused osmosap_sapsocket() ...................................................................... layer23/sap_interface.c: drop unused osmosap_sapsocket() Change-Id: Ie3040c75bb61094b9b601aef9d699db603d292f4 --- M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c 2 files changed, 0 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index 67e859b..e2aad3f 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -6,7 +6,6 @@ int sap_close(struct osmocom_ms *ms); int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb); -int osmosap_sapsocket(struct osmocom_ms *ms, const char *path); int osmosap_init(struct osmocom_ms *ms); enum osmosap_state { diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 23b482a..b436c75 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -554,15 +554,6 @@ return 0; } -int osmosap_sapsocket(struct osmocom_ms *ms, const char *path) -{ - struct gsm_settings *set = &ms->settings; - memset(set->sap_socket_path, 0, sizeof(set->sap_socket_path)); - osmo_strlcpy(set->sap_socket_path, path, sizeof(set->sap_socket_path) - 1); - - return 0; -} - /* init */ int osmosap_init(struct osmocom_ms *ms) { -- To view, visit https://gerrit.osmocom.org/12432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie3040c75bb61094b9b601aef9d699db603d292f4 Gerrit-Change-Number: 12432 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 20:52:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 26 Dec 2018 20:52:22 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: remove redundant socket_path argument In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12433 ) Change subject: layer23/sap_interface.c: remove redundant socket_path argument ...................................................................... layer23/sap_interface.c: remove redundant socket_path argument Change-Id: I408b3e1fa40e9b5daf88fa6ed5f3930b83dffe6f --- M src/host/layer23/include/osmocom/bb/common/sap_interface.h M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/mobile/subscriber.c 3 files changed, 6 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h index e2aad3f..e78320e 100644 --- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h @@ -2,7 +2,7 @@ typedef int (*osmosap_cb_t)(struct msgb *msg, struct osmocom_ms *ms); -int sap_open(struct osmocom_ms *ms, const char *socket_path); +int sap_open(struct osmocom_ms *ms); int sap_close(struct osmocom_ms *ms); int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length); int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb); diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index b436c75..7a42233 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -502,14 +502,15 @@ return 0; } -int sap_open(struct osmocom_ms *ms, const char *socket_path) +int sap_open(struct osmocom_ms *ms) { ssize_t rc; - rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); + rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, + ms->settings.sap_socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { LOGP(DSAP, LOGL_ERROR, "Failed to create unix domain socket %s: %s\n", - socket_path, strerror(-rc)); + ms->settings.sap_socket_path, strerror(-rc)); ms->sap_entity.sap_state = SAP_SOCKET_ERROR; return rc; } diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 7f24d56..b2be554 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -1282,7 +1282,7 @@ /* Try to connect to the SAP interface */ vty_notify(ms, NULL); vty_notify(ms, "Connecting to the SAP interface...\n"); - rc = sap_open(ms, ms->settings.sap_socket_path); + rc = sap_open(ms); if (rc < 0) { LOGP(DSAP, LOGL_ERROR, "Failed during sap_open(), no SAP based SIM reader\n"); vty_notify(ms, "SAP connection error!\n"); -- To view, visit https://gerrit.osmocom.org/12433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I408b3e1fa40e9b5daf88fa6ed5f3930b83dffe6f Gerrit-Change-Number: 12433 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 20:52:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 26 Dec 2018 20:52:23 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: use int for rc in sap_open() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12434 ) Change subject: layer23/sap_interface.c: use int for rc in sap_open() ...................................................................... layer23/sap_interface.c: use int for rc in sap_open() Change-Id: I683f87ae09393c45377c39317b08c613055ceb16 --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 7a42233..0d42209 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -504,7 +504,7 @@ int sap_open(struct osmocom_ms *ms) { - ssize_t rc; + int rc; rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, ms->settings.sap_socket_path, OSMO_SOCK_F_CONNECT); -- To view, visit https://gerrit.osmocom.org/12434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I683f87ae09393c45377c39317b08c613055ceb16 Gerrit-Change-Number: 12434 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 26 20:52:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 26 Dec 2018 20:52:23 +0000 Subject: Change in osmocom-bb[master]: layer23/sap_interface.c: use LOGP() instead of fprintf() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12435 ) Change subject: layer23/sap_interface.c: use LOGP() instead of fprintf() ...................................................................... layer23/sap_interface.c: use LOGP() instead of fprintf() Change-Id: I054be24666fcd5eb8a70cfcac0e7ed566e909b90 --- M src/host/layer23/src/common/sap_interface.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index 0d42209..dd7737a 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -380,19 +380,19 @@ sap_buffer = talloc_zero_size(NULL, ms->sap_entity.max_msg_size); if(!sap_buffer){ - fprintf(stderr, "Failed to allocate memory\n"); + LOGP(DSAP, LOGL_ERROR, "Failed to allocate memory\n"); return -ENOMEM; } rc = read(fd->fd, sap_buffer, ms->sap_entity.max_msg_size - 1); if (rc < 0) { - fprintf(stderr, "SAP socket failed\n"); + LOGP(DSAP, LOGL_ERROR,"SAP socket failed\n"); msgb_free(msg); sap_close(ms); return rc; } if(rc == 0) { - fprintf(stderr, "SAP socket closed by server\n"); + LOGP(DSAP, LOGL_NOTICE, "SAP socket closed by server\n"); msgb_free(msg); sap_close(ms); return -ECONNREFUSED; -- To view, visit https://gerrit.osmocom.org/12435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I054be24666fcd5eb8a70cfcac0e7ed566e909b90 Gerrit-Change-Number: 12435 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: K?vin Redon Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Dec 27 00:10:56 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 27 Dec 2018 00:10:56 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable-?= =?UTF-8?Q?iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7748?= Message-ID: <881866623.281.1545869456962.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 11.36 KB...] checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/timerfd.h usability... yes checking sys/timerfd.h presence... yes checking for sys/timerfd.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for library containing dlsym... -ldl checking for backtrace in -lexecinfo... no checking for library containing clock_gettime... none required checking for doxygen... (cached) false checking whether SYS_getrandom is declared... no checking if gcc supports -fvisibility=hidden... yes checking for clock_gettime... yes checking for localtime_r... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether to enable VTY/CTRL tests... no checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.12.0.175-47022 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmocore' Making install in include make[2]: Entering directory '/build/deps/libosmocore/include' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/include' GEN osmocom/core/bit32gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc64gen.h make[4]: Entering directory '/build/deps/libosmocore/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/include' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/core' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h '/build/deps/install/stow/libosmocore/include/osmocom/core' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/coding' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h '/build/deps/install/stow/libosmocore/include/osmocom/coding' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/core' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h '/build/deps/install/stow/libosmocore/include/osmocom/core' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/vty' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h '/build/deps/install/stow/libosmocore/include/osmocom/vty' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gsm/protocol' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_29_118.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h '/build/deps/install/stow/libosmocore/include/osmocom/gsm/protocol' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/sim' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h '/build/deps/install/stow/libosmocore/include/osmocom/sim' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gprs' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h '/build/deps/install/stow/libosmocore/include/osmocom/gprs' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/crypt' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h '/build/deps/install/stow/libosmocore/include/osmocom/crypt' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gsm' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm29205.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm29118.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/gsup_sms.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h '/build/deps/install/stow/libosmocore/include/osmocom/gsm' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/ctrl' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h '/build/deps/install/stow/libosmocore/include/osmocom/ctrl' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gprs/protocol' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h '/build/deps/install/stow/libosmocore/include/osmocom/gprs/protocol' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/codec' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h '/build/deps/install/stow/libosmocore/include/osmocom/codec' make[4]: Leaving directory '/build/deps/libosmocore/include' make[3]: Leaving directory '/build/deps/libosmocore/include' make[2]: Leaving directory '/build/deps/libosmocore/include' Making install in src make[2]: Entering directory '/build/deps/libosmocore/src' GEN crc8gen.c GEN crc64gen.c GEN crc16gen.c GEN crc32gen.c make install-am make[3]: Entering directory '/build/deps/libosmocore/src' CC timer.lo CC timer_gettimeofday.lo CC timer_clockgettime.lo CC select.lo CC bitvec.lo CC signal.lo CC msgb.lo CC bits.lo CC bitcomp.lo CC fsm.lo CC counter.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC loggingrb.lo CC strrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo /bin/bash: line 2: 4654 Illegal instruction (core dumped) /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT strrb.lo -MD -MP -MF $depbase.Tpo -c -o strrb.lo strrb.c make[3]: *** [strrb.lo] Error 132 make[3]: *** Waiting for unfinished jobs.... Makefile:549: recipe for target 'strrb.lo' failed make[3]: Leaving directory '/build/deps/libosmocore/src' Makefile:653: recipe for target 'install' failed make[2]: Leaving directory '/build/deps/libosmocore/src' make[2]: *** [install] Error 2 Makefile:604: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:903: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu Dec 27 00:22:48 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 27 Dec 2018 00:22:48 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norm?= =?UTF-8?Q?al_:_master-osmo-sgsn_=C2=BB_--disa?= =?UTF-8?Q?ble-iu,1,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7749?= In-Reply-To: <881866623.281.1545869456962.JavaMail.jenkins@jenkins.osmocom.org> References: <881866623.281.1545869456962.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1976773928.282.1545870168976.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu Dec 27 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 27 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#352?= In-Reply-To: <348764013.280.1545837007379.JavaMail.jenkins@jenkins.osmocom.org> References: <348764013.280.1545837007379.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1901180581.296.1545923407286.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Dec 27 20:47:48 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 27 Dec 2018 20:47:48 +0000 Subject: Change in gr-gsm[master]: trx/txtime_setter: print error if reference fn is missing In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12395 ) Change subject: trx/txtime_setter: print error if reference fn is missing ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2a6e3f41b6fe79b92d85ff98bc2cd9afd9bdc568 Gerrit-Change-Number: 12395 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Thu, 27 Dec 2018 20:47:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 27 20:49:38 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 27 Dec 2018 20:49:38 +0000 Subject: Change in gr-gsm[master]: trx/txtime_setter: reduce code nesting in process_txtime_of_burst() In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12394 ) Change subject: trx/txtime_setter: reduce code nesting in process_txtime_of_burst() ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c334e16d6b28a5e32cd62a177ad56bfc8e748ee Gerrit-Change-Number: 12394 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Thu, 27 Dec 2018 20:49:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 27 20:49:41 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 27 Dec 2018 20:49:41 +0000 Subject: Change in gr-gsm[master]: trx/txtime_setter: reduce code nesting in process_txtime_of_burst() In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/12394 ) Change subject: trx/txtime_setter: reduce code nesting in process_txtime_of_burst() ...................................................................... trx/txtime_setter: reduce code nesting in process_txtime_of_burst() Change-Id: I5c334e16d6b28a5e32cd62a177ad56bfc8e748ee --- M lib/transmitter/txtime_setter_impl.cc 1 file changed, 39 insertions(+), 39 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Piotr Krysik: Looks good to me, approved; Verified diff --git a/lib/transmitter/txtime_setter_impl.cc b/lib/transmitter/txtime_setter_impl.cc index 3c07cc6..50092f4 100644 --- a/lib/transmitter/txtime_setter_impl.cc +++ b/lib/transmitter/txtime_setter_impl.cc @@ -116,52 +116,52 @@ void txtime_setter_impl::process_txtime_of_burst(pmt::pmt_t msg_in) { - if (d_fn_ref != UNKNOWN_FN) - { - pmt::pmt_t blob = pmt::cdr(msg_in); + if (d_fn_ref == UNKNOWN_FN) + return; - // Extract GSMTAP header from message - gsmtap_hdr *header = (gsmtap_hdr *) pmt::blob_data(blob); - uint32_t frame_nr = be32toh(header->frame_number); - uint32_t ts_num = header->timeslot; + pmt::pmt_t blob = pmt::cdr(msg_in); - time_format txtime = fn_time_delta_cpp(d_fn_ref, d_time_ref, - frame_nr, d_time_hint, ts_num, d_ts_ref); + // Extract GSMTAP header from message + gsmtap_hdr *header = (gsmtap_hdr *) pmt::blob_data(blob); + uint32_t frame_nr = be32toh(header->frame_number); + uint32_t ts_num = header->timeslot; - time_spec_t txtime_spec = time_spec_t(txtime.first, txtime.second); - txtime_spec -= d_delay_correction; - txtime_spec -= d_timing_advance; + time_format txtime = fn_time_delta_cpp(d_fn_ref, d_time_ref, + frame_nr, d_time_hint, ts_num, d_ts_ref); - time_spec_t current_time_estimate = time_spec_t(d_time_hint.first, d_time_hint.second); + time_spec_t txtime_spec = time_spec_t(txtime.first, txtime.second); + txtime_spec -= d_delay_correction; + txtime_spec -= d_timing_advance; - if (txtime_spec <= current_time_estimate) { // Drop too late bursts - std::cout << "lB" << std::flush; - } else if (txtime_spec > current_time_estimate + MAX_EARLY_TIME_DIFF) { // Drop too early bursts - std::cout << "eB" << std::flush; //TODO: too early condition might happen when changing BTSes. - //Wrong fn_time is applied to new or old bursts in such situation. - //This solution is not perfect as MS might be blocked upto - //MAX_EARLY_TIME_DIFF seconds. - //Better solution would be to indentify fn_time and burst coming - //from given BTS (i.e. based on ARFCN) and dropping bursts for which - //the bts_id doesn't match with bts_id of fn_time. - } else { //process bursts that are in the right time-frame - pmt::pmt_t tags_dict = pmt::dict_add( - pmt::make_dict(), - pmt::intern("tx_time"), - pmt::make_tuple( - pmt::from_uint64(txtime_spec.get_full_secs()), - pmt::from_double(txtime_spec.get_frac_secs())) - ); + time_spec_t current_time_estimate = time_spec_t(d_time_hint.first, d_time_hint.second); - tags_dict = pmt::dict_add(tags_dict, - pmt::intern("fn"), pmt::from_uint64(frame_nr)); - tags_dict = pmt::dict_add(tags_dict, - pmt::intern("ts"), pmt::from_uint64(ts_num)); + if (txtime_spec <= current_time_estimate) { // Drop too late bursts + std::cout << "lB" << std::flush; + } else if (txtime_spec > current_time_estimate + MAX_EARLY_TIME_DIFF) { // Drop too early bursts + std::cout << "eB" << std::flush; //TODO: too early condition might happen when changing BTSes. + //Wrong fn_time is applied to new or old bursts in such situation. + //This solution is not perfect as MS might be blocked upto + //MAX_EARLY_TIME_DIFF seconds. + //Better solution would be to indentify fn_time and burst coming + //from given BTS (i.e. based on ARFCN) and dropping bursts for which + //the bts_id doesn't match with bts_id of fn_time. + } else { //process bursts that are in the right time-frame + pmt::pmt_t tags_dict = pmt::dict_add( + pmt::make_dict(), + pmt::intern("tx_time"), + pmt::make_tuple( + pmt::from_uint64(txtime_spec.get_full_secs()), + pmt::from_double(txtime_spec.get_frac_secs())) + ); - // Send a message to the output - pmt::pmt_t msg_out = pmt::cons(tags_dict, pmt::cdr(msg_in)); - message_port_pub(pmt::mp("bursts_out"), msg_out); - } + tags_dict = pmt::dict_add(tags_dict, + pmt::intern("fn"), pmt::from_uint64(frame_nr)); + tags_dict = pmt::dict_add(tags_dict, + pmt::intern("ts"), pmt::from_uint64(ts_num)); + + // Send a message to the output + pmt::pmt_t msg_out = pmt::cons(tags_dict, pmt::cdr(msg_in)); + message_port_pub(pmt::mp("bursts_out"), msg_out); } } -- To view, visit https://gerrit.osmocom.org/12394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5c334e16d6b28a5e32cd62a177ad56bfc8e748ee Gerrit-Change-Number: 12394 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 27 20:49:45 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Thu, 27 Dec 2018 20:49:45 +0000 Subject: Change in gr-gsm[master]: trx/txtime_setter: print error if reference fn is missing In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/12395 ) Change subject: trx/txtime_setter: print error if reference fn is missing ...................................................................... trx/txtime_setter: print error if reference fn is missing Change-Id: I2a6e3f41b6fe79b92d85ff98bc2cd9afd9bdc568 --- M lib/transmitter/txtime_setter_impl.cc 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Piotr Krysik: Looks good to me, approved; Verified diff --git a/lib/transmitter/txtime_setter_impl.cc b/lib/transmitter/txtime_setter_impl.cc index 50092f4..9f3a24d 100644 --- a/lib/transmitter/txtime_setter_impl.cc +++ b/lib/transmitter/txtime_setter_impl.cc @@ -116,9 +116,6 @@ void txtime_setter_impl::process_txtime_of_burst(pmt::pmt_t msg_in) { - if (d_fn_ref == UNKNOWN_FN) - return; - pmt::pmt_t blob = pmt::cdr(msg_in); // Extract GSMTAP header from message @@ -126,6 +123,13 @@ uint32_t frame_nr = be32toh(header->frame_number); uint32_t ts_num = header->timeslot; + if (d_fn_ref == UNKNOWN_FN) { + std::cout << "Missing reference TDMA frame number, dropping " + << format("burst (fn=%u, tn=%u)", frame_nr, ts_num) + << std::endl; + return; + } + time_format txtime = fn_time_delta_cpp(d_fn_ref, d_time_ref, frame_nr, d_time_hint, ts_num, d_ts_ref); -- To view, visit https://gerrit.osmocom.org/12395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2a6e3f41b6fe79b92d85ff98bc2cd9afd9bdc568 Gerrit-Change-Number: 12395 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 28 13:50:35 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 28 Dec 2018 13:50:35 +0000 Subject: Change in osmo-ci[master]: gsm-tester: Install liblua5.3-dev as mobile dependency Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12442 Change subject: gsm-tester: Install liblua5.3-dev as mobile dependency ...................................................................... gsm-tester: Install liblua5.3-dev as mobile dependency Change-Id: I188361cceacde60b9b0b954549d63a34ba81646a --- M ansible/roles/gsm-tester/tasks/main.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/42/12442/1 diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 70a0549..30d18d4 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -34,6 +34,7 @@ - libsqlite3-dev - libasound2-dev - mdbus2 + - liblua5.3-dev - name: install ofono build dependencies apt: -- To view, visit https://gerrit.osmocom.org/12442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I188361cceacde60b9b0b954549d63a34ba81646a Gerrit-Change-Number: 12442 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 28 14:29:35 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 28 Dec 2018 14:29:35 +0000 Subject: Change in osmo-msc[master]: Log MI type on request failure In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12365 ) Change subject: Log MI type on request failure ...................................................................... Patch Set 2: Just a cosmetic addition to make sure that format and the MI-type are coherent. -- To view, visit https://gerrit.osmocom.org/12365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I842a7471ea19a2c13ca1134c56991c0ed63cfb29 Gerrit-Change-Number: 12365 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 28 Dec 2018 14:29:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 28 14:38:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 28 Dec 2018 14:38:59 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12377 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 5: > provide information on when was this API added Which API are you talking about? And how the time of addition is relevent to whether we should use it or not? -- To view, visit https://gerrit.osmocom.org/12377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2dc3a2896b133298cbf850d68e6898300884bbce Gerrit-Change-Number: 12377 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 28 Dec 2018 14:38:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 28 14:43:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 28 Dec 2018 14:43:25 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c at 51 PS2, Line 51: struct osmo_sccp_user *scu, int conn_id) > Programmers arguing about whitespace? Unheard of! Python is a punishment for our sins! :) -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 28 Dec 2018 14:43:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 28 14:52:09 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 28 Dec 2018 14:52:09 +0000 Subject: Change in osmo-sgsn[master]: Store GSN address in libosmocore struct In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12352 ) Change subject: Store GSN address in libosmocore struct ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12352/2/include/osmocom/sgsn/gtphub.h File include/osmocom/sgsn/gtphub.h: https://gerrit.osmocom.org/#/c/12352/2/include/osmocom/sgsn/gtphub.h at 377 PS2, Line 377: struct osmo_gsn_address addr; > You are breaking ABI here, length of struct is different. [?] But why would one want to have two representations of a GSN address? When to use which? If osmo_gsn_address is a superset why wouldn't we want to use it everywhere? -- To view, visit https://gerrit.osmocom.org/12352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ed32a91483dc608c47df77869033a6e891e9e6a Gerrit-Change-Number: 12352 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 28 Dec 2018 14:52:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 28 14:54:49 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 28 Dec 2018 14:54:49 +0000 Subject: Change in osmo-ci[master]: gsm_tester: Add lua-socket dependency used by the scripts Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12443 Change subject: gsm_tester: Add lua-socket dependency used by the scripts ...................................................................... gsm_tester: Add lua-socket dependency used by the scripts Change-Id: Iea51362a592c5b42413cb6d72677d01a0e357555 --- M ansible/roles/gsm-tester/tasks/main.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/43/12443/1 diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 30d18d4..8a854bd 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -35,6 +35,7 @@ - libasound2-dev - mdbus2 - liblua5.3-dev + - lua-socket - name: install ofono build dependencies apt: -- To view, visit https://gerrit.osmocom.org/12443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iea51362a592c5b42413cb6d72677d01a0e357555 Gerrit-Change-Number: 12443 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Dec 28 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 28 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#353?= In-Reply-To: <1901180581.296.1545923407286.JavaMail.jenkins@jenkins.osmocom.org> References: <1901180581.296.1545923407286.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1716498346.311.1546009807409.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Dec 28 17:39:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 28 Dec 2018 17:39:44 +0000 Subject: Change in osmo-ci[master]: gsm_tester: Add lua-socket dependency used by the scripts In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12443 ) Change subject: gsm_tester: Add lua-socket dependency used by the scripts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iea51362a592c5b42413cb6d72677d01a0e357555 Gerrit-Change-Number: 12443 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 28 Dec 2018 17:39:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 28 18:43:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 28 Dec 2018 18:43:34 +0000 Subject: Change in osmo-sysmon[master]: ctrl: separate config structure In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12316 ) Change subject: ctrl: separate config structure ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Gerrit-Change-Number: 12316 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Fri, 28 Dec 2018 18:43:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 28 18:44:07 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 28 Dec 2018 18:44:07 +0000 Subject: Change in osmo-sysmon[master]: ctrl: log host/port on errors In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12318 ) Change subject: ctrl: log host/port on errors ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/12318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Gerrit-Change-Number: 12318 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Fri, 28 Dec 2018 18:44:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 28 21:13:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vasil Velichkov) Date: Fri, 28 Dec 2018 21:13:21 +0000 Subject: Change in gr-gsm[master]: trx/txtime_setter: print error if reference fn is missing In-Reply-To: References: Message-ID: Vasil Velichkov has posted comments on this change. ( https://gerrit.osmocom.org/12395 ) Change subject: trx/txtime_setter: print error if reference fn is missing ...................................................................... Patch Set 1: Hi Vadim, Piotr, Compilation fails with (From https://travis-ci.org/ptrkrysik/gr-gsm/jobs/473083755#L4188-L4203) [ 83%] Building CXX object lib/CMakeFiles/grgsm.dir/transmitter/txtime_setter_impl.cc.o /src/lib/transmitter/txtime_setter_impl.cc: In member function 'void gr::gsm::txtime_setter_impl::process_txtime_of_burst(pmt::pmt_t)': /src/lib/transmitter/txtime_setter_impl.cc:129:22: error: 'format' was not declared in this scope << format("burst (fn=%u, tn=%u)", frame_nr, ts_num) ^~~~~~ -- To view, visit https://gerrit.osmocom.org/12395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2a6e3f41b6fe79b92d85ff98bc2cd9afd9bdc568 Gerrit-Change-Number: 12395 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-CC: Vasil Velichkov Gerrit-Comment-Date: Fri, 28 Dec 2018 21:13:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 28 22:58:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 28 Dec 2018 22:58:25 +0000 Subject: Change in libosmocore[master]: logging/gsmtap: fix buffer overflow in _gsmtap_raw_output() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12444 Change subject: logging/gsmtap: fix buffer overflow in _gsmtap_raw_output() ...................................................................... logging/gsmtap: fix buffer overflow in _gsmtap_raw_output() According to the man page, vsnprintf() returns: - a negative value in case of error; - the number of characters written (excluding '\0'); - the number of characters which *would have been written* if enough space had been available (excluding '\0'). We need to detect if the output was truncated, and properly limit the amount of bytes to be reserved within a msgb. Change-Id: Ifa822edf900ed925ba935c54a28c797c4657358a --- M src/logging_gsmtap.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/12444/1 diff --git a/src/logging_gsmtap.c b/src/logging_gsmtap.c index f17f292..98d2aad 100644 --- a/src/logging_gsmtap.c +++ b/src/logging_gsmtap.c @@ -102,6 +102,12 @@ if (rc < 0) { msgb_free(msg); return; + } else if (rc >= msgb_tailroom(msg)) { + /* If the output was truncated, vsnprintf() returns the + * number of characters which would have been written + * if enough space had been available (excluding '\0'). */ + rc = msgb_tailroom(msg); + msg->tail[rc - 1] = '\0'; } msgb_put(msg, rc); -- To view, visit https://gerrit.osmocom.org/12444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa822edf900ed925ba935c54a28c797c4657358a Gerrit-Change-Number: 12444 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Dec 29 00:20:34 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 29 Dec 2018 00:20:34 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-i?= =?UTF-8?Q?u,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7783?= Message-ID: <591882551.312.1546042834175.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 223.37 KB...] + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmo-sccp + git clone git://git.osmocom.org/libosmo-sccp libosmo-sccp Cloning into 'libosmo-sccp'... + cd libosmo-sccp + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD Your branch is up-to-date with 'origin/master'. + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master Note: checking out 'origin/master'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b new_branch_name HEAD is now at 069b20d... fix ipa_asp_fsm down state transition + git rev-parse HEAD 069b20dd6ef4851ce993b523d11775e8bbae15c0 + cd libosmo-sccp + mkdir -p /build/deps/install/stow + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' examples/Makefile.am: installing './depcomp' tests/sccp/Makefile.am:8: warning: source file '$(top_srcdir)/src/sccp.c' is in a subdirectory, tests/sccp/Makefile.am:8: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --prefix=/build/deps/install/stow/libosmo-sccp --with-systemdsystemunitdir=/build/deps/install/stow/libosmo-sccp/lib/systemd/system checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMONETIF... yes checking for library containing sctp_send... -lsctp checking if gcc supports -fvisibility=hidden... yes checking for doxygen... /usr/bin/doxygen checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Wall" CPPFLAGS=" -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-sigtran.pc config.status: creating libosmo-sccp.pc config.status: creating libosmo-mtp.pc config.status: creating libosmo-xua.pc config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/sccp/Makefile config.status: creating include/osmocom/mtp/Makefile config.status: creating include/osmocom/sigtran/Makefile config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating tests/Makefile config.status: creating tests/sccp/Makefile config.status: creating tests/mtp/Makefile config.status: creating tests/m2ua/Makefile config.status: creating tests/xua/Makefile config.status: creating tests/ss7/Makefile config.status: creating tests/vty/Makefile config.status: creating examples/Makefile config.status: creating stp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating doc/manuals/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Doxyfile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.10.0.43-069b20d > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in mtp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/mtp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' Making install in sccp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sccp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/install/stow/libosmo-sccp/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC libxua_a-xua_msg.o CC sccp.o CC sccp_sap.lo CC mtp_pcap.o CC sccp_helpers.lo CC sua.lo CC xua_msg.lo CC m3ua.lo CC sccp2sua.lo /bin/bash: line 1: 27892 Segmentation fault (core dumped) /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"libosmo-sccp\" -DPACKAGE_TARNAME=\"libosmo-sccp\" -DPACKAGE_VERSION=\"0.10.0.43-069b20d\" -DPACKAGE_STRING=\"libosmo-sccp\ 0.10.0.43-069b20d\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"libosmo-sccp\" -DVERSION=\"0.10.0.43-069b20d\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_LIBSCTP=1 -I. -I../include -I.. -Wall -Wall -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmocore/include/ -I/build/deps/install/stow/libosmo-netif/include/ -g -O2 -Wall -MT m3ua.lo -MD -MP -MF .deps/m3ua.Tpo -c -o m3ua.lo m3ua.c make[2]: *** [m3ua.lo] Error 139 make[2]: *** Waiting for unfinished jobs.... Makefile:562: recipe for target 'm3ua.lo' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/src' make[1]: *** [install-recursive] Error 1 Makefile:488: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make: *** [install] Error 2 Makefile:787: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sat Dec 29 00:54:46 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 29 Dec 2018 00:54:46 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--ena?= =?UTF-8?Q?ble-iu,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#7784?= In-Reply-To: <591882551.312.1546042834175.JavaMail.jenkins@jenkins.osmocom.org> References: <591882551.312.1546042834175.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1199609646.313.1546044886672.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat Dec 29 03:33:01 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 29 Dec 2018 03:33:01 +0000 Subject: Change in osmo-ci[master]: gsm-tester: Install liblua5.3-dev as mobile dependency In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12442 ) Change subject: gsm-tester: Install liblua5.3-dev as mobile dependency ...................................................................... Patch Set 1: Code-Review+2 I had pushed this to the gsm-tester already and the follow-up change has +2. -- To view, visit https://gerrit.osmocom.org/12442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I188361cceacde60b9b0b954549d63a34ba81646a Gerrit-Change-Number: 12442 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Comment-Date: Sat, 29 Dec 2018 03:33:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 03:33:32 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 29 Dec 2018 03:33:32 +0000 Subject: Change in osmo-ci[master]: gsm_tester: Add lua-socket dependency used by the scripts In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12443 ) Change subject: gsm_tester: Add lua-socket dependency used by the scripts ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iea51362a592c5b42413cb6d72677d01a0e357555 Gerrit-Change-Number: 12443 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Comment-Date: Sat, 29 Dec 2018 03:33:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 03:33:38 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 29 Dec 2018 03:33:38 +0000 Subject: Change in osmo-ci[master]: gsm-tester: Install liblua5.3-dev as mobile dependency In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/12442 ) Change subject: gsm-tester: Install liblua5.3-dev as mobile dependency ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I188361cceacde60b9b0b954549d63a34ba81646a Gerrit-Change-Number: 12442 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Comment-Date: Sat, 29 Dec 2018 03:33:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 03:33:44 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 29 Dec 2018 03:33:44 +0000 Subject: Change in osmo-ci[master]: gsm-tester: Install liblua5.3-dev as mobile dependency In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/12442 ) Change subject: gsm-tester: Install liblua5.3-dev as mobile dependency ...................................................................... gsm-tester: Install liblua5.3-dev as mobile dependency Change-Id: I188361cceacde60b9b0b954549d63a34ba81646a --- M ansible/roles/gsm-tester/tasks/main.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Holger Freyther: Looks good to me, approved; Verified diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 70a0549..30d18d4 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -34,6 +34,7 @@ - libsqlite3-dev - libasound2-dev - mdbus2 + - liblua5.3-dev - name: install ofono build dependencies apt: -- To view, visit https://gerrit.osmocom.org/12442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I188361cceacde60b9b0b954549d63a34ba81646a Gerrit-Change-Number: 12442 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 03:33:45 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 29 Dec 2018 03:33:45 +0000 Subject: Change in osmo-ci[master]: gsm_tester: Add lua-socket dependency used by the scripts In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/12443 ) Change subject: gsm_tester: Add lua-socket dependency used by the scripts ...................................................................... gsm_tester: Add lua-socket dependency used by the scripts Change-Id: Iea51362a592c5b42413cb6d72677d01a0e357555 --- M ansible/roles/gsm-tester/tasks/main.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Holger Freyther: Verified diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 30d18d4..8a854bd 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -35,6 +35,7 @@ - libasound2-dev - mdbus2 - liblua5.3-dev + - lua-socket - name: install ofono build dependencies apt: -- To view, visit https://gerrit.osmocom.org/12443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iea51362a592c5b42413cb6d72677d01a0e357555 Gerrit-Change-Number: 12443 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 03:38:53 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 29 Dec 2018 03:38:53 +0000 Subject: Change in osmo-gsm-tester[master]: mobile: Switch from removed cli option to vty port Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/12445 Change subject: mobile: Switch from removed cli option to vty port ...................................................................... mobile: Switch from removed cli option to vty port Bind the mobile's to a random (chosen by the kernel) VTY port. The CLI option was removed and I added a new VTY command to be able to specify the port in addition to the address. DO NOT SUBMIT: Wait for the mobile and libosmocore patch to be submitted before. Change-Id: Ie40a2ba156ba5674d37a15eb30e5b2527e75fbe7 --- M src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl M src/osmo_ms_driver/starter.py 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/45/12445/1 diff --git a/src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl index 395d6f4..0a2cd6d 100644 --- a/src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl @@ -1,3 +1,5 @@ +line vty + bind 127.0.0.1 0 no gps enable no hide-default ms ${test.ms_number} diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index bf7727f..dd3aac5 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -121,7 +121,7 @@ self.log("Starting mobile") # Let the kernel pick an unused port for the VTY. - args = [self._binary, "-c", mob_filename, "--vty-port=0"] + args = [self._binary, "-c", mob_filename] self._omob_proc = process.Process(self.name(), self._tmp_dir, args, env=self._env) if suite_run: -- To view, visit https://gerrit.osmocom.org/12445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie40a2ba156ba5674d37a15eb30e5b2527e75fbe7 Gerrit-Change-Number: 12445 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 09:52:41 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Sat, 29 Dec 2018 09:52:41 +0000 Subject: Change in gr-gsm[master]: trx/txtime_setter: print error if reference fn is missing In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/12395 ) Change subject: trx/txtime_setter: print error if reference fn is missing ...................................................................... Patch Set 1: I was a bit too quick to accept this patch. It is corrected in one of the next commits. -- To view, visit https://gerrit.osmocom.org/12395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2a6e3f41b6fe79b92d85ff98bc2cd9afd9bdc568 Gerrit-Change-Number: 12395 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-CC: Vasil Velichkov Gerrit-Comment-Date: Sat, 29 Dec 2018 09:52:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 12:27:00 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Sat, 29 Dec 2018 12:27:00 +0000 Subject: Change in osmo-msc[master]: add BSC/MSC neighbor VTY commands for inter-MSC HO Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/12446 Change subject: add BSC/MSC neighbor VTY commands for inter-MSC HO ...................................................................... add BSC/MSC neighbor VTY commands for inter-MSC HO Allow configuration of neighbor BSC/MSC via osmo-msc.cfg and the VTY. Each neighbor is mapped to the list of identifiers of cells which are reachable via that neighbor. A new neighbor_ident API manages the neighbor list and supports mapping neighboring BSCs/MSCs to cells, and vice versa. Neighbours are managed with the following new VTY commands: [no] neighbor lac <0-65535> bsc-pc POINT_CODE [no] neighbor lac <0-65535> msc-ip-name IPA_NAME [no] neighbor lac <0-65535> ci <0-999>bsc-pc POINT_CODE [no] neighbor lac <0-65535> ci <0-999> msc-ip-name IPA_NAME [no] neighbor cgi <0-999> <0-999> <0-65535> <0-65535> bsc-pc POINT_CODE [no] neighbor cgi <0-999> <0-999> <0-65535> <0-65535> msc-ipa-name IPA_NAME show neighbor all show neighbor bsc-pc POINT_CODE show neighbor msc-ipa-name IPA_NAME Change-Id: Ia0dd08b087bfd4aa22e234917669d003150a4cd4 Depends: I5535f0d149c2173294538df75764dd181b023312 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/gsm_data.h A include/osmocom/msc/neighbor_ident.h M src/libmsc/Makefile.am M src/libmsc/msc_vty.c A src/libmsc/neighbor_ident.c A src/libmsc/neighbor_ident_vty.c 7 files changed, 700 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/12446/1 diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index d98bc9c..e821993 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -19,6 +19,7 @@ msc_common.h \ msc_ifaces.h \ msc_mgcp.h \ + neighbor_ident.h \ a_reset.h \ ran_conn.h \ rrlp.h \ diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index d2511cb..8930380 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -16,6 +16,7 @@ #include #include +#include #include "gsm_data_shared.h" @@ -208,6 +209,10 @@ struct osmo_sccp_instance *sccp; } a; + /* A list of neighbor BSCs. This list is defined statically via VTY and does not + * necessarily correspond to BSCs attached to the A interface at a given moment. */ + struct neighbor_ident_list *neighbor_list; + struct { /* MSISDN to which to route MO emergency calls */ char *route_to_msisdn; diff --git a/include/osmocom/msc/neighbor_ident.h b/include/osmocom/msc/neighbor_ident.h new file mode 100644 index 0000000..d79d262 --- /dev/null +++ b/include/osmocom/msc/neighbor_ident.h @@ -0,0 +1,71 @@ +/* Manage identity of neighboring BSS cells for inter-BSC handover */ +#pragma once + +#include +#include + +#include +#include + +struct vty; +struct gsm_network; + +enum msc_neighbor_type { + /* Neighboring BSC reachable via SCCP. */ + MSC_NEIGHBOR_TYPE_BSC, + + /* Neighboring MSC reachable via GSUP. */ + MSC_NEIGHBOR_TYPE_MSC +}; + +struct neighbor_ident_addr { + enum msc_neighbor_type type; + union { + int point_code; /* BSC */ + const char *ipa_name; /* MSC */ + } a; +}; + +struct neighbor_ident_list { + struct llist_head list; +}; + +struct neighbor_ident { + struct llist_head entry; + + /* Address of a neighboring BSC or MSC. */ + struct neighbor_ident_addr addr; + + /* IDs of cells in this neighbor's domain. */ + struct gsm0808_cell_id_list2 cell_ids; +}; + +struct gsm0808_cell_id; +struct gsm0808_cell_id_list2; + +const char *neighbor_ident_addr_name(struct gsm_network *net, const struct neighbor_ident_addr *ni_addr); + +struct neighbor_ident_list *neighbor_ident_init(void *talloc_ctx); +void neighbor_ident_free(struct neighbor_ident_list *nil); + +bool neighbor_ident_addr_match(const struct neighbor_ident_addr *entry, + const struct neighbor_ident_addr *search_for, + bool exact_match); + +int neighbor_ident_add(struct neighbor_ident_list *nil, const struct neighbor_ident_addr *addr, + const struct gsm0808_cell_id_list2 *cell_ids); +const struct gsm0808_cell_id_list2 *neighbor_ident_get(const struct neighbor_ident_list *nil, + const struct neighbor_ident_addr *addr); +const struct neighbor_ident_addr *neighbor_ident_lookup_cell(const struct neighbor_ident_list *nil, + struct gsm0808_cell_id *cell_id); +bool neighbor_ident_del(struct neighbor_ident_list *nil, const struct neighbor_ident_addr *addr); +void neighbor_ident_clear(struct neighbor_ident_list *nil); + +void neighbor_ident_iter(const struct neighbor_ident_list *nil, + bool (* iter_cb )(const struct neighbor_ident_addr *addr, + const struct gsm0808_cell_id_list2 *cell_ids, + void *cb_data), + void *cb_data); + +void neighbor_ident_vty_init(struct gsm_network *net); +void neighbor_ident_vty_write(struct vty *vty); diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index 9183ff9..f498001 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -44,6 +44,8 @@ mncc_sock.c \ msc_ifaces.c \ msc_mgcp.c \ + neighbor_ident.c \ + neighbor_ident_vty.c \ ran_conn.c \ rrlp.c \ silent_call.c \ diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 7745e5d..1af42e4 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -1538,6 +1538,8 @@ #ifdef BUILD_IU ranap_iu_vty_init(MSC_NODE, &msc_network->iu.rab_assign_addr_enc); #endif + neighbor_ident_vty_init(msc_network); + osmo_fsm_vty_add_cmds(); osmo_signal_register_handler(SS_SCALL, scall_cbfn, NULL); diff --git a/src/libmsc/neighbor_ident.c b/src/libmsc/neighbor_ident.c new file mode 100644 index 0000000..f7187a9 --- /dev/null +++ b/src/libmsc/neighbor_ident.c @@ -0,0 +1,206 @@ +/* Manage identity of neighboring BSS cells for inter-MSC handover. */ +/* (C) 2018 by sysmocom - s.f.m.c. GmbH + * + * All Rights Reserved + * + * Author: Neels Hofmeyr + * Author: Stefan Sperling + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include +#include + +#include +#include + +/* XXX greater than or equal to IPA_STIRNG_MAX (libosmocore) and MAX_PC_STR_LEN (libosmo-sccp). */ +#define NEIGHBOR_IDENT_ADDR_STRING_MAX 64 + +const char *neighbor_ident_addr_name(struct gsm_network *net, const struct neighbor_ident_addr *na) +{ + static char buf[NEIGHBOR_IDENT_ADDR_STRING_MAX + 4]; + struct osmo_ss7_instance *ss7; + + switch (na->type) { + case MSC_NEIGHBOR_TYPE_BSC: + ss7 = osmo_ss7_instance_find(net->a.cs7_instance); + OSMO_ASSERT(ss7); + snprintf(buf, sizeof(buf), "BSC %s", osmo_ss7_pointcode_print(ss7, na->a.point_code)); + break; + case MSC_NEIGHBOR_TYPE_MSC: + snprintf(buf, sizeof(buf), "MSC %s", na->a.ipa_name); + break; + default: + return NULL; + } + + return buf; +} + +struct neighbor_ident_list *neighbor_ident_init(void *talloc_ctx) +{ + struct neighbor_ident_list *nil = talloc_zero(talloc_ctx, struct neighbor_ident_list); + OSMO_ASSERT(nil); + INIT_LLIST_HEAD(&nil->list); + return nil; +} + +void neighbor_ident_free(struct neighbor_ident_list *nil) +{ + if (!nil) + return; + talloc_free(nil); +} + +static struct neighbor_ident *_neighbor_ident_get(const struct neighbor_ident_list *nil, + const struct neighbor_ident_addr *na) +{ + struct neighbor_ident *ni; + + llist_for_each_entry(ni, &nil->list, entry) { + if (na->type != ni->addr.type) + continue; + + switch (na->type) { + case MSC_NEIGHBOR_TYPE_BSC: + if (ni->addr.a.point_code == na->a.point_code) + return ni; + break; + case MSC_NEIGHBOR_TYPE_MSC: + if (strcmp(ni->addr.a.ipa_name, na->a.ipa_name) == 0) + return ni; + break; + } + } + + return NULL; +} + +static void _neighbor_ident_free(struct neighbor_ident *ni) +{ + llist_del(&ni->entry); + talloc_free(ni); +} + +/*! Add Cell Identifiers to a neighbor BSC/MSC entry. + * Exactly one kind of identifier is allowed per entry, and any number of entries of that kind + * may be added up to the capacity of gsm0808_cell_id_list2, by one or more calls to this function. To + * replace an existing entry, first call neighbor_ident_del(nil, cell_id). + * \returns number of entries in the resulting identifier list, or negative on error: + * see gsm0808_cell_id_list_add() for the meaning of returned error codes; + * return -ENOMEM when the list is not initialized, -ERANGE when the BSIC value is too large. */ +int neighbor_ident_add(struct neighbor_ident_list *nil, const struct neighbor_ident_addr *addr, + const struct gsm0808_cell_id_list2 *cell_id) +{ + struct neighbor_ident *ni; + int rc; + + if (!nil) + return -ENOMEM; + + ni = _neighbor_ident_get(nil, addr); + if (!ni) { + ni = talloc_zero(nil, struct neighbor_ident); + OSMO_ASSERT(ni); + ni->addr.type = addr->type; + switch (ni->addr.type) { + case MSC_NEIGHBOR_TYPE_MSC: + ni->addr.a.ipa_name = talloc_strdup(ni, addr->a.ipa_name); + break; + case MSC_NEIGHBOR_TYPE_BSC: + ni->addr.a.point_code = addr->a.point_code; + break; + } + llist_add_tail(&ni->entry, &nil->list); + } + + rc = gsm0808_cell_id_list_add(&ni->cell_ids, cell_id); + if (rc < 0) + return rc; + + return ni->cell_ids.id_list_len; +} + +/*! Find cell identity for given BSC or MSC, as previously added by neighbor_ident_add(). + */ +const struct gsm0808_cell_id_list2 *neighbor_ident_get(const struct neighbor_ident_list *nil, + const struct neighbor_ident_addr *addr) +{ + struct neighbor_ident *ni; + if (!nil) + return NULL; + ni = _neighbor_ident_get(nil, addr); + if (!ni) + return NULL; + return &ni->cell_ids; +} + +/*! Find a BSC or MSC, as previously added by neighbor_ident_add(), for a given cell identity. + */ +const struct neighbor_ident_addr *neighbor_ident_lookup_cell(const struct neighbor_ident_list *nil, + struct gsm0808_cell_id *cell_id) +{ + struct neighbor_ident *ni; + if (!nil) + return NULL; + llist_for_each_entry(ni, &nil->list, entry) { + if (gsm0808_cell_id_matches_list(cell_id, &ni->cell_ids, 0)) + return &ni->addr; + } + + return NULL; +} + +bool neighbor_ident_del(struct neighbor_ident_list *nil, const struct neighbor_ident_addr *addr) +{ + struct neighbor_ident *ni; + if (!nil) + return false; + ni = _neighbor_ident_get(nil, addr); + if (!ni) + return false; + _neighbor_ident_free(ni); + return true; +} + +void neighbor_ident_clear(struct neighbor_ident_list *nil) +{ + struct neighbor_ident *ni; + while ((ni = llist_first_entry_or_null(&nil->list, struct neighbor_ident, entry))) + _neighbor_ident_free(ni); +} + +/*! Iterate all neighbor_ident_list entries and call iter_cb for each. + * If iter_cb returns false, the iteration is stopped. */ +void neighbor_ident_iter(const struct neighbor_ident_list *nil, + bool (* iter_cb )(const struct neighbor_ident_addr *addr, + const struct gsm0808_cell_id_list2 *cell_ids, + void *cb_data), + void *cb_data) +{ + struct neighbor_ident *ni, *ni_next; + if (!nil) + return; + llist_for_each_entry_safe(ni, ni_next, &nil->list, entry) { + if (!iter_cb(&ni->addr, &ni->cell_ids, cb_data)) + return; + } +} diff --git a/src/libmsc/neighbor_ident_vty.c b/src/libmsc/neighbor_ident_vty.c new file mode 100644 index 0000000..a44a284 --- /dev/null +++ b/src/libmsc/neighbor_ident_vty.c @@ -0,0 +1,413 @@ +/* Quagga VTY implementation to manage identity of neighboring BSS cells for inter-BSC handover. */ +/* (C) 2018 by sysmocom - s.f.m.c. GmbH + * + * All Rights Reserved + * + * Author: Neels Hofmeyr + * Author: Stefan Sperling + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +#define NEIGHBOR_ADD_CMD "neighbor " +#define NEIGHBOR_DEL_CMD "no neighbor " +#define NEIGHBOR_SHOW_CMD "show neighbor " +#define NEIGHBOR_DOC "Manage neighbor BSS cells\n" +#define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add " +#define NEIGHBOR_DEL_DOC NO_STR "Remove neighbor BSS cell\n" + +#define LAC_PARAMS "lac <0-65535>" +#define LAC_DOC "Neighbor cell by LAC\n" "LAC\n" + +#define LAC_CI_PARAMS "lac-ci <0-65535> <0-65535>" +#define LAC_CI_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n" + +#define CGI_PARAMS "cgi <0-999> <0-999> <0-65535> <0-65535>" +#define CGI_DOC "Neighbor cell by cgi\n" "MCC\n" "MNC\n" "LAC\n" "CI\n" + +#define NEIGHBOR_IDENT_VTY_BSC_ADDR_PARAMS "bsc-pc POINT_CODE" +#define NEIGHBOR_IDENT_VTY_BSC_ADDR_DOC "Point code of neighbor BSC\n" "Point code value\n" +#define NEIGHBOR_IDENT_VTY_MSC_ADDR_PARAMS "msc-ipa-name IPA_NAME" +#define NEIGHBOR_IDENT_VTY_MSC_ADDR_DOC "IPA name of neighbor MSC\n" "IPA name value\n" + +static struct gsm_network *g_net = NULL; + +static struct gsm0808_cell_id *neighbor_ident_vty_parse_lac(struct vty *vty, const char **argv) +{ + static struct gsm0808_cell_id cell_id; + cell_id = (struct gsm0808_cell_id){ + .id_discr = CELL_IDENT_LAC, + .id.lac = atoi(argv[0]), + }; + return &cell_id; +} + +static struct gsm0808_cell_id *neighbor_ident_vty_parse_lac_ci(struct vty *vty, const char **argv) +{ + static struct gsm0808_cell_id cell_id; + cell_id = (struct gsm0808_cell_id){ + .id_discr = CELL_IDENT_LAC_AND_CI, + .id.lac_and_ci = { + .lac = atoi(argv[0]), + .ci = atoi(argv[1]), + }, + }; + return &cell_id; +} + +static struct gsm0808_cell_id *neighbor_ident_vty_parse_cgi(struct vty *vty, const char **argv) +{ + static struct gsm0808_cell_id cell_id; + cell_id = (struct gsm0808_cell_id){ + .id_discr = CELL_IDENT_WHOLE_GLOBAL, + }; + struct osmo_cell_global_id *cgi = &cell_id.id.global; + const char *mcc = argv[0]; + const char *mnc = argv[1]; + const char *lac = argv[2]; + const char *ci = argv[3]; + + if (osmo_mcc_from_str(mcc, &cgi->lai.plmn.mcc)) { + vty_out(vty, "%% Error decoding MCC: %s%s", mcc, VTY_NEWLINE); + return NULL; + } + + if (osmo_mnc_from_str(mnc, &cgi->lai.plmn.mnc, &cgi->lai.plmn.mnc_3_digits)) { + vty_out(vty, "%% Error decoding MNC: %s%s", mnc, VTY_NEWLINE); + return NULL; + } + + cgi->lai.lac = atoi(lac); + cgi->cell_identity = atoi(ci); + return &cell_id; +} + +static int add_neighbor(struct vty *vty, struct neighbor_ident_addr *addr, const struct gsm0808_cell_id *cell_id) +{ + struct gsm0808_cell_id_list2 cell_ids; + int rc; + + gsm0808_cell_id_to_list(&cell_ids, cell_id); + rc = neighbor_ident_add(g_net->neighbor_list, addr, &cell_ids); + if (rc < 0) { + vty_out(vty, "%% Error: cannot add cell %s to neighbor %s: %s%s", + gsm0808_cell_id_name(cell_id), neighbor_ident_addr_name(g_net, addr), + strerror(-rc), VTY_NEWLINE); + return CMD_WARNING; + } + return CMD_SUCCESS; +} + +static int parse_point_code(const char *point_code_str) +{ + struct osmo_ss7_instance *ss7 = osmo_ss7_instance_find(g_net->a.cs7_instance); + OSMO_ASSERT(ss7); + return osmo_ss7_pointcode_parse(ss7, point_code_str); +} + +DEFUN(cfg_neighbor_add_lac_bsc, cfg_neighbor_add_lac_bsc_cmd, + NEIGHBOR_ADD_CMD LAC_PARAMS " " NEIGHBOR_IDENT_VTY_BSC_ADDR_PARAMS, + NEIGHBOR_ADD_DOC LAC_DOC " " NEIGHBOR_IDENT_VTY_BSC_ADDR_DOC) +{ + struct neighbor_ident_addr addr; + int point_code = parse_point_code(argv[1]); + + if (point_code < 0) { + vty_out(vty, "Could not parse point code '%s'%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + addr.type = MSC_NEIGHBOR_TYPE_BSC; + addr.a.point_code = point_code; + return add_neighbor(vty, &addr, neighbor_ident_vty_parse_lac(vty, argv + 1)); +} + +DEFUN(cfg_neighbor_add_lac_msc, cfg_neighbor_add_lac_msc_cmd, + NEIGHBOR_ADD_CMD LAC_PARAMS " " NEIGHBOR_IDENT_VTY_MSC_ADDR_PARAMS, + NEIGHBOR_ADD_DOC LAC_DOC " " NEIGHBOR_IDENT_VTY_MSC_ADDR_DOC) +{ + struct neighbor_ident_addr addr; + + addr.type = MSC_NEIGHBOR_TYPE_MSC; + addr.a.ipa_name = argv[1]; + return add_neighbor(vty, &addr, neighbor_ident_vty_parse_lac(vty, argv + 1)); +} + +DEFUN(cfg_neighbor_add_lac_ci_bsc, cfg_neighbor_add_lac_ci_bsc_cmd, + NEIGHBOR_ADD_CMD LAC_CI_PARAMS " " NEIGHBOR_IDENT_VTY_BSC_ADDR_PARAMS, + NEIGHBOR_ADD_DOC LAC_CI_DOC " " NEIGHBOR_IDENT_VTY_BSC_ADDR_DOC) +{ + struct neighbor_ident_addr addr; + int point_code = parse_point_code(argv[2]); + + if (point_code < 0) { + vty_out(vty, "Could not parse point code '%s'%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + addr.type = MSC_NEIGHBOR_TYPE_BSC; + addr.a.point_code = point_code; + return add_neighbor(vty, &addr, neighbor_ident_vty_parse_lac_ci(vty, argv + 1)); +} + +DEFUN(cfg_neighbor_add_lac_ci_msc, cfg_neighbor_add_lac_ci_msc_cmd, + NEIGHBOR_ADD_CMD LAC_CI_PARAMS " " NEIGHBOR_IDENT_VTY_MSC_ADDR_PARAMS, + NEIGHBOR_ADD_DOC LAC_CI_DOC " " NEIGHBOR_IDENT_VTY_MSC_ADDR_DOC) +{ + struct neighbor_ident_addr addr; + + addr.type = MSC_NEIGHBOR_TYPE_MSC; + addr.a.ipa_name = argv[2]; + return add_neighbor(vty, &addr, neighbor_ident_vty_parse_lac_ci(vty, argv + 1)); +} + +DEFUN(cfg_neighbor_add_cgi_bsc, cfg_neighbor_add_cgi_bsc_cmd, + NEIGHBOR_ADD_CMD CGI_PARAMS " " NEIGHBOR_IDENT_VTY_BSC_ADDR_PARAMS, + NEIGHBOR_ADD_DOC CGI_DOC " " NEIGHBOR_IDENT_VTY_BSC_ADDR_DOC) +{ + struct neighbor_ident_addr addr; + int point_code = parse_point_code(argv[4]); + + if (point_code < 0) { + vty_out(vty, "Could not parse point code '%s'%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + addr.type = MSC_NEIGHBOR_TYPE_BSC; + addr.a.point_code = point_code; + return add_neighbor(vty, &addr, neighbor_ident_vty_parse_cgi(vty, argv + 1)); +} + +DEFUN(cfg_neighbor_add_cgi_msc, cfg_neighbor_add_cgi_msc_cmd, + NEIGHBOR_ADD_CMD CGI_PARAMS " " NEIGHBOR_IDENT_VTY_MSC_ADDR_PARAMS, + NEIGHBOR_ADD_DOC CGI_DOC " " NEIGHBOR_IDENT_VTY_MSC_ADDR_DOC) +{ + struct neighbor_ident_addr addr; + + addr.type = MSC_NEIGHBOR_TYPE_MSC; + addr.a.ipa_name = argv[4]; + return add_neighbor(vty, &addr, neighbor_ident_vty_parse_cgi(vty, argv + 1)); +} + +static int del_by_addr(struct vty *vty, const struct neighbor_ident_addr *addr) +{ + int removed = 0; + + if (vty->node != MSC_NODE) { + vty_out(vty, "%% Error: cannot remove neighbor, not on MSC node%s", VTY_NEWLINE); + return CMD_WARNING; + } + + if (neighbor_ident_del(g_net->neighbor_list, addr)) { + vty_out(vty, "%% Removed neighbor %s%s", + neighbor_ident_addr_name(g_net, addr), VTY_NEWLINE); + removed = 1; + } + + if (!removed) { + vty_out(vty, "%% Cannot remove, no such neighbor: %s%s", + neighbor_ident_addr_name(g_net, addr), VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_del_neighbor_bsc, cfg_del_neighbor_bsc_cmd, + NEIGHBOR_DEL_CMD NEIGHBOR_IDENT_VTY_BSC_ADDR_PARAMS, + SHOW_STR "Delete a neighbor BSC\n" "BSC point code\n" + "Delete a specified neighbor BSC\n" + NEIGHBOR_IDENT_VTY_BSC_ADDR_DOC) +{ + struct neighbor_ident_addr addr; + int point_code = parse_point_code(argv[0]); + + if (point_code < 0) { + vty_out(vty, "Could not parse point code '%s'%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + addr.type = MSC_NEIGHBOR_TYPE_BSC; + addr.a.point_code = point_code; + return del_by_addr(vty, &addr); +} + +DEFUN(cfg_del_neighbor_msc, cfg_del_neighbor_msc_cmd, + NEIGHBOR_DEL_CMD NEIGHBOR_IDENT_VTY_MSC_ADDR_PARAMS, + SHOW_STR "Delete a neighbor MSC\n" "MSC ipa-nam\n" + "Delete a specified neighbor MSC\n" + NEIGHBOR_IDENT_VTY_MSC_ADDR_DOC) +{ + struct neighbor_ident_addr addr; + + addr.type = MSC_NEIGHBOR_TYPE_MSC; + addr.a.ipa_name = argv[0]; + return del_by_addr(vty, &addr); +} + +static void write_neighbor_ident(struct vty *vty, const struct neighbor_ident *ni) +{ + const struct neighbor_ident_addr *addr = &ni->addr; + const struct gsm0808_cell_id_list2 *cell_ids = &ni->cell_ids; + struct osmo_ss7_instance *ss7; + int i; + + switch (cell_ids->id_discr) { + case CELL_IDENT_LAC: + for (i = 0; i < cell_ids->id_list_len; i++) { + vty_out(vty, " neighbor lac %u", cell_ids->id_list[i].lac); + } + break; + case CELL_IDENT_LAC_AND_CI: + for (i = 0; i < cell_ids->id_list_len; i++) { + vty_out(vty, " neighbor lac-ci %u %u", cell_ids->id_list[i].lac_and_ci.lac, + cell_ids->id_list[i].lac_and_ci.ci); + } + break; + case CELL_IDENT_WHOLE_GLOBAL: + for (i = 0; i < cell_ids->id_list_len; i++) { + const struct osmo_cell_global_id *cgi = &cell_ids->id_list[i].global; + vty_out(vty, " neighbor cgi %s %s %u %u", osmo_mcc_name(cgi->lai.plmn.mcc), + osmo_mnc_name(cgi->lai.plmn.mnc, cgi->lai.plmn.mnc_3_digits), + cgi->lai.lac, cgi->cell_identity); + } + break; + default: + vty_out(vty, "%% Unsupported Cell Identity%s", VTY_NEWLINE); + return; + } + + switch (ni->addr.type) { + case MSC_NEIGHBOR_TYPE_BSC: + ss7 = osmo_ss7_instance_find(g_net->a.cs7_instance); + OSMO_ASSERT(ss7); + vty_out(vty, "bsc-pc %s%s", osmo_ss7_pointcode_print(ss7, addr->a.point_code), VTY_NEWLINE); + break; + case MSC_NEIGHBOR_TYPE_MSC: + vty_out(vty, "msc-ipa-name %s%s", addr->a.ipa_name, VTY_NEWLINE); + break; + } +} + +void neighbor_ident_vty_write(struct vty *vty) +{ + const struct neighbor_ident *ni; + + llist_for_each_entry(ni, &g_net->neighbor_list->list, entry) + write_neighbor_ident(vty, ni); +} + +DEFUN(show_neighbor_all, show_neighbor_all_cmd, + NEIGHBOR_SHOW_CMD "all", + SHOW_STR "Display information about neighbor BSCs and MSCs\n" + "Show which cells are reachable via the neighbor BSCs and MSCs\n") +{ + struct neighbor_ident *ni; + + llist_for_each_entry(ni, &g_net->neighbor_list->list, entry) { + vty_out(vty, "%s: %s%s", neighbor_ident_addr_name(g_net, &ni->addr), + gsm0808_cell_id_list_name(&ni->cell_ids), VTY_NEWLINE); + } + + return CMD_SUCCESS; +} + +DEFUN(show_neighbor_bsc, show_neighbor_bsc_cmd, + NEIGHBOR_SHOW_CMD NEIGHBOR_IDENT_VTY_BSC_ADDR_PARAMS, + SHOW_STR "Display information about a neighbor BSC\n" "BSC point code\n" + "Show which cells are reachable via the specified neighbor BSC\n" + NEIGHBOR_IDENT_VTY_BSC_ADDR_DOC) +{ + int point_code; + struct neighbor_ident *ni; + int found = 0; + + point_code = parse_point_code(argv[0]); + if (point_code < 0) { + vty_out(vty, "Could not parse point code '%s'%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + llist_for_each_entry(ni, &g_net->neighbor_list->list, entry) { + if (ni->addr.type != MSC_NEIGHBOR_TYPE_BSC) + continue; + if (ni->addr.a.point_code == point_code) { + vty_out(vty, "%s%s", gsm0808_cell_id_list_name(&ni->cell_ids), VTY_NEWLINE); + found = 1; + break; + } + } + + if (!found) + vty_out(vty, "%% No entry for %s%s", argv[0], VTY_NEWLINE); + + return CMD_SUCCESS; +} + +DEFUN(show_neighbor_msc, show_neighbor_msc_cmd, + NEIGHBOR_SHOW_CMD NEIGHBOR_IDENT_VTY_MSC_ADDR_PARAMS, + SHOW_STR "Display information about a neighbor MSC\n" "MSC ipa-name\n" + "Show which cells are reachable via the specified neighbor MSC\n" + NEIGHBOR_IDENT_VTY_MSC_ADDR_DOC) +{ + const char *ipa_name = argv[0]; + struct neighbor_ident *ni; + int found = 0; + + llist_for_each_entry(ni, &g_net->neighbor_list->list, entry) { + if (ni->addr.type != MSC_NEIGHBOR_TYPE_MSC) + continue; + if (strcmp(ni->addr.a.ipa_name, ipa_name) == 0) { + vty_out(vty, "%s%s", gsm0808_cell_id_list_name(&ni->cell_ids), VTY_NEWLINE); + found = 1; + break; + } + } + + if (!found) + vty_out(vty, "%% No entry for %s%s", ipa_name, VTY_NEWLINE); + + return CMD_SUCCESS; +} + +void neighbor_ident_vty_init(struct gsm_network *net) +{ + g_net = net; + g_net->neighbor_list = neighbor_ident_init(net); + + install_element(MSC_NODE, &cfg_neighbor_add_lac_bsc_cmd); + install_element(MSC_NODE, &cfg_neighbor_add_lac_msc_cmd); + install_element(MSC_NODE, &cfg_neighbor_add_lac_ci_bsc_cmd); + install_element(MSC_NODE, &cfg_neighbor_add_lac_ci_msc_cmd); + install_element(MSC_NODE, &cfg_neighbor_add_cgi_bsc_cmd); + install_element(MSC_NODE, &cfg_neighbor_add_cgi_msc_cmd); + install_element(MSC_NODE, &cfg_del_neighbor_bsc_cmd); + install_element(MSC_NODE, &cfg_del_neighbor_msc_cmd); + install_element_ve(&show_neighbor_all_cmd); + install_element_ve(&show_neighbor_bsc_cmd); + install_element_ve(&show_neighbor_msc_cmd); +} -- To view, visit https://gerrit.osmocom.org/12446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0dd08b087bfd4aa22e234917669d003150a4cd4 Gerrit-Change-Number: 12446 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 12:28:36 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Sat, 29 Dec 2018 12:28:36 +0000 Subject: Change in osmo-msc[master]: add BSC/MSC neighbor VTY commands for inter-MSC HO In-Reply-To: References: Message-ID: Stefan Sperling has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12446 ) Change subject: add BSC/MSC neighbor VTY commands for inter-MSC HO ...................................................................... add BSC/MSC neighbor VTY commands for inter-MSC HO Allow configuration of neighbor BSC/MSC via osmo-msc.cfg and the VTY. Each neighbor is mapped to the list of identifiers of cells which are reachable via that neighbor. A new neighbor_ident API manages the neighbor list and supports mapping neighboring BSCs/MSCs to cells, and vice versa. Neighbours are managed with the following new VTY commands: [no] neighbor lac <0-65535> bsc-pc POINT_CODE [no] neighbor lac <0-65535> msc-ip-name IPA_NAME [no] neighbor lac <0-65535> ci <0-999>bsc-pc POINT_CODE [no] neighbor lac <0-65535> ci <0-999> msc-ip-name IPA_NAME [no] neighbor cgi <0-999> <0-999> <0-65535> <0-65535> bsc-pc POINT_CODE [no] neighbor cgi <0-999> <0-999> <0-65535> <0-65535> msc-ipa-name IPA_NAME show neighbor all show neighbor bsc-pc POINT_CODE show neighbor msc-ipa-name IPA_NAME Change-Id: Ia0dd08b087bfd4aa22e234917669d003150a4cd4 Depends: I5535f0d149c2173294538df75764dd181b023312 Related: OS#3618 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/gsm_data.h A include/osmocom/msc/neighbor_ident.h M src/libmsc/Makefile.am M src/libmsc/msc_vty.c A src/libmsc/neighbor_ident.c A src/libmsc/neighbor_ident_vty.c 7 files changed, 700 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/12446/2 -- To view, visit https://gerrit.osmocom.org/12446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia0dd08b087bfd4aa22e234917669d003150a4cd4 Gerrit-Change-Number: 12446 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 12:32:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Sat, 29 Dec 2018 12:32:21 +0000 Subject: Change in osmo-msc[master]: add BSC/MSC neighbor VTY commands for inter-MSC HO In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/12446 ) Change subject: add BSC/MSC neighbor VTY commands for inter-MSC HO ...................................................................... Patch Set 2: Build will of ocurse fail until I5535f0d149c2173294538df75764dd181b023312 is merged to master. -- To view, visit https://gerrit.osmocom.org/12446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0dd08b087bfd4aa22e234917669d003150a4cd4 Gerrit-Change-Number: 12446 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Sat, 29 Dec 2018 12:32:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 12:33:05 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Sat, 29 Dec 2018 12:33:05 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 4: https://gerrit.osmocom.org/#/c/osmo-msc/+/12446 depends on this. -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sat, 29 Dec 2018 12:33:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 13:02:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sat, 29 Dec 2018 13:02:01 +0000 Subject: Change in openbsc[master]: abis: fix unaligned memory access In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/3750 ) Change subject: abis: fix unaligned memory access ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/3750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ie8a3107c22cd7f3682fac037e04a50ef3ea9171c Gerrit-Change-Number: 3750 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Dec 29 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 29 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#354?= In-Reply-To: <1716498346.311.1546009807409.JavaMail.jenkins@jenkins.osmocom.org> References: <1716498346.311.1546009807409.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1942331234.328.1546096207408.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.76 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Dec 29 17:59:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 29 Dec 2018 17:59:13 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12377 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 5: > > provide information on when was this API added > > Which API are you talking about? And how the time of addition is > relevent to whether we should use it or not? lcls_bss_status_present is a field in a public structure, so it's part of the public API right? Time of addition matters. If it was already present in an older release, then we should avoid changing it to prevent from API breakage. If it was included after latest release, it's fine to change it since it was never released. -- To view, visit https://gerrit.osmocom.org/12377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2dc3a2896b133298cbf850d68e6898300884bbce Gerrit-Change-Number: 12377 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Sat, 29 Dec 2018 17:59:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 18:11:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 29 Dec 2018 18:11:49 +0000 Subject: Change in libosmocore[master]: logging/gsmtap: fix buffer overflow in _gsmtap_raw_output() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12444 ) Change subject: logging/gsmtap: fix buffer overflow in _gsmtap_raw_output() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifa822edf900ed925ba935c54a28c797c4657358a Gerrit-Change-Number: 12444 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 29 Dec 2018 18:11:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 18:43:27 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sat, 29 Dec 2018 18:43:27 +0000 Subject: Change in libosmocore[master]: Add function to estimate elapsed time In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/5103 ) Change subject: Add function to estimate elapsed time ...................................................................... Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/5103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I83d865ff633a7ebda2c943477205fd31aceda277 Gerrit-Change-Number: 5103 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 29 Dec 2018 18:43:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 18:43:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sat, 29 Dec 2018 18:43:34 +0000 Subject: Change in libosmocore[master]: NS: use monotonic clock In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/5104 ) Change subject: NS: use monotonic clock ...................................................................... Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/5104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6949601a80747f0de1a05e0790a1bace209efbf Gerrit-Change-Number: 5104 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Sat, 29 Dec 2018 18:43:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 18:43:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sat, 29 Dec 2018 18:43:41 +0000 Subject: Change in libosmocore[master]: BSSGP: use monotonic clock In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/5629 ) Change subject: BSSGP: use monotonic clock ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/5629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If190a634aa8334cae55df8c41877400d2f5603a2 Gerrit-Change-Number: 5629 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Sat, 29 Dec 2018 18:43:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 18:43:47 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sat, 29 Dec 2018 18:43:47 +0000 Subject: Change in libosmocore[master]: Remove unused timeval parameters In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/5631 ) Change subject: Remove unused timeval parameters ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/5631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I16ffe9aca21be1fa71184abc57a5745923c5cfcb Gerrit-Change-Number: 5631 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Sat, 29 Dec 2018 18:43:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 18:59:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sat, 29 Dec 2018 18:59:38 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12377 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 5: > lcls_bss_status_present is a field in a public structure, so it's part of the public API right? Right but it's removed in https://gerrit.osmocom.org/c/libosmocore/+/12369 and not in this commit. > If it was already present in an older release, then we should avoid changing it to prevent from API breakage. If it was included after latest release, it's fine to change it since it was never released. If we would follow this logic we'll keep broken API forever which does not make much sense and that's not how we handled this so far. Instead we should properly bump the API/ABI version. To do that we update TODO-RELEASE which is done in corresponding commit. -- To view, visit https://gerrit.osmocom.org/12377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2dc3a2896b133298cbf850d68e6898300884bbce Gerrit-Change-Number: 12377 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Sat, 29 Dec 2018 18:59:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 20:12:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 29 Dec 2018 20:12:31 +0000 Subject: Change in libosmocore[master]: LCLS: don't send invalid status in HO messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12377 ) Change subject: LCLS: don't send invalid status in HO messages ...................................................................... Patch Set 5: Code-Review-2 see my other comment on the libosmocore side of this change. -- To view, visit https://gerrit.osmocom.org/12377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2dc3a2896b133298cbf850d68e6898300884bbce Gerrit-Change-Number: 12377 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Sat, 29 Dec 2018 20:12:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 20:14:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 29 Dec 2018 20:14:06 +0000 Subject: Change in libosmocore[master]: Add function to estimate elapsed time In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/5103 ) Change subject: Add function to estimate elapsed time ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I83d865ff633a7ebda2c943477205fd31aceda277 Gerrit-Change-Number: 5103 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 29 Dec 2018 20:14:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 20:14:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 29 Dec 2018 20:14:59 +0000 Subject: Change in libosmocore[master]: logging/gsmtap: fix buffer overflow in _gsmtap_raw_output() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12444 ) Change subject: logging/gsmtap: fix buffer overflow in _gsmtap_raw_output() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifa822edf900ed925ba935c54a28c797c4657358a Gerrit-Change-Number: 12444 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 29 Dec 2018 20:14:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 20:15:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 29 Dec 2018 20:15:02 +0000 Subject: Change in libosmocore[master]: logging/gsmtap: fix buffer overflow in _gsmtap_raw_output() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12444 ) Change subject: logging/gsmtap: fix buffer overflow in _gsmtap_raw_output() ...................................................................... logging/gsmtap: fix buffer overflow in _gsmtap_raw_output() According to the man page, vsnprintf() returns: - a negative value in case of error; - the number of characters written (excluding '\0'); - the number of characters which *would have been written* if enough space had been available (excluding '\0'). We need to detect if the output was truncated, and properly limit the amount of bytes to be reserved within a msgb. Change-Id: Ifa822edf900ed925ba935c54a28c797c4657358a --- M src/logging_gsmtap.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/logging_gsmtap.c b/src/logging_gsmtap.c index f17f292..98d2aad 100644 --- a/src/logging_gsmtap.c +++ b/src/logging_gsmtap.c @@ -102,6 +102,12 @@ if (rc < 0) { msgb_free(msg); return; + } else if (rc >= msgb_tailroom(msg)) { + /* If the output was truncated, vsnprintf() returns the + * number of characters which would have been written + * if enough space had been available (excluding '\0'). */ + rc = msgb_tailroom(msg); + msg->tail[rc - 1] = '\0'; } msgb_put(msg, rc); -- To view, visit https://gerrit.osmocom.org/12444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifa822edf900ed925ba935c54a28c797c4657358a Gerrit-Change-Number: 12444 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 20:17:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 29 Dec 2018 20:17:34 +0000 Subject: Change in osmo-sgsn[master]: Use libosmocore constant for IMSI length in ACL entry In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12224 ) Change subject: Use libosmocore constant for IMSI length in ACL entry ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h at 417 PS2, Line 417: char imsi[GSM23003_IMSI_MAX_DIGITS + 2]; > So commit openbsc d3fa84dbba3b67cdbe2d8c789b2833b5ddf42068 changed GSM_IMSI_LENGTH to be GSM23003_IM [?] it was likely a typo/thinko at the time. However, as it appears to affect GSUP message definitions/ABI at that point, I don't think it should be changed (if that's what you're implying) -- To view, visit https://gerrit.osmocom.org/12224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 Gerrit-Change-Number: 12224 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Comment-Date: Sat, 29 Dec 2018 20:17:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 20:53:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 29 Dec 2018 20:53:16 +0000 Subject: Change in libosmocore[master]: Add function to estimate elapsed time In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/5103 ) Change subject: Add function to estimate elapsed time ...................................................................... Patch Set 6: Code-Review-1 Please mark it as WIP. My comments were not addressed. -- To view, visit https://gerrit.osmocom.org/5103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I83d865ff633a7ebda2c943477205fd31aceda277 Gerrit-Change-Number: 5103 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 29 Dec 2018 20:53:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 29 21:57:43 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sat, 29 Dec 2018 21:57:43 +0000 Subject: Change in osmo-sgsn[master]: Use libosmocore constant for IMSI length in ACL entry In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12224 ) Change subject: Use libosmocore constant for IMSI length in ACL entry ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h at 417 PS2, Line 417: char imsi[GSM23003_IMSI_MAX_DIGITS + 2]; > it was likely a typo/thinko at the time. [?] In this case we can merge this patch as is. If we ever decide to adjust it than it should be done in separate commit. -- To view, visit https://gerrit.osmocom.org/12224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 Gerrit-Change-Number: 12224 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Comment-Date: Sat, 29 Dec 2018 21:57:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 30 07:36:57 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 30 Dec 2018 07:36:57 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-ggsn_=C2=BB_--enable-gtp-?= =?UTF-8?Q?linux,0,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#1300?= Message-ID: <1366850457.341.1546155417449.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 42.75 KB...] make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc32gen.c GEN crc64gen.c GEN crc8gen.c GEN crc16gen.c make install-am make[3]: Entering directory ' CC timer_gettimeofday.lo CC timer.lo CC timer_clockgettime.lo CC select.lo CC msgb.lo CC signal.lo CC bits.lo CC bitvec.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC vty.lo CC vector.lo CC utils.lo CC logging_vty.lo CC telnet_interface.lo CC stats_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC ecu_fr.lo CC gsm690.lo CC gsm660.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC tlv_parser.lo CC comp128.lo CC comp128v23.lo CC gsm_utils.lo CC gsm48.lo CC rsl.lo /bin/bash: line 2: 19162 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT tlv_parser.lo -MD -MP -MF $depbase.Tpo -c -o tlv_parser.lo tlv_parser.c Makefile:597: recipe for target 'tlv_parser.lo' failed make[3]: *** [tlv_parser.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ make[3]: Leaving directory ' Makefile:702: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:615: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:914: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Dec 30 12:19:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Dec 2018 12:19:50 +0000 Subject: Change in osmo-msc[master]: libmsc/VTY: introduce kill-switch for routing SMS over GSUP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11918 ) Change subject: libmsc/VTY: introduce kill-switch for routing SMS over GSUP ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie57685ed2ce1e4c978e775b68fdffe58de44882b Gerrit-Change-Number: 11918 Gerrit-PatchSet: 10 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 30 Dec 2018 12:19:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 12:22:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 30 Dec 2018 12:22:13 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11919 ) Change subject: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8 Gerrit-Change-Number: 11919 Gerrit-PatchSet: 11 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sun, 30 Dec 2018 12:22:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 12:29:24 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Sun, 30 Dec 2018 12:29:24 +0000 Subject: Change in libosmocore[master]: port rest octets encoding code from osmo-bsc In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10189 ) Change subject: port rest octets encoding code from osmo-bsc ...................................................................... Patch Set 5: Licence change has been cleared. -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Sun, 30 Dec 2018 12:29:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 12:29:34 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Sun, 30 Dec 2018 12:29:34 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 7: Licence change has been cleared. -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Sun, 30 Dec 2018 12:29:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 12:31:29 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 30 Dec 2018 12:31:29 +0000 Subject: Change in osmo-gsm-tester[master]: mobile: Switch from removed cli option to vty port In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12445 to look at the new patch set (#2). Change subject: mobile: Switch from removed cli option to vty port ...................................................................... mobile: Switch from removed cli option to vty port Bind the mobile's to a random (chosen by the kernel) VTY port. The CLI option was removed and I added a new VTY command to be able to specify the port in addition to the address. Change-Id: Ie40a2ba156ba5674d37a15eb30e5b2527e75fbe7 --- M src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl M src/osmo_ms_driver/starter.py 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/45/12445/2 -- To view, visit https://gerrit.osmocom.org/12445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie40a2ba156ba5674d37a15eb30e5b2527e75fbe7 Gerrit-Change-Number: 12445 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 12:42:14 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Sun, 30 Dec 2018 12:42:14 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10185 to look at the new patch set (#8). Change subject: port arfcn range encode support from osmo-bsc ...................................................................... port arfcn range encode support from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports one of the prerequisites for doing so: osmo-bsc code for range-encoding ARFCNs, including tests. An osmo_gsm48_ prefix has been prepended to public symbols in order to avoid clashes with existing symbols in osmo-bsc code. Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Related: OS#3075 --- M include/Makefile.am A include/osmocom/gsm/gsm48_arfcn_range_encode.h M src/gsm/Makefile.am A src/gsm/gsm48_arfcn_range_encode.c M src/gsm/libosmogsm.map M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 7 files changed, 760 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/10185/8 -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 8 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 12:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Sun, 30 Dec 2018 12:46:20 +0000 Subject: Change in libosmocore[master]: port rest octets encoding code from osmo-bsc In-Reply-To: References: Message-ID: Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10189 to look at the new patch set (#6). Change subject: port rest octets encoding code from osmo-bsc ...................................................................... port rest octets encoding code from osmo-bsc As part of fixing issue OS#3075, we want to migrate support for encoding system information from osmo-bsc to libosmocore. This change ports osmo-bsc code for encoding SI rest octets. The conversion was a bit tricky in some places because some functions receive a 'struct gsm_bts' parameter in osmo-bsc. In this libosmocore version, such functions expect parameters which correspond to the individual fields of 'struct gsm_bts' which are used by these functions. Several structs from osmo-bsc's system_information.h are now also declared in libosmocore headers, with an added osmo_ prefix to avoid collisions with existing definitions in osmo-bsc. Some helpers were ported from osmo-bsc's system_information.c to libosmocore's gsm48_rest_octets.c. Contrary to osmo-bsc's implementation they are now only visible within this file. Unfortunately, this code ported from osmo-bsc lacks unit tests. Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Related: OS#3075 --- M include/Makefile.am M include/osmocom/gprs/protocol/gsm_04_60.h A include/osmocom/gsm/gsm48_rest_octets.h A src/gsm/gsm48_rest_octets.c M src/gsm/libosmogsm.map 5 files changed, 1,084 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/10189/6 -- To view, visit https://gerrit.osmocom.org/10189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I47888965ab11bba1186c21987f1365c9270abeab Gerrit-Change-Number: 10189 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 30 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 30 Dec 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_ma?= =?UTF-8?Q?ster-asn1c_=C2=BB_a1=3Ddefault,a2=3Dd?= =?UTF-8?Q?efault,a3=3Ddefault,a4=3Ddefault,osmocom-master-debian9_#355?= In-Reply-To: <1942331234.328.1546096207408.JavaMail.jenkins@jenkins.osmocom.org> References: <1942331234.328.1546096207408.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1066492312.343.1546182607441.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.69 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Dec 30 15:29:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 30 Dec 2018 15:29:33 +0000 Subject: Change in libosmocore[master]: Streamline glibc version check In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11719 ) Change subject: Streamline glibc version check ...................................................................... Patch Set 9: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/11719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062 Gerrit-Change-Number: 11719 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Sun, 30 Dec 2018 15:29:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 15:29:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 30 Dec 2018 15:29:40 +0000 Subject: Change in libosmocore[master]: Automatically disable GnuTLS fallback In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11720 ) Change subject: Automatically disable GnuTLS fallback ...................................................................... Patch Set 9: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/11720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe2117afc050261668a4d5a590044aabcd08aefe Gerrit-Change-Number: 11720 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sun, 30 Dec 2018 15:29:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Dec 30 20:42:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 30 Dec 2018 20:42:15 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal?= =?UTF-8?Q?_:_master-osmo-ggsn_=C2=BB_--enable-?= =?UTF-8?Q?gtp-linux,0,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#1301?= In-Reply-To: <1366850457.341.1546155417449.JavaMail.jenkins@jenkins.osmocom.org> References: <1366850457.341.1546155417449.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1441019852.344.1546202535801.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Dec 30 23:28:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 30 Dec 2018 23:28:36 +0000 Subject: Change in libosmocore[master]: NS: use monotonic clock In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/5104 ) Change subject: NS: use monotonic clock ...................................................................... Patch Set 6: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/5104/6/include/osmocom/gprs/gprs_ns.h File include/osmocom/gprs/gprs_ns.h: https://gerrit.osmocom.org/#/c/5104/6/include/osmocom/gprs/gprs_ns.h at 130 PS6, Line 130: struct timeval timer_started; /* deprecated! will be replaced by t_start eventually */ Eventually? isn't it replaced in this same commit? this field should then be removed now. https://gerrit.osmocom.org/#/c/5104/6/src/gb/gprs_ns.c File src/gb/gprs_ns.c: https://gerrit.osmocom.org/#/c/5104/6/src/gb/gprs_ns.c at 615 PS6, Line 615: if (clock_gettime(CLOCK_MONOTONIC, &nsvc->t_start) != 0) { osmo_clock_gettime. https://gerrit.osmocom.org/#/c/5104/6/src/gb/gprs_ns.c at 617 PS6, Line 617: nsvc->nsei, get_value_string(timer_mode_strs, mode), seconds, strerror(errno)); if it says it fails, it shouldn't start the timer by calling osmo_timer_schedule, but return here before doing so. -- To view, visit https://gerrit.osmocom.org/5104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6949601a80747f0de1a05e0790a1bace209efbf Gerrit-Change-Number: 5104 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Sun, 30 Dec 2018 23:28:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 23:37:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 30 Dec 2018 23:37:37 +0000 Subject: Change in libosmocore[master]: Add function to estimate elapsed time In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/5103 ) Change subject: Add function to estimate elapsed time ...................................................................... Patch Set 6: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/5103/6/src/timer.c File src/timer.c: https://gerrit.osmocom.org/#/c/5103/6/src/timer.c at 207 PS6, Line 207: ns = t_diff_nsec(&t_now, from); these functions are really not needed. Drop them and instead include and use timersub(). https://gerrit.osmocom.org/#/c/5103/6/tests/timer/timer_test.c File tests/timer/timer_test.c: https://gerrit.osmocom.org/#/c/5103/6/tests/timer/timer_test.c at 198 PS6, Line 198: if (osmo_clock_gettime(CLOCK_MONOTONIC, &t_start) != 0) that's a bit weird. Getting a time after enabling override but not setting an initial time before? Same later, you are adding time without setting it before in here. Probably override time is 0,0 by default due to being static memory? Still it's clearer if you set it to 0,0 explicitly. -- To view, visit https://gerrit.osmocom.org/5103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I83d865ff633a7ebda2c943477205fd31aceda277 Gerrit-Change-Number: 5103 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 30 Dec 2018 23:37:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 23:40:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 30 Dec 2018 23:40:31 +0000 Subject: Change in libosmocore[master]: BSSGP: use monotonic clock In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/5629 ) Change subject: BSSGP: use monotonic clock ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/5629/2/include/osmocom/gprs/gprs_bssgp.h File include/osmocom/gprs/gprs_bssgp.h: https://gerrit.osmocom.org/#/c/5629/2/include/osmocom/gprs/gprs_bssgp.h at 69 PS2, Line 69: struct timeval time_last_pdu; /*!< deprecated! will be replaced by t_last_pdu eventually */ Same as prev commit, eventually? it's actually being removed now. https://gerrit.osmocom.org/#/c/5629/2/src/gb/gprs_bssgp.c File src/gb/gprs_bssgp.c: https://gerrit.osmocom.org/#/c/5629/2/src/gb/gprs_bssgp.c at 619 PS2, Line 619: if (clock_gettime(CLOCK_MONOTONIC, &fc->t_last_pdu) != 0) osmo_clock_gettime. https://gerrit.osmocom.org/#/c/5629/2/tests/gb/bssgp_fc_test.c File tests/gb/bssgp_fc_test.c: https://gerrit.osmocom.org/#/c/5629/2/tests/gb/bssgp_fc_test.c at 104 PS2, Line 104: fc->t_last_pdu.tv_nsec += OSMO_USEC2NS(100000); better use timeradd from osmocom/core/timer_compat.h -- To view, visit https://gerrit.osmocom.org/5629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If190a634aa8334cae55df8c41877400d2f5603a2 Gerrit-Change-Number: 5629 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 30 Dec 2018 23:40:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 23:41:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 30 Dec 2018 23:41:05 +0000 Subject: Change in libosmocore[master]: Remove unused timeval parameters In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/5631 ) Change subject: Remove unused timeval parameters ...................................................................... Patch Set 2: This should go merged with last 2 patches, not in a separate patch. -- To view, visit https://gerrit.osmocom.org/5631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I16ffe9aca21be1fa71184abc57a5745923c5cfcb Gerrit-Change-Number: 5631 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 30 Dec 2018 23:41:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 23:41:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 30 Dec 2018 23:41:09 +0000 Subject: Change in libosmocore[master]: Remove unused timeval parameters In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/5631 ) Change subject: Remove unused timeval parameters ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/5631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I16ffe9aca21be1fa71184abc57a5745923c5cfcb Gerrit-Change-Number: 5631 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 30 Dec 2018 23:41:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 23:43:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 30 Dec 2018 23:43:47 +0000 Subject: Change in libosmocore[master]: Add function to estimate elapsed time In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/5103 ) Change subject: Add function to estimate elapsed time ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/5103/6/src/timer.c File src/timer.c: https://gerrit.osmocom.org/#/c/5103/6/src/timer.c at 196 PS6, Line 196: time_t osmo_time_elapsed(const struct timespec *from, enum osmo_elapsed kind) You are not specifying here it must be used with a monotonic clock. TBH, I like this API as a timespec to different time magnitude conversions,but I'd drop the osmo_clock_gettime(now) from here. Let user manage the time sources himself through osmo_clock_gettime and timersub and in this API simply do the conversion of this timespec. -- To view, visit https://gerrit.osmocom.org/5103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I83d865ff633a7ebda2c943477205fd31aceda277 Gerrit-Change-Number: 5103 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 30 Dec 2018 23:43:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 23:50:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 30 Dec 2018 23:50:32 +0000 Subject: Change in osmo-sgsn[master]: Use libosmocore constant for IMSI length in ACL entry In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12224 ) Change subject: Use libosmocore constant for IMSI length in ACL entry ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/12224/2/include/osmocom/sgsn/gprs_sgsn.h at 417 PS2, Line 417: char imsi[GSM23003_IMSI_MAX_DIGITS + 2]; > In this case we can merge this patch as is. [?] So we don't change the one in libosmocore/include/osmocom/gsm/gsup.h to avoid breaking ABI, but we can for sure change this one to be GSM23003_IMSI_MAX_DIGITS+1. -- To view, visit https://gerrit.osmocom.org/12224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I138aea409aab0c748c75546e628797fc7498bf40 Gerrit-Change-Number: 12224 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Comment-Date: Sun, 30 Dec 2018 23:50:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 23:54:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 30 Dec 2018 23:54:55 +0000 Subject: Change in libosmocore[master]: Streamline glibc version check In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11719 ) Change subject: Streamline glibc version check ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062 Gerrit-Change-Number: 11719 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 30 Dec 2018 23:54:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 30 23:55:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 30 Dec 2018 23:55:37 +0000 Subject: Change in libosmocore[master]: Automatically disable GnuTLS fallback In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11720 ) Change subject: Automatically disable GnuTLS fallback ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe2117afc050261668a4d5a590044aabcd08aefe Gerrit-Change-Number: 11720 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Sun, 30 Dec 2018 23:55:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 31 00:10:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 31 Dec 2018 00:10:40 +0000 Subject: Change in libosmocore[master]: Automatically disable GnuTLS fallback In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11720 ) Change subject: Automatically disable GnuTLS fallback ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe2117afc050261668a4d5a590044aabcd08aefe Gerrit-Change-Number: 11720 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 31 Dec 2018 00:10:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Dec 31 15:13:58 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 31 Dec 2018 15:13:58 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-asn1c_=C2=BB_a1=3Ddefault,?= =?UTF-8?Q?a2=3Ddefault,a3=3Ddefault,a4=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#356?= In-Reply-To: <1066492312.343.1546182607441.JavaMail.jenkins@jenkins.osmocom.org> References: <1066492312.343.1546182607441.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1825846630.359.1546269238381.JavaMail.jenkins@jenkins.osmocom.org> See